[99554] Merge in and remove org.eclipse.wst.server.util
diff --git a/archive/org.eclipse.wtp.releng/maps/jst-server-tests.map b/archive/org.eclipse.wtp.releng/maps/jst-server-tests.map
index 219f353..b14a60e 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst-server-tests.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst-server-tests.map
@@ -1,7 +1,7 @@
plugin@org.eclipse.jst.server.core.tests=v20050601,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/server/tests/org.eclipse.jst.server.core.tests
plugin@org.eclipse.jst.server.ui.tests=v20050601,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/server/tests/org.eclipse.jst.server.ui.tests
-plugin@org.eclipse.jst.server.tomcat.core.tests=v20050528,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/server/tests/org.eclipse.jst.server.tomcat.core.tests
+plugin@org.eclipse.jst.server.tomcat.core.tests=v20050613,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/server/tests/org.eclipse.jst.server.tomcat.core.tests
plugin@org.eclipse.jst.server.tomcat.ui.tests=v20050528,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/server/tests/org.eclipse.jst.server.tomcat.ui.tests
plugin@org.eclipse.jst.server.tomcat.tests.performance=v20050608_1340,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/server/tests/org.eclipse.jst.server.tomcat.tests.performance
diff --git a/archive/org.eclipse.wtp.releng/maps/jst-server.map b/archive/org.eclipse.wtp.releng/maps/jst-server.map
index aeafbaf..c5a2d4e 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst-server.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst-server.map
@@ -3,8 +3,8 @@
plugin@org.eclipse.jst.server.core=v20050608_1535,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/server/plugins/org.eclipse.jst.server.core
plugin@org.eclipse.jst.server.ui=v20050608_1140,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/server/plugins/org.eclipse.jst.server.ui
-plugin@org.eclipse.jst.server.tomcat.core=v20050602,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/server/plugins/org.eclipse.jst.server.tomcat.core
-plugin@org.eclipse.jst.server.tomcat.ui=v20050606,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/server/plugins/org.eclipse.jst.server.tomcat.ui
+plugin@org.eclipse.jst.server.tomcat.core=v20050613,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/server/plugins/org.eclipse.jst.server.tomcat.core
+plugin@org.eclipse.jst.server.tomcat.ui=v20050613,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/server/plugins/org.eclipse.jst.server.tomcat.ui
plugin@org.eclipse.jst.server.generic.core=v20050609,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.core
plugin@org.eclipse.jst.server.generic.ui=v20050609,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/server/plugins/org.eclipse.jst.server.generic.ui
diff --git a/archive/org.eclipse.wtp.releng/maps/wst-server-tests.map b/archive/org.eclipse.wtp.releng/maps/wst-server-tests.map
index 3698c4f..c22e129 100644
--- a/archive/org.eclipse.wtp.releng/maps/wst-server-tests.map
+++ b/archive/org.eclipse.wtp.releng/maps/wst-server-tests.map
@@ -1,9 +1,8 @@
plugin@org.eclipse.wst.internet.monitor.core.tests=v20050528,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/internet/tests/org.eclipse.wst.internet.monitor.core.tests
plugin@org.eclipse.wst.internet.monitor.ui.tests=v20050525,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/internet/tests/org.eclipse.wst.internet.monitor.ui.tests
-plugin@org.eclipse.wst.server.core.tests=v20050608,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/server/tests/org.eclipse.wst.server.core.tests
-plugin@org.eclipse.wst.server.ui.tests=v20050526,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/server/tests/org.eclipse.wst.server.ui.tests
-plugin@org.eclipse.wst.server.util.tests=v20050608,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/server/tests/org.eclipse.wst.server.util.tests
+plugin@org.eclipse.wst.server.core.tests=v20050613,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/server/tests/org.eclipse.wst.server.core.tests
+plugin@org.eclipse.wst.server.ui.tests=v20050613,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/server/tests/org.eclipse.wst.server.ui.tests
plugin@org.eclipse.wst.server.tests.performance=v20050601,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/server/tests/org.eclipse.wst.server.tests.performance
plugin@org.eclipse.wst.internet.cache.tests=v20050613_1730,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/internet/tests/org.eclipse.wst.internet.cache.tests
\ No newline at end of file
diff --git a/archive/org.eclipse.wtp.releng/maps/wst-server.map b/archive/org.eclipse.wtp.releng/maps/wst-server.map
index edc4abc..695cc4b 100644
--- a/archive/org.eclipse.wtp.releng/maps/wst-server.map
+++ b/archive/org.eclipse.wtp.releng/maps/wst-server.map
@@ -4,9 +4,8 @@
plugin@org.eclipse.wst.internet.monitor.core=v20050602-2340,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/internet/plugins/org.eclipse.wst.internet.monitor.core
plugin@org.eclipse.wst.internet.monitor.ui=v20050602-2340,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/internet/plugins/org.eclipse.wst.internet.monitor.ui
-plugin@org.eclipse.wst.server.core=v20050608,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/server/plugins/org.eclipse.wst.server.core
-plugin@org.eclipse.wst.server.ui=v20050608,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/server/plugins/org.eclipse.wst.server.ui
-plugin@org.eclipse.wst.server.util=v20050608_1140,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/server/plugins/org.eclipse.wst.server.util
+plugin@org.eclipse.wst.server.core=v20050613,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/server/plugins/org.eclipse.wst.server.core
+plugin@org.eclipse.wst.server.ui=v20050613,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/server/plugins/org.eclipse.wst.server.ui
plugin@org.eclipse.wst.internet.proxy=v20050518_1700,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/internet/plugins/org.eclipse.wst.internet.proxy
diff --git a/archive/org.eclipse.wtp.releng/maps/wtp-feature-wst.map b/archive/org.eclipse.wtp.releng/maps/wtp-feature-wst.map
index a8c47d4..17533eb 100644
--- a/archive/org.eclipse.wtp.releng/maps/wtp-feature-wst.map
+++ b/archive/org.eclipse.wtp.releng/maps/wtp-feature-wst.map
@@ -1,6 +1,6 @@
-feature@org.eclipse.wst.server.feature=v20050608,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst.server.feature
+feature@org.eclipse.wst.server.feature=v20050613,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst.server.feature
feature@org.eclipse.wst.server.feature.core=v20050607_0400,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst.server.feature.core
feature@org.eclipse.wst.common.feature=v20050607_0400,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst.common.feature
diff --git a/archive/org.eclipse.wtp.releng/maps/wtp-feature.map b/archive/org.eclipse.wtp.releng/maps/wtp-feature.map
index d3109ef..4cdab3f 100644
--- a/archive/org.eclipse.wtp.releng/maps/wtp-feature.map
+++ b/archive/org.eclipse.wtp.releng/maps/wtp-feature.map
@@ -1,11 +1,11 @@
-feature@org.eclipse.wst=v20050613_1710,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst
+feature@org.eclipse.wst=v20050613,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst
feature@org.eclipse.wst.sdk=v20050613_1710,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst.sdk
feature@org.eclipse.jst=v20050613_1710,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/assembly/features/org.eclipse.jst
feature@org.eclipse.jst.sdk=v20050613_1710,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/assembly/features/org.eclipse.jst.sdk
-feature@org.eclipse.wst.tests.feature=v20050613_1710,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst.tests.feature
+feature@org.eclipse.wst.tests.feature=v20050613,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst.tests.feature
feature@org.eclipse.wst.tests.performance.feature=v20050613_1710,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst.tests.performance.feature
feature@org.eclipse.jst.tests=v20050613_1710,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/assembly/features/org.eclipse.jst.tests
feature@org.eclipse.jst.tests.performance.feature=v20050613_1710,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/assembly/features/org.eclipse.jst.tests.performance.feature
diff --git a/archive/org.eclipse.wtp.releng/testScripts/test.properties b/archive/org.eclipse.wtp.releng/testScripts/test.properties
index 1930f95..d346a13 100644
--- a/archive/org.eclipse.wtp.releng/testScripts/test.properties
+++ b/archive/org.eclipse.wtp.releng/testScripts/test.properties
@@ -1,7 +1,6 @@
org.eclipse.wst.server.core.tests=org.eclipse.wst.server.core.tests_1.0.0
org.eclipse.wst.server.ui.tests=org.eclipse.wst.server.ui.tests_1.0.0
-org.eclipse.wst.server.util.tests=org.eclipse.wst.server.util.tests_1.0.0
org.eclipse.jst.server.core.tests=org.eclipse.jst.server.core.tests_1.0.0
org.eclipse.jst.server.ui.tests=org.eclipse.jst.server.ui.tests_1.0.0
org.eclipse.jst.server.tomcat.core.tests=org.eclipse.jst.server.tomcat.core.tests_1.0.0
diff --git a/archive/org.eclipse.wtp.releng/testScripts/test.xml b/archive/org.eclipse.wtp.releng/testScripts/test.xml
index b3e1920..0d5fb82 100644
--- a/archive/org.eclipse.wtp.releng/testScripts/test.xml
+++ b/archive/org.eclipse.wtp.releng/testScripts/test.xml
@@ -113,11 +113,6 @@
<param name="report" value="org.eclipse.wst.server.ui.tests" />
<param name="package.includes" value="org.eclipse.wst.server"/>
</antcall>
- <antcall target="runapitests">
- <param name="testPlugin" value="${org.eclipse.wst.server.util.tests}" />
- <param name="report" value="org.eclipse.wst.server.util.tests" />
- <param name="package.includes" value="org.eclipse.wst.server"/>
- </antcall>
</target>
<target name="wst-monitor-tests" description="Runs the org.eclipse.wst.internet.monitor.*.tests test.xml">
diff --git a/assembly/features/org.eclipse.wst.tests.feature/feature.xml b/assembly/features/org.eclipse.wst.tests.feature/feature.xml
index 3588958..d76e5e9 100644
--- a/assembly/features/org.eclipse.wst.tests.feature/feature.xml
+++ b/assembly/features/org.eclipse.wst.tests.feature/feature.xml
@@ -21,7 +21,6 @@
<import plugin="org.eclipse.ui.forms" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.debug.ui" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.server.ui" version="0.0.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.wst.server.util" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.internet.monitor.core" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.internet.monitor.ui" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.wst.sse.core" version="0.0.0" match="greaterOrEqual"/>
@@ -82,12 +81,6 @@
version="0.0.0"/>
<plugin
- id="org.eclipse.wst.server.util.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
id="org.eclipse.wst.internet.monitor.core.tests"
download-size="0"
install-size="0"