[161909] Replace RDB component with DTP
diff --git a/assembly/features/org.eclipse.wst.feature/feature.xml b/assembly/features/org.eclipse.wst.feature/feature.xml
index 5ba1a4d..46a8372 100644
--- a/assembly/features/org.eclipse.wst.feature/feature.xml
+++ b/assembly/features/org.eclipse.wst.feature/feature.xml
@@ -75,13 +75,6 @@
id="org.eclipse.wst.web_ui.feature"
version="0.0.0"/>
- <includes
- id="org.eclipse.wst.rdb_ui.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.wst.rdb_adapters.feature"
- version="0.0.0"/>
<plugin
id="org.eclipse.wst"
diff --git a/assembly/features/org.eclipse.wst.tests.feature/feature.xml b/assembly/features/org.eclipse.wst.tests.feature/feature.xml
index 95c28b7..7cf6a61 100644
--- a/assembly/features/org.eclipse.wst.tests.feature/feature.xml
+++ b/assembly/features/org.eclipse.wst.tests.feature/feature.xml
@@ -31,10 +31,6 @@
version="0.0.0"/>
<includes
- id="org.eclipse.wst.rdb_tests.feature"
- version="0.0.0"/>
-
- <includes
id="org.eclipse.wst.web_tests.feature"
version="0.0.0"/>
diff --git a/assembly/plugins/org.eclipse.wst/plugin.xml b/assembly/plugins/org.eclipse.wst/plugin.xml
index 6f02741..4b42b6b 100644
--- a/assembly/plugins/org.eclipse.wst/plugin.xml
+++ b/assembly/plugins/org.eclipse.wst/plugin.xml
@@ -2,30 +2,7 @@
<?eclipse version="3.0"?>
<plugin>
- <!-- Database Capability Definition-->
- <extension point="org.eclipse.ui.activities">
-
- <activity
- name="%activity.database"
- description="%activity.database.desc"
- id="org.eclipse.wst.database">
- </activity>
-
- <categoryActivityBinding
- activityId="org.eclipse.wst.database"
- categoryId="org.eclipse.categories.developmentCategory">
- </categoryActivityBinding>
-
- <activityPatternBinding
- activityId="org.eclipse.wst.database"
- pattern="org\.eclipse\.wst\.rdb\.[\.\w/]*">
- </activityPatternBinding>
-
- <defaultEnablement
- id="org.eclipse.wst.database">
- </defaultEnablement>
- </extension>
-
+
<!-- XML Capability Definition-->
<!-- The following components are associated with
the XML activity as they are required by XML
diff --git a/releng.wtpbuilder/components/jsf-sdk/dependency.xml b/releng.wtpbuilder/components/jsf-sdk/dependency.xml
index 6942b28..fb40d91 100644
--- a/releng.wtpbuilder/components/jsf-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jsf-sdk/dependency.xml
@@ -11,13 +11,8 @@
====================================================================== -->
<project name="test" default="get">
- <target name="get">
- <!-- will need wtp in future, to have a "stand alone" JSF build
- <antcall target="getAndInstall">
- <param name="groupId" value="wtp" />
- </antcall>
- -->
+ <target name="get">
<antcall target="getAndInstall">
<param name="groupId" value="emf" />
</antcall>
@@ -28,16 +23,41 @@
<param name="groupId" value="jem" />
</antcall>
<antcall target="getAndInstall">
+ <param name="groupId" value="dtp" />
+ </antcall>
+ <antcall target="getAndInstall">
<param name="groupId" value="eclipse" />
</antcall>
-
-
+ <antcall target="getAndInstall">
+ <param name="groupId" value="eclipseTestFramework" />
+ </antcall>
+
+
+ <!--
+ <ant antfile="${dependencyTargets}" target="checkDependency">
+ <property name="groupId" value="piagent" />
+ </ant>
+ <ant antfile="${dependencyTargets}" target="checkDependency">
+ <property name="groupId" value="tomcat.4" />
+ </ant>
+ <ant antfile="${dependencyTargets}" target="checkDependency">
+ <property name="groupId" value="tomcat.5" />
+ </ant>
+ <ant antfile="${dependencyTargets}" target="checkDependency">
+ <property name="groupId" value="jonas.4" />
+ </ant>
+ <ant antfile="${dependencyTargets}" target="checkDependency">
+ <property name="groupId" value="oagis.release" />
+ </ant>
+ <ant antfile="${dependencyTargets}" target="checkDependency">
+ <property name="groupId" value="oagis.wsdl" />
+ </ant>
+ -->
+
</target>
<target name="getAndInstall">
- <echo message="dependencyTargets: ${dependencyTargets}" />
-
<ant antfile="${dependencyTargets}" target="checkDependency">
<property name="groupId" value="${groupId}" />
</ant>
@@ -45,9 +65,10 @@
<property name="groupId" value="${groupId}" />
<property name="install.destination" value="${base.install.dir}" />
</ant>
-
</target>
+
+
</project>
diff --git a/releng.wtpbuilder/components/jsf.tests/dependency.xml b/releng.wtpbuilder/components/jsf.tests/dependency.xml
index a0ad068..fb40d91 100644
--- a/releng.wtpbuilder/components/jsf.tests/dependency.xml
+++ b/releng.wtpbuilder/components/jsf.tests/dependency.xml
@@ -8,17 +8,11 @@
baseos
basews
basearch
-
- jsf Dependencies:
-
+
====================================================================== -->
<project name="test" default="get">
<target name="get">
-
- <!-- antcall target="getAndInstall">
- <param name="groupId" value="wtp" />
- </antcall -->
<antcall target="getAndInstall">
<param name="groupId" value="emf" />
</antcall>
@@ -29,19 +23,41 @@
<param name="groupId" value="jem" />
</antcall>
<antcall target="getAndInstall">
+ <param name="groupId" value="dtp" />
+ </antcall>
+ <antcall target="getAndInstall">
<param name="groupId" value="eclipse" />
</antcall>
<antcall target="getAndInstall">
<param name="groupId" value="eclipseTestFramework" />
- </antcall>
-
-
+ </antcall>
+
+
+ <!--
+ <ant antfile="${dependencyTargets}" target="checkDependency">
+ <property name="groupId" value="piagent" />
+ </ant>
+ <ant antfile="${dependencyTargets}" target="checkDependency">
+ <property name="groupId" value="tomcat.4" />
+ </ant>
+ <ant antfile="${dependencyTargets}" target="checkDependency">
+ <property name="groupId" value="tomcat.5" />
+ </ant>
+ <ant antfile="${dependencyTargets}" target="checkDependency">
+ <property name="groupId" value="jonas.4" />
+ </ant>
+ <ant antfile="${dependencyTargets}" target="checkDependency">
+ <property name="groupId" value="oagis.release" />
+ </ant>
+ <ant antfile="${dependencyTargets}" target="checkDependency">
+ <property name="groupId" value="oagis.wsdl" />
+ </ant>
+ -->
+
</target>
- <target name="getAndInstall">
- <echo message="dependencyTargets: ${dependencyTargets}" />
-
+ <target name="getAndInstall">
<ant antfile="${dependencyTargets}" target="checkDependency">
<property name="groupId" value="${groupId}" />
</ant>
@@ -51,5 +67,8 @@
</ant>
</target>
+
+
+
</project>
diff --git a/releng.wtpbuilder/components/jst-sdk/dependency.xml b/releng.wtpbuilder/components/jst-sdk/dependency.xml
index 9041f0f..fb40d91 100644
--- a/releng.wtpbuilder/components/jst-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jst-sdk/dependency.xml
@@ -23,6 +23,9 @@
<param name="groupId" value="jem" />
</antcall>
<antcall target="getAndInstall">
+ <param name="groupId" value="dtp" />
+ </antcall>
+ <antcall target="getAndInstall">
<param name="groupId" value="eclipse" />
</antcall>
<antcall target="getAndInstall">
diff --git a/releng.wtpbuilder/components/jst.tests/dependency.xml b/releng.wtpbuilder/components/jst.tests/dependency.xml
index 713682c..fb40d91 100644
--- a/releng.wtpbuilder/components/jst.tests/dependency.xml
+++ b/releng.wtpbuilder/components/jst.tests/dependency.xml
@@ -23,17 +23,20 @@
<param name="groupId" value="jem" />
</antcall>
<antcall target="getAndInstall">
+ <param name="groupId" value="dtp" />
+ </antcall>
+ <antcall target="getAndInstall">
<param name="groupId" value="eclipse" />
</antcall>
<antcall target="getAndInstall">
<param name="groupId" value="eclipseTestFramework" />
</antcall>
+
<!--
<ant antfile="${dependencyTargets}" target="checkDependency">
<property name="groupId" value="piagent" />
</ant>
- -->
<ant antfile="${dependencyTargets}" target="checkDependency">
<property name="groupId" value="tomcat.4" />
</ant>
@@ -49,7 +52,7 @@
<ant antfile="${dependencyTargets}" target="checkDependency">
<property name="groupId" value="oagis.wsdl" />
</ant>
-
+ -->
</target>
diff --git a/releng.wtpbuilder/components/jst/dependency.xml b/releng.wtpbuilder/components/jst/dependency.xml
index 195eafc..27ba417 100644
--- a/releng.wtpbuilder/components/jst/dependency.xml
+++ b/releng.wtpbuilder/components/jst/dependency.xml
@@ -23,6 +23,9 @@
<param name="groupId" value="jem" />
</antcall>
<antcall target="getAndInstall">
+ <param name="groupId" value="dtp" />
+ </antcall>
+ <antcall target="getAndInstall">
<param name="groupId" value="eclipse" />
</antcall>
<antcall target="getAndInstall">
diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
index a4fdfb0..b11f3e7 100644
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
@@ -240,12 +240,6 @@
<fileset dir="${buildDirectory}/features/org.eclipse.wst.web_ui.feature/feature.temp.folder" />
</copy>
- <copy todir="${buildDirectory}/${buildLabel}/compilelogs"
- overwrite="true">
- <fileset dir="${buildDirectory}/features/org.eclipse.wst.rdb_ui.feature/feature.temp.folder" />
- </copy>
-
-
<target name="clean" unless="noclean">
<antcall target="allElements">
<param name="target" value="cleanElement" />
diff --git a/releng.wtpbuilder/components/wst-sdk/dependency.xml b/releng.wtpbuilder/components/wst-sdk/dependency.xml
index c6c79de..7c9294c 100644
--- a/releng.wtpbuilder/components/wst-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/wst-sdk/dependency.xml
@@ -23,13 +23,19 @@
<param name="groupId" value="jem" />
</antcall>
<antcall target="getAndInstall">
+ <param name="groupId" value="dtp" />
+ </antcall>
+ <antcall target="getAndInstall">
<param name="groupId" value="eclipse" />
</antcall>
<antcall target="getAndInstall">
<param name="groupId" value="eclipseTestFramework" />
</antcall>
+ <antcall target="getAndInstall">
+ <param name="groupId" value="dita" />
+ </antcall>
- <!--
+ <!-- tests only
<ant antfile="${dependencyTargets}" target="checkDependency">
<property name="groupId" value="piagent" />
</ant>
@@ -48,7 +54,7 @@
<ant antfile="${dependencyTargets}" target="checkDependency">
<property name="groupId" value="oagis.wsdl" />
</ant>
- -->
+ -->
</target>
diff --git a/releng.wtpbuilder/components/wst.tests/dependency.xml b/releng.wtpbuilder/components/wst.tests/dependency.xml
index 713682c..fb40d91 100644
--- a/releng.wtpbuilder/components/wst.tests/dependency.xml
+++ b/releng.wtpbuilder/components/wst.tests/dependency.xml
@@ -23,17 +23,20 @@
<param name="groupId" value="jem" />
</antcall>
<antcall target="getAndInstall">
+ <param name="groupId" value="dtp" />
+ </antcall>
+ <antcall target="getAndInstall">
<param name="groupId" value="eclipse" />
</antcall>
<antcall target="getAndInstall">
<param name="groupId" value="eclipseTestFramework" />
</antcall>
+
<!--
<ant antfile="${dependencyTargets}" target="checkDependency">
<property name="groupId" value="piagent" />
</ant>
- -->
<ant antfile="${dependencyTargets}" target="checkDependency">
<property name="groupId" value="tomcat.4" />
</ant>
@@ -49,7 +52,7 @@
<ant antfile="${dependencyTargets}" target="checkDependency">
<property name="groupId" value="oagis.wsdl" />
</ant>
-
+ -->
</target>
diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml
index 3a2f73b..89a6086 100644
--- a/releng.wtpbuilder/components/wst/customTargets.xml
+++ b/releng.wtpbuilder/components/wst/customTargets.xml
@@ -234,10 +234,6 @@
<fileset dir="${buildDirectory}/features/org.eclipse.wst.web_ui.feature/feature.temp.folder" />
</copy>
- <copy todir="${buildDirectory}/${buildLabel}/compilelogs" overwrite="true">
- <fileset dir="${buildDirectory}/features/org.eclipse.wst.rdb_ui.feature/feature.temp.folder" />
- </copy>
-
</target>
<target name="clean" unless="noclean">
diff --git a/releng.wtpbuilder/components/wst/dependency.xml b/releng.wtpbuilder/components/wst/dependency.xml
index 96e2d0c..7c9294c 100644
--- a/releng.wtpbuilder/components/wst/dependency.xml
+++ b/releng.wtpbuilder/components/wst/dependency.xml
@@ -23,6 +23,9 @@
<param name="groupId" value="jem" />
</antcall>
<antcall target="getAndInstall">
+ <param name="groupId" value="dtp" />
+ </antcall>
+ <antcall target="getAndInstall">
<param name="groupId" value="eclipse" />
</antcall>
<antcall target="getAndInstall">
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
index 852205d..e1f9f31 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
@@ -120,7 +120,6 @@
<antcall target="wst-css-perfTests" />
<antcall target="jst-ws-perfTests"/>
<antcall target="wst-xsd-perfTests"/>
- <antcall target="wst-rdb-perfTests"/>
<antcall target="jst-j2ee-perfTests"/>
<!--
<antcall target="genPerfGraphs" />
diff --git a/releng.wtpbuilder/distribution/jsf.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/jsf.tests/testScripts/test.xml
index aa271e7..d7e5f21 100644
--- a/releng.wtpbuilder/distribution/jsf.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/jsf.tests/testScripts/test.xml
@@ -131,7 +131,6 @@
<antcall target="wst-css-perfTests" />
<antcall target="jst-ws-perfTests"/>
<antcall target="wst-xsd-perfTests"/>
- <antcall target="wst-rdb-perfTests"/>
<antcall target="jst-j2ee-perfTests"/>
<!--
<antcall target="genPerfGraphs" />
diff --git a/releng.wtpbuilder/distribution/wtp.perf/perf.xml b/releng.wtpbuilder/distribution/wtp.perf/perf.xml
index 723eec7..3b30b17 100644
--- a/releng.wtpbuilder/distribution/wtp.perf/perf.xml
+++ b/releng.wtpbuilder/distribution/wtp.perf/perf.xml
@@ -128,13 +128,6 @@
</antcall>
</target>
- <!-- rdb performance tests -->
- <target name="wst-rdb-perfTests">
- <antcall target="runperftests">
- <param name="testPlugin" value="${org.eclipse.wst.rdb.tests.performance}"/>
- <param name="report" value="org.eclipse.wst.rdb.tests.performance"/>
- </antcall>
- </target>
<!-- j2ee performance tests -->
<target name="jst-j2ee-perfTests">
@@ -157,7 +150,6 @@
<antcall target="wst-css-perfTests" />
<antcall target="jst-ws-perfTests"/>
<antcall target="wst-xsd-perfTests"/>
- <antcall target="wst-rdb-perfTests"/>
<antcall target="jst-j2ee-perfTests"/>
</target>
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.site/publish.xml b/releng.wtpbuilder/distribution/wtp.site/publish.xml
index 0dee32f..778b534 100644
--- a/releng.wtpbuilder/distribution/wtp.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/publish.xml
@@ -68,6 +68,8 @@
<replace file="${result}/${indexFileName}" token="@gefURL@" value="${gef.url}/${gef.file}" />
<replace file="${result}/${indexFileName}" token="@jemFile@" value="${jem.file}" />
<replace file="${result}/${indexFileName}" token="@jemURL@" value="${jem.url}/${jem.file}" />
+ <replace file="${result}/${indexFileName}" token="@dtpFile@" value="${dtp.file}" />
+ <replace file="${result}/${indexFileName}" token="@dtpURL@" value="${dtp.url}/${dtp.file}" />
<!-- Update timestamp on file to permit overwrite through Ant copy task -->
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
index baddfad..5ca6441 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
@@ -79,6 +79,7 @@
<li>The EMF driver used in this build is <a href="@emfURL@">@emfFile@</a><br></li>
<li>The GEF driver used in this build is <a href="@gefURL@">@gefFile@</a><br></li>
<li>Java EMF Model Runtime driver used in this build is <a href="@jemURL@">@jemFile@</a><br></li>
+<li>Data Tools Platform (DTP) driver used in this build is <a href="@dtpURL@">@dtpFile@</a><br></li>
<P></P>