Bulk checkin generic server tests
diff --git a/archive/org.eclipse.wtp.releng/jst.tests/customTargets.xml b/archive/org.eclipse.wtp.releng/jst.tests/customTargets.xml
index ca2e7ff..f6a050c 100644
--- a/archive/org.eclipse.wtp.releng/jst.tests/customTargets.xml
+++ b/archive/org.eclipse.wtp.releng/jst.tests/customTargets.xml
@@ -12,7 +12,7 @@
 	<echo message="baseLocation: ${baseLocation}" />
 	<ant antfile="${genericTargets}" target="${target}" >
 		<property name="type" value="feature" />
-		<property name="id" value="org.eclipse.wtp.jst.tests.feature" />
+		<property name="id" value="org.eclipse.jst.tests.feature" />
 	</ant>
 </target>
 
@@ -23,7 +23,7 @@
 <!-- Add one target for each root element and each configuration -->
 <!-- ===================================================================== -->
 
-<target name="assemble.org.eclipse.wtp.jst.tests.feature">
+<target name="assemble.org.eclipse.jst.tests.feature">
 	<property name="archiveName" value="wtp-jst-tests-feature-${buildId}.zip"/>
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 </target>
@@ -41,6 +41,7 @@
 		<property name="mapCvsRoot" value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
 		<property name="mapVersionTag" value="HEAD" />
 		<cvs cvsRoot="${mapCvsRoot}"
+			
 			package="org.eclipse.wtp.releng/maps"
 			dest="${buildDirectory}/maps"
 			tag="${mapVersionTag}"
@@ -119,10 +120,8 @@
 <!-- ===================================================================== -->
 <!-- Steps to do after the build is done. -->
 <!-- ===================================================================== -->
-	<target name="postBuild">
-	</target>
-
-
+<target name="postBuild">
+</target>
 
 <!-- ===================================================================== -->
 <!-- Steps to do to test the build results -->
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 81d4f50..965d8dc 100644
--- a/archive/org.eclipse.wtp.releng/maps/jst-server-tests.map
+++ b/archive/org.eclipse.wtp.releng/maps/jst-server-tests.map
@@ -1,2 +1 @@
-plugin@org.eclipse.wtp.jst.server.tomcat.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/server/tests/org.eclipse.wtp.jst.server.tomcat.tests

-

+plugin@org.eclipse.jst.server.generic.tests=v20041014,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/server/tests/org.eclipse.jst.server.generic.tests

diff --git a/archive/org.eclipse.wtp.releng/maps/wtp-feature.map b/archive/org.eclipse.wtp.releng/maps/wtp-feature.map
index 416c036..ec28efa 100644
--- a/archive/org.eclipse.wtp.releng/maps/wtp-feature.map
+++ b/archive/org.eclipse.wtp.releng/maps/wtp-feature.map
@@ -1,4 +1,5 @@
 feature@org.eclipse.wst=v20041014,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst

 feature@org.eclipse.jst=v20041014,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/assembly/features/org.eclipse.jst

 feature@org.eclipse.wst.tests.feature=v20041014,:pserver:anonymous@dev.eclipse.org:/home/webtools,,wst/components/assembly/features/org.eclipse.wst.tests.feature

+feature@org.eclipse.jst.tests.feature=v20041014,:pserver:anonymous@dev.eclipse.org:/home/webtools,,jst/components/assembly/features/org.eclipse.jst.tests.feature

 

diff --git a/archive/org.eclipse.wtp.releng/testScripts/test.properties b/archive/org.eclipse.wtp.releng/testScripts/test.properties
index aa33175..744e38c 100644
--- a/archive/org.eclipse.wtp.releng/testScripts/test.properties
+++ b/archive/org.eclipse.wtp.releng/testScripts/test.properties
@@ -1,2 +1,3 @@
 org.eclipse.wst.server.core.tests=org.eclipse.wst.server.core.tests_1.0.0
+org.eclipse.jst.server.generic.tests=org.eclipse.jst.server.generic.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 4eb95d4..99f2f89 100644
--- a/archive/org.eclipse.wtp.releng/testScripts/test.xml
+++ b/archive/org.eclipse.wtp.releng/testScripts/test.xml
@@ -40,18 +40,26 @@
 		<antcall target="genHtml" />
 	</target>
 
-	<target name="wtp" description="Runs the org.eclipse.ant.tests.core test.xml">
+	<target name="wst-server-tests" description="Runs the org.eclipse.wst.server.core.tests test.xml">
 		<antcall target="runtests">
 			<param name="testPlugin" value="${org.eclipse.wst.server.core.tests}" />
 			<param name="report" value="org.eclipse.wst.server.core.tests" />
 		</antcall>
 	</target>
+	
+	<target name="jst-server-tests" description="Runs the org.eclipse.jst.server.generic.tests test.xml">
+		<antcall target="runtests">
+			<param name="testPlugin" value="${org.eclipse.jst.server.generic.tests}" />
+			<param name="report" value="org.eclipse.jst.server.generic.tests" />
+		</antcall>
+	</target>
 
 	
 
 
 	<target name="all">
-		<antcall target="wtp" />
+		<antcall target="wst-server-tests" />
+		<antcall target="jst-server-tests" />
 	</target>
 	
 
diff --git a/assembly/features/org.eclipse.jst.tests/.project b/assembly/features/org.eclipse.jst.tests/.project
new file mode 100644
index 0000000..3bc7f5c
--- /dev/null
+++ b/assembly/features/org.eclipse.jst.tests/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.jst.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/assembly/features/org.eclipse.jst.tests/build.properties b/assembly/features/org.eclipse.jst.tests/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/assembly/features/org.eclipse.jst.tests/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/assembly/features/org.eclipse.jst.tests/feature.xml b/assembly/features/org.eclipse.jst.tests/feature.xml
new file mode 100644
index 0000000..113b5ec
--- /dev/null
+++ b/assembly/features/org.eclipse.jst.tests/feature.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.jst.tests"
+      label="org.eclipse.jst.tests"
+      version="1.0.0"
+      provider-name="Eteration.com">
+
+   <install-handler/>
+
+   <requires>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.jdt.core"/>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.jdt.launching"/>
+      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.ant.core"/>
+      <import plugin="org.eclipse.ant.ui"/>
+      <import plugin="org.junit"/>
+      <import plugin="org.eclipse.jdt.debug.ui"/>
+      <import plugin="org.eclipse.jdt.debug"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.ui.forms"/>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.workbench"/>
+      <import plugin="org.eclipse.emf.common"/>
+      <import plugin="org.eclipse.core.filebuffers"/>
+      <import plugin="org.eclipse.search"/>
+      <import plugin="org.eclipse.swt"/>
+      <import plugin="org.eclipse.jface"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.jst.sample.web.project"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.jst.server.core"
+         download-size="0"
+         install-size="0"
+         version="3.0.0"/>
+
+   <plugin
+         id="org.eclipse.jst.server.generic.core"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.jst.server.generic.modules"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.jst.server.generic.tests"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.jst.server.generic.ui"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.jst.server.tomcat.core"
+         download-size="0"
+         install-size="0"
+         version="3.0.0"/>
+
+   <plugin
+         id="org.eclipse.jst.server.tomcat.ui"
+         download-size="0"
+         install-size="0"
+         version="3.0.0"/>
+
+   <plugin
+         id="org.eclipse.jst.server.ui"
+         download-size="0"
+         install-size="0"
+         version="3.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.contentmodel"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.dtd.core"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.dtd.ui"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.encoding"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.monitor.core"
+         download-size="0"
+         install-size="0"
+         version="3.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.monitor.ui"
+         download-size="0"
+         install-size="0"
+         version="3.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.server.core"
+         download-size="0"
+         install-size="0"
+         version="3.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.server.core.tests"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.server.ui"
+         download-size="0"
+         install-size="0"
+         version="3.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.server.util"
+         download-size="0"
+         install-size="0"
+         version="3.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.sse.core"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.sse.ui"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.ui"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.uriresolver"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.validation.core"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.webbrowser"
+         download-size="0"
+         install-size="0"
+         version="3.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.xml.core"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.xml.ui"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.xml.uriresolver"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+   <plugin
+         id="org.eclipse.wst.xml.uriresolver.ui"
+         download-size="0"
+         install-size="0"
+         version="1.0.0"/>
+
+</feature>