prep for new features
diff --git a/features/org.eclipse.wst.web_core.feature/build.xml b/features/org.eclipse.wst.web_core.feature/build.xml
index ec2b11b..86f4e28 100644
--- a/features/org.eclipse.wst.web_core.feature/build.xml
+++ b/features/org.eclipse.wst.web_core.feature/build.xml
@@ -9,16 +9,16 @@
<target name="all.plugins" depends="init">
<ant antfile="build.xml" dir="../org.eclipse.wst.javascript.core" target="${target}">
</ant>
+ <ant antfile="build.xml" dir="../org.eclipse.wst.common.emfworkbench.integration" target="${target}">
+ </ant>
<ant antfile="build.xml" dir="../org.eclipse.wst.html.standard.dtds" target="${target}">
</ant>
+ <ant antfile="build.xml" dir="../org.eclipse.wst.web" target="${target}">
+ </ant>
<ant antfile="build.xml" dir="../org.eclipse.wst.css.core" target="${target}">
</ant>
- <ant antfile="build.xml" dir="../org.eclipse.wst.common.emfworkbench.integration" target="${target}">
- </ant>
<ant antfile="build.xml" dir="../org.eclipse.wst.html.core" target="${target}">
</ant>
- <ant antfile="build.xml" dir="../org.eclipse.wst.web" target="${target}">
- </ant>
</target>
<target name="all.features" depends="init">
<ant antfile="build.xml" dir="../org.eclipse.wst.xml_core.feature/" target="${target}"/>
diff --git a/features/org.eclipse.wst.web_ui.feature/build.xml b/features/org.eclipse.wst.web_ui.feature/build.xml
index f95c2bd..1396051 100644
--- a/features/org.eclipse.wst.web_ui.feature/build.xml
+++ b/features/org.eclipse.wst.web_ui.feature/build.xml
@@ -9,18 +9,16 @@
<target name="all.plugins" depends="init">
<ant antfile="build.xml" dir="../org.eclipse.wst.html.ui.infopop" target="${target}">
</ant>
- <ant antfile="build.xml" dir="../org.eclipse.wst.css.ui.infopop" target="${target}">
- </ant>
<ant antfile="build.xml" dir="../org.eclipse.wst.javascript.ui.infopop" target="${target}">
</ant>
<ant antfile="build.xml" dir="../org.eclipse.wst.javascript.ui" target="${target}">
</ant>
+ <ant antfile="build.xml" dir="../org.eclipse.wst.web.ui" target="${target}">
+ </ant>
<ant antfile="build.xml" dir="../org.eclipse.wst.css.ui" target="${target}">
</ant>
<ant antfile="build.xml" dir="../org.eclipse.wst.html.ui" target="${target}">
</ant>
- <ant antfile="build.xml" dir="../org.eclipse.wst.web.ui" target="${target}">
- </ant>
</target>
<target name="all.features" depends="init">
<ant antfile="build.xml" dir="../org.eclipse.wst.web_core.feature/" target="${target}"/>
@@ -80,7 +78,7 @@
<copy todir="${feature.base}/features/org.eclipse.wst.web_ui.feature_1.0.0" failonerror="true" overwrite="false">
<fileset dir="${basedir}" includes="feature.xml" />
</copy>
- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.wst.web_ui.feature_1.0.0/feature.xml" selfVersion="1.0.0" featureIds="org.eclipse.wst.web_core.feature,1.0.0," pluginIds="org.eclipse.wst.css.ui.infopop,1.0.0,org.eclipse.wst.html.ui.infopop,0.7.0,org.eclipse.wst.javascript.ui.infopop,0.7.0,org.eclipse.wst.css.ui,0.7.0,org.eclipse.wst.html.ui,0.7.0,org.eclipse.wst.javascript.ui,0.7.0,org.eclipse.wst.web.ui,0.7.0,"/>
+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.wst.web_ui.feature_1.0.0/feature.xml" selfVersion="1.0.0" featureIds="org.eclipse.wst.web_core.feature,1.0.0," pluginIds="org.eclipse.wst.html.ui.infopop,0.7.0,org.eclipse.wst.javascript.ui.infopop,0.7.0,org.eclipse.wst.css.ui,0.7.0,org.eclipse.wst.html.ui,0.7.0,org.eclipse.wst.javascript.ui,0.7.0,org.eclipse.wst.web.ui,0.7.0,"/>
<antcall target="rootFiles${os}_${ws}_${arch}"/>
</target>
<target name="rootFiles*_*_*">
diff --git a/features/org.eclipse.wst.web_ui.feature/feature.xml b/features/org.eclipse.wst.web_ui.feature/feature.xml
index 1050fc6..ddd4c56 100644
--- a/features/org.eclipse.wst.web_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.web_ui.feature/feature.xml
@@ -1,72 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.eclipse.wst.web_ui.feature"
- label="org.eclipse.wst.web_ui.feature"
- version="1.0.0">
+ id="org.eclipse.wst.web_ui.feature"
+ label="org.eclipse.wst.web_ui.feature"
+ version="1.0.0">
- <description url="http://www.example.com/description">
- [Enter Feature Description here.]
- </description>
+ <description url="http://www.example.com/description">
+ [Enter Feature Description here.]
+ </description>
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
- </copyright>
+ <copyright url="http://www.example.com/copyright">
+ [Enter Copyright Description here.]
+ </copyright>
- <license url="http://www.example.com/license">
- [Enter License Description here.]
- </license>
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
+ </license>
- <includes
- id="org.eclipse.wst.web_core.feature"
- version="0.0.0" />
+ <includes
+ id="org.eclipse.wst.web_core.feature"
+ version="0.0.0"/>
- <plugin
- id="org.eclipse.wst.css.ui.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false" />
+ <requires>
+ <import plugin="org.eclipse.core.runtime" version="2.1.0" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.core.runtime.compatibility"/>
+ <import plugin="org.eclipse.ui.ide"/>
+ <import plugin="org.eclipse.ui.views"/>
+ <import plugin="org.eclipse.jface.text"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor"/>
+ <import plugin="org.eclipse.ui.editors"/>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.wst.xml.ui"/>
+ <import plugin="org.eclipse.wst.sse.ui"/>
+ <import plugin="org.eclipse.wst.css.core"/>
+ <import plugin="org.eclipse.wst.sse.core"/>
+ <import plugin="org.eclipse.wst.html.core"/>
+ <import plugin="org.eclipse.wst.xml.core"/>
+ <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.wst.common.uriresolver"/>
+ <import plugin="org.eclipse.wst.validation"/>
+ <import plugin="org.eclipse.debug.core"/>
+ <import plugin="org.eclipse.debug.ui"/>
+ <import plugin="org.eclipse.wst.javascript.core"/>
+ <import plugin="org.eclipse.wst.common.ui"/>
+ <import plugin="org.eclipse.wst.common.frameworks"/>
+ <import plugin="org.eclipse.wst.common.frameworks.ui"/>
+ <import plugin="org.eclipse.wst.web"/>
+ <import plugin="org.eclipse.jem.util"/>
+ <import plugin="org.eclipse.wst.common.modulecore"/>
+ </requires>
- <plugin
- id="org.eclipse.wst.html.ui.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false" />
+ <plugin
+ id="org.eclipse.wst.html.ui.infopop"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
- <plugin
- id="org.eclipse.wst.javascript.ui.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false" />
+ <plugin
+ id="org.eclipse.wst.javascript.ui.infopop"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
- <plugin
- id="org.eclipse.wst.css.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false" />
+ <plugin
+ id="org.eclipse.wst.css.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
- <plugin
- id="org.eclipse.wst.html.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false" />
+ <plugin
+ id="org.eclipse.wst.html.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
- <plugin
- id="org.eclipse.wst.javascript.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false" />
+ <plugin
+ id="org.eclipse.wst.javascript.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
- <plugin
- id="org.eclipse.wst.web.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false" />
+ <plugin
+ id="org.eclipse.wst.web.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
</feature>
