This commit was manufactured by cvs2svn to create branch 'R3_0_maintenance'.
diff --git a/tests/org.eclipse.jst.server.generic.tests/.classpath b/tests/org.eclipse.jst.server.generic.tests/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.server.generic.tests/.cvsignore b/tests/org.eclipse.jst.server.generic.tests/.cvsignore
deleted file mode 100644
index 518fe8f..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-genericServerTests.jar
-genericServerTestssrc.zip
diff --git a/tests/org.eclipse.jst.server.generic.tests/.project b/tests/org.eclipse.jst.server.generic.tests/.project
deleted file mode 100644
index 5ceacf5..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.server.generic.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.server.generic.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.jst.server.generic.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 6026e2d..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Sep 26 05:59:27 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.jst.server.generic.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.server.generic.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8e1d15e..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sun Jun 03 01:28:12 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/tests/org.eclipse.jst.server.generic.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.generic.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index b865d41..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.server.generic.tests;singleton:=true
-Bundle-Version: 1.0.100
-Bundle-ClassPath: genericServerTests.jar
-Bundle-Activator: org.eclipse.jst.server.generic.tests.TestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.server.generic.tests
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.server.generic.core,
- org.eclipse.jst.server.generic.ui,
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.jdt.launching,
- org.eclipse.wst.server.core,
- org.eclipse.debug.core,
- org.eclipse.jst.server.core
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.jst.server.generic.tests/about.html b/tests/org.eclipse.jst.server.generic.tests/about.html
deleted file mode 100644
index f0e5476..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<P>June, 2008</P>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.generic.tests/build.properties b/tests/org.eclipse.jst.server.generic.tests/build.properties
deleted file mode 100644
index 18e2a64..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors: Gorkem Ercan - initial API and implementation
-###############################################################################
-source.genericServerTests.jar = src/
-output.genericServerTests.jar = bin/
-bin.includes = plugin.xml,\
-               test.xml,\
-               genericServerTests.jar,\
-               about.html,\
-               META-INF/,\
-               defs/,\
-               plugin.properties
-src.includes = test.xml,\
-               plugin.xml,\
-               build.properties
-               
diff --git a/tests/org.eclipse.jst.server.generic.tests/defs/barruntimeonly.runtimedef b/tests/org.eclipse.jst.server.generic.tests/defs/barruntimeonly.runtimedef
deleted file mode 100644
index 9db4893..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/defs/barruntimeonly.runtimedef
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:ServerRuntime
-	xmlns:tns="http://eclipse.org/jst/server/generic/ServerTypeDefinition"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://eclipse.org/jst/server/generic/ServerTypeDefinition ServerTypeDefinitionSchema.xsd"
-	name="Bar Runtime" version="v1">
-
-	<property id="foo.prop.a"
-		label="Foo property A"
-		type="string"
-		context="runtime"
-		default="a runtime property value" />
-	
-	<module>
-		<type>foo.module</type>
-		<publishDir>/pub</publishDir>
-		<publisherReference>foo.FooPublisher</publisherReference>
-	</module>
-	
-	<project>
-		<classpathReference>foo.runtime.classpath</classpathReference>
-	</project>
-	
-	<start>
-		<mainClass>foo.Main</mainClass>
-		<workingDirectory>/bin</workingDirectory>
-		<programArguments>-c default</programArguments>
-		<vmParameters></vmParameters>
-		<classpathReference>foo.classpath</classpathReference>
-	</start>
-
-	<stop>
-		<mainClass>foo.Shutdown</mainClass>
-		<workingDirectory>/bin</workingDirectory>
-		<programArguments>-S</programArguments>
-		<vmParameters></vmParameters>
-		<classpathReference>foo.classpath</classpathReference>
-	</stop>
-		
-	<publisher id="foo.Publisher">
-		<publisherdata>
-			<dataname>XXXXXXXX</dataname>
-			<datavalue>YYYYYYYYYY</datavalue>
-		</publisherdata>
-	</publisher>
-
-	<classpath id="foo.runtime.classpath">
-		<archive path="foo.jar" />
-	</classpath>
-	
-	<jndiConnection>
-		<providerUrl>jnp://hostfoo:1099</providerUrl>
-		<initialContextFactory>org.jnp.interfaces.NamingContextFactory</initialContextFactory>
-		<jndiProperty>
-			<name></name>
-			<value></value>
-		</jndiProperty>
-	</jndiConnection>
-	
-</tns:ServerRuntime>
diff --git a/tests/org.eclipse.jst.server.generic.tests/defs/barserveronly.serverdef b/tests/org.eclipse.jst.server.generic.tests/defs/barserveronly.serverdef
deleted file mode 100644
index b4a75d6..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/defs/barserveronly.serverdef
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:ServerRuntime
-	xmlns:tns="http://eclipse.org/jst/server/generic/ServerTypeDefinition"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://eclipse.org/jst/server/generic/ServerTypeDefinition ServerTypeDefinitionSchema.xsd"
-	name="Bar Server" version="v1">
-
-	<property id="foo.prop.b"
-		label="Foo property B"
-		type="string"
-		context="server"
-		default="a server property value" />
-	
-	<module>
-		<type>foo.module</type>
-		<publishDir>/pub</publishDir>
-		<publisherReference>foo.FooPublisher</publisherReference>
-	</module>
-	
-	<project>
-		<classpathReference>foo.classpath</classpathReference>
-	</project>
-	
-	<start>
-		<mainClass>foo.Main</mainClass>
-		<workingDirectory>/bin</workingDirectory>
-		<programArguments>-c default</programArguments>
-		<vmParameters></vmParameters>
-		<classpathReference>foo.classpath</classpathReference>
-	</start>
-
-	<stop>
-		<mainClass>foo.Shutdown</mainClass>
-		<workingDirectory>/bin</workingDirectory>
-		<programArguments>-S</programArguments>
-		<vmParameters></vmParameters>
-		<classpathReference>foo.classpath</classpathReference>
-	</stop>
-		
-	<publisher id="foo.Publisher">
-		<publisherdata>
-			<dataname>XXXXXXXX</dataname>
-			<datavalue>YYYYYYYYYY</datavalue>
-		</publisherdata>
-	</publisher>
-
-	<classpath id="foo.server.classpath">
-		<archive path="foo.jar" />
-	</classpath>
-	
-	<jndiConnection>
-		<providerUrl>jnp://hostfoo:1099</providerUrl>
-		<initialContextFactory>org.jnp.interfaces.NamingContextFactory</initialContextFactory>
-		<jndiProperty>
-			<name></name>
-			<value></value>
-		</jndiProperty>
-	</jndiConnection>
-	
-</tns:ServerRuntime>
diff --git a/tests/org.eclipse.jst.server.generic.tests/defs/fooallinone.serverdef b/tests/org.eclipse.jst.server.generic.tests/defs/fooallinone.serverdef
deleted file mode 100644
index 1cd00f0..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/defs/fooallinone.serverdef
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:ServerRuntime
-	xmlns:tns="http://eclipse.org/jst/server/generic/ServerTypeDefinition"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://eclipse.org/jst/server/generic/ServerTypeDefinition ServerTypeDefinitionSchema.xsd"
-	name="Foo All-in-one Server" version="v1">
-
-	<property id="foo.prop.a"
-		label="Foo property A"
-		type="string"
-		context="runtime"
-		default="a runtime property value" />
-			
-	<property id="foo.prop.b"
-		label="Foo property B"
-		type="string"
-		context="server"
-		default="a server property value" />
-	
-	<module>
-		<type>foo.module</type>
-		<publishDir>/pub</publishDir>
-		<publisherReference>foo.FooPublisher</publisherReference>
-	</module>
-	
-	<project>
-		<classpathReference>foo.classpath</classpathReference>
-	</project>
-	
-	<start>
-		<mainClass>foo.Main</mainClass>
-		<workingDirectory>/bin</workingDirectory>
-		<programArguments>-c default</programArguments>
-		<vmParameters></vmParameters>
-		<classpathReference>foo.classpath</classpathReference>
-	</start>
-
-	<stop>
-		<mainClass>foo.Shutdown</mainClass>
-		<workingDirectory>/bin</workingDirectory>
-		<programArguments>-S</programArguments>
-		<vmParameters></vmParameters>
-		<classpathReference>foo.classpath</classpathReference>
-	</stop>
-		
-	<publisher id="foo.Publisher">
-		<publisherdata>
-			<dataname>XXXXXXXX</dataname>
-			<datavalue>YYYYYYYYYY</datavalue>
-		</publisherdata>
-	</publisher>
-
-	<classpath id="foo.classpath">
-		<archive path="foo.jar" />
-	</classpath>
-	
-	<jndiConnection>
-		<providerUrl>jnp://hostfoo:1099</providerUrl>
-		<initialContextFactory>org.jnp.interfaces.NamingContextFactory</initialContextFactory>
-		<jndiProperty>
-			<name></name>
-			<value></value>
-		</jndiProperty>
-	</jndiConnection>
-	
-</tns:ServerRuntime>
diff --git a/tests/org.eclipse.jst.server.generic.tests/plugin.properties b/tests/org.eclipse.jst.server.generic.tests/plugin.properties
deleted file mode 100644
index 97b52c7..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 Eteration A.S. and Gorkem Ercan.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors: Gorkem Ercan - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.jst.server.generic.tests
-Bundle-Name.0 = Generic Server Tests Plug-in
-Bundle-Vendor.0 = eclipse.org
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.generic.tests/plugin.xml b/tests/org.eclipse.jst.server.generic.tests/plugin.xml
deleted file mode 100644
index 2dc8c82..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/plugin.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <!-- Extensions for unit testing Generic Server -->
-
-	<extension point="org.eclipse.wst.server.core.runtimeTypes">
-	
-    	<runtimeType
-         	id="bar.runtime.id"
-         	name="Bar Runtime Type" 
-         	description="The Bar Runtime Type"
-         	vendor="Bar"
-			version="0"
-			class="org.eclipse.jst.server.generic.core.internal.GenericServerRuntime">
-				<moduleType
-					types="bar.module"
-					versions="1.0"/>       
-      	</runtimeType>
-
-    	<runtimeType
-         	id="foo.serverdefonly.runtime.id"
-         	name="Foo ServerOnly Runtime Type" 
-         	description="The Foo ServerOnly Runtime Type"
-         	vendor="Bar"
-			version="0"
-			class="org.eclipse.jst.server.generic.core.internal.GenericServerRuntime">
-				<moduleType
-					types="foo.module"
-					versions="1.0"/>       
-      	</runtimeType>
-      	
-    </extension>   
-
-	<extension point="org.eclipse.wst.server.core.serverTypes">
-	
-       	<serverType
-        	runtime="true"
-	        class="org.eclipse.jst.server.generic.core.internal.GenericServer"
-	        id="bar.server.id"
-	        initialState="stopped"
-	        startBeforePublish="true"
-	        supportsRemoteHosts="false"
-	        runtimeTypeId="bar.runtime.id"
-	        description="Bar Server"
-	        launchConfigId="org.eclipse.jst.server.generic.core.launchConfigurationType"
-	        behaviourClass="org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour"
-	        name="Bar Server"
-	        hasConfiguration="false"
-	        startTimeout="60000"
-		    stopTimeout="30000"
-	        launchModes="run,debug">
-    	</serverType>
-
-       	<serverType
-        	runtime="true"
-	        class="org.eclipse.jst.server.generic.core.internal.GenericServer"
-	        id="foo.serverdefonly.server.id"
-	        initialState="stopped"
-	        startBeforePublish="true"
-	        supportsRemoteHosts="false"
-	        runtimeTypeId="foo.serverdefonly.runtime.id"
-	        description="Foo Server"
-	        launchConfigId="org.eclipse.jst.server.generic.core.launchConfigurationType"
-	        behaviourClass="org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour"
-	        name="Foo Server"
-	        hasConfiguration="false"
-	        startTimeout="60000"
-		    stopTimeout="30000"
-	        launchModes="run,debug">
-    	</serverType>
-    	
-    </extension>   
-
-    <extension point="org.eclipse.jst.server.generic.core.serverdefinition">
-   
-   	  <serverdefinition id="foo.serverdefonly.runtime.id" 
-          definitionfile="/defs/fooallinone.serverdef">
-      </serverdefinition>
-
-   	  <serverdefinition id="bar.server.id" 
-          definitionfile="/defs/barserveronly.serverdef">
-      </serverdefinition>
-      
-   </extension>
-
-   <extension point="org.eclipse.jst.server.generic.core.runtimedefinition">
-   
-   	  <serverdefinition id="bar.runtime.id" 
-          definitionfile="/defs/barruntimeonly.runtimedef">
-      </serverdefinition>
-      
-   </extension>
-    
-</plugin>
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/AllGenericServerTests.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/AllGenericServerTests.java
deleted file mode 100644
index ce8f1ec..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/AllGenericServerTests.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     Naci M. Dai - initial API and implementation
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S.  For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllGenericServerTests {
-
-    public static Test suite() {
-        TestSuite suite = new TestSuite(
-            "Test for org.eclipse.jst.server.generic.tests");
-        //$JUnit-BEGIN$
-        suite.addTestSuite(ServerDefinitionTypeTest.class);
-        suite.addTestSuite(GenericServerClasspathRuntimeHandlerTest.class);
-        suite.addTestSuite(PluginIntegrityTest.class);
-        suite.addTestSuite(ServerCreationTest.class);
-        suite.addTestSuite(ServerTypeDefinitionModelTest.class);
-        suite.addTestSuite(GenericServerRuntimeTest.class);
-        suite.addTestSuite(GenericServerTest.class);
-        suite.addTestSuite(XMLUtilsTest.class);
-        suite.addTestSuite(ServerTypeDefinitionManagerTest.class);
-        //$JUnit-END$
-        return suite;
-    }
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/GenericServerClasspathRuntimeHandlerTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/GenericServerClasspathRuntimeHandlerTest.java
deleted file mode 100644
index 86e89a8..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/GenericServerClasspathRuntimeHandlerTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005, 2007 Eteration A.S. and Gorkem Ercan.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: Gorkem Ercan - initial API and implementation 
- **************************************************************************************************/
-package org.eclipse.jst.server.generic.tests;
-
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntimeTargetHandler;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-
-import junit.framework.TestCase;
-
-/**
- * 
- *
- * @author Gorkem Ercan
- */
-public class GenericServerClasspathRuntimeHandlerTest extends TestCase {
-
-    private static final String SERVER_ROOT = "/dev/java/appservers/JOnAS-4.1.4";
-    private static final String SERVER_DEF_NAME = "JOnAS 4.x";
-    private IRuntime fRuntime;
-    /*
-     * @see TestCase#setUp()
-     */
-    protected void setUp() throws Exception {
-        super.setUp();
-        IRuntimeType type =ServerCore.findRuntimeType("org.eclipse.jst.server.generic.runtime.jonas4");
-        IRuntimeWorkingCopy wc = type.createRuntime("testRuntime",null);
-        GenericServerRuntime delegate = (GenericServerRuntime)wc.loadAdapter(GenericServerRuntime.class, new NullProgressMonitor());
-		HashMap props = new HashMap();
-		props.put("mappernames", "");
-		props.put("classPathVariableName", "JONAS");
-		props.put("serverAddress", "127.0.0.1");
-		props.put("jonasBase", SERVER_ROOT);
-		props.put("jonasRoot", SERVER_ROOT);
-		props.put("protocols", "jrmp");
-		props.put("port", "9000");		
-	    delegate.setServerInstanceProperties(props);
-	    delegate.setServerDefinitionId(SERVER_DEF_NAME);
-		wc.save(false,null);
-		
-		fRuntime = wc.getOriginal();
-    }
-
-    /**
-     * Constructor for ClasspathRuntimeHandlerTest.
-     * @param name
-     */
-    public GenericServerClasspathRuntimeHandlerTest(String name) {
-        super(name);
-    }
-
-    public void testResolveClasspathContainer() {
-        GenericServerRuntimeTargetHandler handler = new GenericServerRuntimeTargetHandler();
-        IClasspathEntry[] entries = handler.resolveClasspathContainer(fRuntime,null);
-        assertNotNull("Failed to resolve classpath entries",entries);
-        for (int i = 0; i < entries.length; i++) {
-            assertTrue("the resolved classpath entry does not start with classpath prefix",(new org.eclipse.core.runtime.Path(SERVER_ROOT)).isPrefixOf(entries[i].getPath()));
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/GenericServerRuntimeTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/GenericServerRuntimeTest.java
deleted file mode 100644
index cee1345..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/GenericServerRuntimeTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cape Clear Software.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Black, Cape Clear Software - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.server.generic.tests;
-
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
-import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-import org.eclipse.jst.server.generic.servertype.definition.Property;
-
-/**
- * @author <a href="mailto:david.black@capeclear.com">David Black</a>
- */
-public class GenericServerRuntimeTest extends TestCase implements TestConstants {
-
-    /**
-     * runtimeTypeId used as key to .runtimedef
-     */
-    public void testRuntimeInfoOnly() throws Exception {
-        
-        GenericServerRuntime runtime = ServerRuntimeUtils.getGenericServerRuntime(TEST_RUNTIMETYPE_ID);
-        assertNotNull(runtime);
-        
-        ServerRuntime runtimeDef = runtime.getServerTypeDefinition();
-        assertNotNull(runtimeDef);
-        
-        // Verify runtime info, and *no* server info
-        ServerRuntimeUtils.verifyProperty(runtimeDef.getProperty(), "foo.prop.a", "a runtime property value");
-        ServerRuntimeUtils.verifyNoProperty(runtimeDef.getProperty(), "foo.prop.b");
-    }
-
-    /**
-     * runtimeTypeId used as key to .serverdef
-     */
-    public void testServerAndRuntimeInfo() throws Exception {
-        
-        GenericServerRuntime runtime = ServerRuntimeUtils.getGenericServerRuntime(TEST_SERVERDEFONLY_RUNTIMETYPE_ID);
-        assertNotNull(runtime);
-        
-        ServerRuntime serverRuntime = runtime.getServerTypeDefinition();
-        assertNotNull(serverRuntime);
-        
-        // Verify runtime info, and server info
-        ServerRuntimeUtils.verifyProperty(serverRuntime.getProperty(), "foo.prop.a", "a runtime property value");
-        ServerRuntimeUtils.verifyProperty(serverRuntime.getProperty(), "foo.prop.b", "a server property value");
-    }
-    
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/GenericServerTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/GenericServerTest.java
deleted file mode 100644
index 0680cc6..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/GenericServerTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cape Clear Software.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Black, Cape Clear Software - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.server.generic.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.server.generic.core.internal.GenericServer;
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
-import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-
-/**
- * @author <a href="mailto:david.black@capeclear.com">David Black</a>
- */
-public class GenericServerTest extends TestCase implements TestConstants {
-
-    /**
-     * serverTypeId used as a key to the .serverdef file, then
-     * the runtimeTypeId used as key to .runtimedef
-     * 
-     * @throws Exception 
-     */
-    public void testServerAndRuntimeInfoForServerDefAndRuntimeDef() throws Exception {
-        
-        GenericServerRuntime runtime = ServerRuntimeUtils.getGenericServerRuntime(TEST_RUNTIMETYPE_ID);
-        GenericServer server = ServerRuntimeUtils.getGenericServer(TEST_SERVERTYPE_ID, runtime.getRuntime());
-        assertNotNull(server);
-        
-        ServerRuntime serverRuntime = server.getServerDefinition();
-        
-        // Verify Server and Runtime info: properties from runtimedef and serverdef are available
-        ServerRuntimeUtils.verifyProperty(serverRuntime.getProperty(), "foo.prop.a", "a runtime property value");
-        ServerRuntimeUtils.verifyProperty(serverRuntime.getProperty(), "foo.prop.b", "a server property value");
-        
-        ServerRuntimeUtils.verifyClasspath(serverRuntime.getClasspath(), "foo.runtime.classpath");
-        ServerRuntimeUtils.verifyClasspath(serverRuntime.getClasspath(), "foo.server.classpath");
-    }
-
-    public void testServerAndRuntimeInfoForServerDefOnly() throws Exception {
-        
-        GenericServerRuntime runtime = ServerRuntimeUtils.getGenericServerRuntime(TEST_SERVERDEFONLY_RUNTIMETYPE_ID);
-        GenericServer server = ServerRuntimeUtils.getGenericServer(TEST_SERVERDEFONLY_SERVERTYPE_ID, runtime.getRuntime());
-        assertNotNull(server);
-        
-        ServerRuntime serverRuntime = server.getServerDefinition();
-        
-        // Verify Server and Runtime info
-        ServerRuntimeUtils.verifyProperty(serverRuntime.getProperty(), "foo.prop.a", "a runtime property value");
-        ServerRuntimeUtils.verifyProperty(serverRuntime.getProperty(), "foo.prop.b", "a server property value");
-        ServerRuntimeUtils.verifyClasspath(serverRuntime.getClasspath(), "foo.classpath");
-    }
-    
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/PluginIntegrityTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/PluginIntegrityTest.java
deleted file mode 100644
index 1ade2d2..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/PluginIntegrityTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     Naci M. Dai - initial API and implementation
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S.  For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.tests;
-
-import org.eclipse.jst.server.generic.core.internal.CorePlugin;
-import org.eclipse.jst.server.generic.ui.internal.GenericUiPlugin;
-
-
-import junit.framework.TestCase;
-
-/**
- * @author naci
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class PluginIntegrityTest extends TestCase {
-
-	/*
-	 * @see TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	/*
-	 * @see TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	/**
-	 * Constructor for PluginIntegrityTest.
-	 * @param name
-	 */
-	public PluginIntegrityTest(String name) {
-		super(name);
-	}
-	
-	public void testGenericUiPluginExists(){
-		assertNotNull(GenericUiPlugin.getDefault());
-	}
-	public void testCorePluginExists(){
-		assertNotNull(CorePlugin.getDefault());
-	}
-
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerCreationTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerCreationTest.java
deleted file mode 100644
index 2191ec0..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerCreationTest.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     Naci M. Dai - initial API and implementation
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S.  For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.tests;
-
-import java.util.HashMap;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.RuntimeType;
-
-public class ServerCreationTest extends TestCase {
-
-	RuntimeType j2eeRuntimeType = null;
-	private final static String ID = "org.eclipse.jst.server.generic.jonas4";
-
-	/*
-	 * @see TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-		IRuntimeType[] listAll = ServerCore.getRuntimeTypes();
-		if (listAll != null) {
-			for (int i = 0; i < listAll.length; i++) {
-				IRuntimeType runtimeType = listAll[i];
-
-				if ("J2EE Runtime Library".equals(runtimeType.getName()))
-					j2eeRuntimeType = (RuntimeType) runtimeType;
-			}
-		}
-	}
-
-	/*
-	 * @see TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	/**
-	 * Constructor for PluginIntegrityTest.
-	 * 
-	 * @param name
-	 */
-	public ServerCreationTest(String name) {
-		super(name);
-	}
-
-	public void testGetTypes() {
-		assertNotNull(j2eeRuntimeType);
-	}
-
-	public void testCreateServer() throws Exception {
-		
-		// Finds the generic server type
-		IServerType[] sTypes = ServerCore.getServerTypes();
-		IServerType serverType = null;
-		for (int i = 0; i < sTypes.length; i++) {
-			IServerType sType = sTypes[i];
-			if (ID.equals(sType.getId()))
-				serverType = sType;
-		}
-		assertNotNull("Could not find org.eclipse.jst.server.generic.jonas4 server type",serverType);
-
-		//Finds the generic server runtime type
-		IRuntimeType runtimeType = serverType.getRuntimeType();
-		assertNotNull("Could not find runtime type for the generic server type",runtimeType);
-		//Create a new runtime instance from the type
-		IRuntime runtime  = runtimeType.createRuntime(ID+".Jonas.Runtime",null);
-
-		assertNotNull("Could not create runtime",runtime);
-
-		
-
-		
-		//Create a new server instance from the type
-		IServerWorkingCopy server = serverType.createServer(ID+".Jonas.Server", null, runtime, null);
-		assertNotNull("Could not create server",server);
-	
-		//Save the server
-		server.save(false,null);
-		
-		// Set properties for the runtime
-		IRuntimeWorkingCopy runtimeWorkingCopy = runtime.createWorkingCopy();
-		assertNotNull("Could not create runtime working copy",runtimeWorkingCopy);
-		
-		// Set the JONAS runtime as the default runtime
-		ServerUtil.setRuntimeDefaultName(runtimeWorkingCopy);
-		assertNotNull("Runtime working copy has no name",runtimeWorkingCopy.getName());
-		
-		// Set properties for the JONAS runtime
-		GenericServerRuntime runtimeDelegate = (GenericServerRuntime)runtimeWorkingCopy.loadAdapter(GenericServerRuntime.class,new NullProgressMonitor());
-		assertNotNull("Could not obtain runtime delegate",runtimeDelegate);
-		
-		HashMap props = new HashMap();
-		props.put("mappernames", "");
-		props.put("classPathVariableName", "JONAS");
-		props.put("serverAddress", "127.0.0.1");
-		props.put("jonasBase", "C:\\nmd\\dev\\java\\appservers\\JOnAS-4.1.4");
-		props.put("jonasRoot", "C:\\nmd\\dev\\java\\appservers\\JOnAS-4.1.4");
-		props.put("classPath", "C:\\nmd\\dev\\java\\appservers\\JOnAS-4.1.4");
-		props.put("protocols", "C:\\nmd\\dev\\java\\appservers\\JOnAS-4.1.4");
-		props.put("port", "9000");		
-	    runtimeDelegate.setServerInstanceProperties(props);
-	    
-	    //Save the runtime working copy 
-		runtimeWorkingCopy.save(false,null);
-		
-	}
-
-	
-
-
-	public void testGetWebTypes() {
-
-		IRuntimeType listWeb[] = ServerUtil.getRuntimeTypes("jst.web", null);
-		assertNotNull(listWeb);
-
-		boolean found = listWeb.length>0;
-		assertTrue(found);
-	}
-
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerDefinitionTypeTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerDefinitionTypeTest.java
deleted file mode 100644
index 959f5bb..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerDefinitionTypeTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     Naci M. Dai - initial API and implementation
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S.  For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.jst.server.generic.core.internal.CorePlugin;
-import org.eclipse.jst.server.generic.core.internal.ServerTypeDefinitionManager;
-import org.eclipse.jst.server.generic.internal.core.util.ExtensionPointUtil;
-import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-
-/**
- * @author naci
- * 
- * TODO To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Style - Code Templates
- */
-public class ServerDefinitionTypeTest extends TestCase {
-
-	/*
-	 * @see TestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	/*
-	 * @see TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	/**
-	 * Constructor for PluginIntegrityTest.
-	 * 
-	 * @param name
-	 */
-	public ServerDefinitionTypeTest(String name) {
-		super(name);
-	}
-
-	public void testGetTypes() {
-        IExtension[] extensions = ExtensionPointUtil.getGenericServerDefinitionExtensions();
-        int noOfExtensions = 0;
-        for (int i = 0; i < extensions.length; i++) {
-           noOfExtensions+=  ExtensionPointUtil.getConfigurationElements(extensions[i]).length;
-        }
-        ServerTypeDefinitionManager serverTypeDefinitionManager = CorePlugin.getDefault().getServerTypeDefinitionManager();
-		assertNotNull(serverTypeDefinitionManager);
-		ServerRuntime[] types = serverTypeDefinitionManager.getServerTypeDefinitions();
-		assertNotNull(types);
-		assertEquals(noOfExtensions, types.length);
-	}
-
-	public void testResolve() {
-		ServerTypeDefinitionManager serverTypeDefinitionManager = CorePlugin
-				.getDefault().getServerTypeDefinitionManager();
-		assertNotNull(serverTypeDefinitionManager);
-		ServerRuntime[] types = serverTypeDefinitionManager
-				.getServerTypeDefinitions();
-		assertNotNull(types);
-		assertTrue(types.length > 0);
-		for (int i = 0; i < types.length; i++) {
-			ServerRuntime definition = types[i];
-			String wd = definition.getStart().getWorkingDirectory();
-			String resolved = definition.getResolver().resolveProperties(wd);
-			assertFalse(resolved.indexOf("${") >= 0);
-		}
-	}
-//    public void testEclipseVarResolve() {
-//        ServerTypeDefinitionManager serverTypeDefinitionManager = CorePlugin
-//                .getDefault().getServerTypeDefinitionManager();
-//        assertNotNull( serverTypeDefinitionManager );
-//        ServerRuntime[] types = serverTypeDefinitionManager
-//                .getServerTypeDefinitions();
-//        assertNotNull( types );
-//        assertTrue( types.length > 0 );
-//        ServerRuntime definition = types[0];
-//        String resolved = definition.getResolver().resolveProperties( "test ${workspace_loc} test " );
-//        assertFalse(resolved.indexOf("${") >= 0);
-//    }
-    
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerRuntimeUtils.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerRuntimeUtils.java
deleted file mode 100644
index 1ce6531..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerRuntimeUtils.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cape Clear Software.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Black, Cape Clear Software - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.server.generic.tests;
-
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.server.generic.core.internal.GenericServer;
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
-import org.eclipse.jst.server.generic.servertype.definition.Classpath;
-import org.eclipse.jst.server.generic.servertype.definition.Property;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * @author <a href="mailto:david.black@capeclear.com">David Black</a>
- */
-public final class ServerRuntimeUtils extends Assert {
-
-    private ServerRuntimeUtils() {
-        // utility
-    }
-    
-    public static GenericServer getGenericServer(String serverTypeId, IRuntime runtime) throws Exception {
-        GenericServer serverDelegate = null;
-        
-        IServerType[] sTypes = ServerCore.getServerTypes();
-        for (int i = 0; i < sTypes.length; i++) {
-            IServerType serverType = sTypes[i];
-            if (serverTypeId.equals(serverType.getId())) {
-                IServerWorkingCopy serverWorkingCopy = serverType.createServer(serverTypeId, null, runtime, null);
-                assertNotNull("Could not create server", serverWorkingCopy);
-                
-                serverDelegate = 
-                    (GenericServer)serverWorkingCopy.loadAdapter(
-                            GenericServer.class,
-                            new NullProgressMonitor());
-            }
-        }
-
-        return serverDelegate;
-    }
-    
-    
-    public static GenericServerRuntime getGenericServerRuntime(String runtimeTypeId) throws CoreException {
-        GenericServerRuntime runtimeDelegate = null;
-        
-        IRuntimeType[] runtimesTypes = ServerCore.getRuntimeTypes();
-        for (int i = 0; i < runtimesTypes.length; i++) {
-            IRuntimeType runtimeType = runtimesTypes[i];
-            if (runtimeType.getId().equals(runtimeTypeId)) {
-                IRuntime runtimeWorkingCopy = runtimeType.createRuntime(runtimeTypeId, null);
-                runtimeDelegate = 
-                    (GenericServerRuntime)runtimeWorkingCopy.loadAdapter(
-                            GenericServerRuntime.class,
-                            new NullProgressMonitor());
-                break;
-            }
-        }
-        
-        return runtimeDelegate;
-    }
-    
-    public static void verifyProperty(List property, String id, String value) {
-        boolean found = false;
-        int count = 0;
-        Iterator iter = property.iterator();
-        while (iter.hasNext()) {
-            Property prop = (Property) iter.next();
-            if (prop.getId().equals(id)) {
-                assertEquals("Property value does not match", value, prop.getDefault());
-                found = true;
-                ++count;
-            }
-        }
-        assertTrue("Property not found", found);
-        assertEquals("More than one property found", 1, count);
-    }
-
-    public static void verifyNoProperty(List property, String id) {
-        boolean found = false;
-        Iterator iter = property.iterator();
-        while (iter.hasNext()) {
-            Property prop = (Property) iter.next();
-            if (prop.getId().equals(id)) {
-                found = true;
-                break;
-            }
-        }
-        assertFalse("Property found when there should be none", found);
-    }
-
-    public static void verifyClasspath(List classpaths, String id) {
-        boolean found = false;
-        int count = 0;
-        Iterator iter = classpaths.iterator();
-        while (iter.hasNext()) {
-            Classpath cp = (Classpath) iter.next();
-            if (cp.getId().equals(id)) {
-                found = true;
-                ++count;
-            }
-        }
-        assertTrue("Classpath not found", found);
-        assertEquals("More than one classpath found", 1, count);
-    }
-    
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerTypeDefinitionManagerTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerTypeDefinitionManagerTest.java
deleted file mode 100644
index a3eca6f..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerTypeDefinitionManagerTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cape Clear Software.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Black, Cape Clear Software - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.server.generic.tests;
-
-import java.util.Collections;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.server.generic.core.internal.CorePlugin;
-import org.eclipse.jst.server.generic.core.internal.ServerTypeDefinitionManager;
-import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-
-/**
- * A server type can define either:
- * 
- * 1. A serverdefinition extension i.e. a .serverdef file, and a runtimedefinition 
- *    i.e. a .runtimedef file. If so, the serverdef is keyed using the serverTypeId,
- *    and the runtimedef is keyed using the runtimeTypeId.
- *    
- * 2. A serverdefinition extension only i.e. a .serverdef file that contains both
- *    the runtime info and the server info. In this case, the serverdef is keyed using
- *    the runtimeTypeId.     
- *
- * @author <a href="mailto:david.black@capeclear.com">David Black</a>
- */
-public class ServerTypeDefinitionManagerTest extends TestCase implements TestConstants {
-
-    private ServerTypeDefinitionManager manager;
-    
-    
-    protected void setUp() throws Exception {
-        manager = CorePlugin.getDefault().getServerTypeDefinitionManager();
-    }
-
-    protected void tearDown() throws Exception {
-    }
-
-    /**
-     * Use ServerTypeDefinitionManager to load a serverdef 
-     * and runtimedef defined in this plugin.
-     */
-    public void testServerDefAndRuntimeDef() {
-        Map properties = Collections.EMPTY_MAP;
-        
-        /**
-         * Implementation of getServerRuntimeDefinition looks up serverdef extensions
-         * using the given id. It checks to see if this is a serverTypeId, or a
-         * runtimeTypeId. 
-         * 
-         * If it is a serverTypeId, it loads the serverdef and then proceeds to lookup 
-         * runtimedef using the corresponding runtimeTypeId (a server has one runtime, 
-         * a runtime may have many servers). It combines the serverdef and the runtimedef 
-         * to create the ServerRuntime object. If there is no runtimedef this is an error.
-         * 
-         * If the id is a runtimeTypeId, then it loads the serverdef and returns the
-         * ServerRuntime.  
-         */
-        ServerRuntime definition = 
-            manager.getServerRuntimeDefinition(TEST_SERVERTYPE_ID, TEST_RUNTIMETYPE_ID, properties);
-        assertNotNull(definition);
-    }
-
-    public void testServerDefOnly() {
-        Map properties = Collections.EMPTY_MAP;
-        
-        ServerRuntime definition = 
-            manager.getServerRuntimeDefinition(TEST_SERVERDEFONLY_RUNTIMETYPE_ID, properties);
-        assertNotNull(definition);
-        
-        definition = manager.getServerRuntimeDefinition(TEST_SERVERDEFONLY_SERVERTYPE_ID, properties);
-        assertNull(definition);
-    }
-    
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerTypeDefinitionModelTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerTypeDefinitionModelTest.java
deleted file mode 100644
index 83de91a..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/ServerTypeDefinitionModelTest.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.eclipse.jst.server.generic.tests;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.jst.server.generic.core.internal.CorePlugin;
-import org.eclipse.jst.server.generic.servertype.definition.ArchiveType;
-import org.eclipse.jst.server.generic.servertype.definition.ArgumentPair;
-import org.eclipse.jst.server.generic.servertype.definition.Classpath;
-import org.eclipse.jst.server.generic.servertype.definition.JndiConnection;
-import org.eclipse.jst.server.generic.servertype.definition.LaunchConfiguration;
-import org.eclipse.jst.server.generic.servertype.definition.Module;
-import org.eclipse.jst.server.generic.servertype.definition.Port;
-import org.eclipse.jst.server.generic.servertype.definition.Project;
-import org.eclipse.jst.server.generic.servertype.definition.Property;
-import org.eclipse.jst.server.generic.servertype.definition.Publisher;
-import org.eclipse.jst.server.generic.servertype.definition.PublisherData;
-import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-import org.eclipse.jst.server.generic.servertype.definition.ServerTypeFactory;
-
-import junit.framework.TestCase;
-
-public class ServerTypeDefinitionModelTest extends TestCase {
-
-   private static final String TESTED_SERVER_ID = "org.eclipse.jst.server.generic.runtime.jonas4";
-   private ServerRuntime subject = null;
-    protected void setUp() throws Exception {
-       ServerRuntime[] serverdefs = CorePlugin.getDefault().getServerTypeDefinitionManager().getServerTypeDefinitions();
-       for (int i = 0; i < serverdefs.length; i++) {
-        if(TESTED_SERVER_ID.equals(serverdefs[i].getId()))
-            subject=serverdefs[i];
-       }
-    }
-
-	
-	public void testServerTypeFactory(){
-		ServerTypeFactory factory = ServerTypeFactory.eINSTANCE;
-		assertNotNull(factory.createArchiveType());
-		assertNotNull(factory.createClasspath());
-		assertNotNull(factory.createJndiConnection());
-		assertNotNull(factory.createLaunchConfiguration());
-		assertNotNull(factory.createModule());
-		assertNotNull(factory.createPort());
-		assertNotNull(factory.createProject());
-		assertNotNull(factory.createProperty());
-		assertNotNull(factory.createPublisher());
-		assertNotNull(factory.createPublisherData());
-		assertNotNull(factory.createServerRuntime());
-		assertNotNull(factory.getServerTypePackage());
-		
-	}
-    public void testServerRuntime(){
-        assertTrue(subject.getClasspath()!=null && subject.getClasspath().size()>0);
-		assertTrue(subject.getConfigurationElementNamespace()!=null && subject.getConfigurationElementNamespace().length()>0);
-        assertTrue(subject.getName()!= null && subject.getName().length()>0);
-        assertTrue(subject.getVersion()!=null && subject.getVersion().length()>0);
-        assertTrue(subject.getProperty()!=null && subject.getProperty().size()>0);
-        assertTrue(subject.getPort()!=null && subject.getPort().size()>0);
-        assertTrue(subject.getModule()!=null && subject.getModule().size()>0);
-        assertNotNull(subject.getProject());
-        assertNotNull(subject.getStop());
-        assertNotNull(subject.getStart());
-        assertTrue(subject.getId()!= null && subject.getId().length()>0);
-        assertTrue(subject.getFilename()!=null && subject.getFilename().length()>0);
-        Classpath cp = (Classpath)subject.getClasspath().get(0);
-        assertEquals(cp,subject.getClasspath(cp.getId()));
-        Module module = (Module)subject.getModule().get(0);
-        assertEquals(module,subject.getModule(module.getType()));
-		assertNotNull(subject.getPublisher("org.eclipse.jst.server.generic.antpublisher"));
-    }
-	public void testSetServerRuntime()
-	{
-		subject.setId(TESTED_SERVER_ID);
-		subject.setConfigurationElementNamespace("test.namespace");
-		subject.setFilename("test.filename");
-		Map testMap =new HashMap();
-		subject.setPropertyValues(testMap);
-		assertEquals(TESTED_SERVER_ID,subject.getId());
-		assertEquals("test.namespace",subject.getConfigurationElementNamespace());
-		assertEquals("test.filename",subject.getFilename());
-	}
-
-	
-    public void testClasspath()
-    {
-        Classpath cp =(Classpath)subject.getClasspath().get(0);
-        assertTrue(cp.getId()!=null && cp.getId().length()>0);
-        assertTrue(cp.getArchive()!=null && cp.getArchive().size()>0);
-		ArchiveType archiveType = (ArchiveType)cp.getArchive().get(0);
-        assertTrue(archiveType.getPath()!=null && archiveType.getPath().length()>0);
-		
-    }
-    
-    public void testLaunchConfiguration()
-    {
-       LaunchConfiguration lcfg = subject.getStart();
-       assertNotNull(lcfg);
-       assertTrue(lcfg.getMainClass()!=null && lcfg.getMainClass().length()>0);
-       assertTrue(lcfg.getMainClass()!=null && lcfg.getExternal().isEmpty());
-       assertTrue(lcfg.getMainClass()!=null && lcfg.getDebugPort()==null);
-       assertTrue(lcfg.getClasspathReference()!=null && lcfg.getClasspathReference().length()>0);
-       assertTrue(lcfg.getProgramArguments()!=null && !lcfg.getProgramArguments().isEmpty());
-       assertTrue(lcfg.getVmParameters()!=null && !lcfg.getVmParameters().isEmpty());
-       assertTrue(lcfg.getWorkingDirectory()!=null && lcfg.getWorkingDirectory().length()>0);
-    }
-    public void testModule()
-    {
-        Module module = (Module)subject.getModule().get(0);
-        assertNotNull(module);
-        assertTrue(module.getPublishDir()!= null && module.getPublishDir().length()>0);
-        assertTrue(module.getPublisherReference()!=null && module.getPublisherReference().length()>0);
-        assertTrue(module.getType()!=null && module.getType().length()>0);
-    }
-    public void testPort()
-    {
-        Port port = (Port)subject.getPort().get(0);
-        assertNotNull(port);
-        assertNotNull(port.getName());
-        assertTrue(port.getNo()!= null && port.getNo().length()>0);
-        assertTrue(port.getProtocol()!=null && port.getProtocol().length()>0);
-    }
-    public void testProject()
-    {
-        Project project = subject.getProject();
-        assertNotNull(project);
-        assertNotNull(project.getClasspathReference());
-    }
-    public void testProperty()
-    {
-        Property property = (Property)subject.getProperty().get(0);
-        assertNotNull(property);
-        assertTrue(property.getContext()!=null && property.getContext().length()>0);
-        assertTrue(property.getDefault()!=null && property.getDefault().length()>0);
-        assertTrue(property.getId()!=null && property.getId().length()>0);
-        assertTrue(property.getLabel()!= null && property.getLabel().length()>0);
-        assertTrue(property.getType()!= null && property.getType().length()>0);
-        
-    }
-    public void testPublisher()
-    {
-        Publisher publisher = (Publisher)subject.getPublisher().get(0);
-        assertNotNull(publisher);
-        assertTrue(publisher.getId()!=null && publisher.getId().length()>0);
-        assertTrue(publisher.getPublisherdata()!=null && publisher.getPublisherdata().size()>0);
-        PublisherData data = (PublisherData)publisher.getPublisherdata().get(0);
-        assertNotNull(data);
-        assertTrue(data.getDataname()!= null && data.getDataname().length()>0);
-        assertTrue(data.getDatavalue()!=null && data.getDatavalue().length()>0);
-    }
-    public void testJNDIConnection()
-    {
-        JndiConnection jndi = subject.getJndiConnection();
-        assertNotNull(jndi);
-        assertTrue(jndi.getProviderUrl()!=null && jndi.getProviderUrl().length()>0);
-        assertTrue(jndi.getInitialContextFactory()!= null && jndi.getInitialContextFactory().length()>0);
-        assertNotNull(jndi.getJndiProperty());
-        if(jndi.getJndiProperty().size()>0)
-        {
-            ArgumentPair property = (ArgumentPair)jndi.getJndiProperty().get(0);
-            assertNotNull(property.getName());
-            assertNotNull(property.getValue());
-        }
-    }
-    
-    
-    
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestConstants.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestConstants.java
deleted file mode 100644
index 2a2ff18..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestConstants.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cape Clear Software.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Black, Cape Clear Software - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.server.generic.tests;
-
-/**
- * @author <a href="mailto:david.black@capeclear.com">David Black</a>
- */
-public interface TestConstants {
-    public static final String TEST_SERVERTYPE_ID = "bar.server.id";
-    public static final String TEST_RUNTIMETYPE_ID = "bar.runtime.id";
-    
-    public static final String TEST_SERVERDEFONLY_SERVERTYPE_ID = "foo.serverdefonly.server.id";
-    public static final String TEST_SERVERDEFONLY_RUNTIMETYPE_ID = "foo.serverdefonly.runtime.id";
-
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestProject.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestProject.java
deleted file mode 100644
index a37c858..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestProject.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     Naci M. Dai - initial API and implementation
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S.  For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.tests;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.core.search.SearchPattern;
-import org.eclipse.jdt.core.search.TypeNameRequestor;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.osgi.framework.Bundle;
-public class TestProject {
-	public IProject project;
-	public IJavaProject javaProject;
-	private IPackageFragmentRoot sourceFolder;
-	public TestProject() throws CoreException {
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		project = root.getProject("Project-1");
-		project.create(null);
-		project.open(null);
-		javaProject = JavaCore.create(project);
-		IFolder binFolder = createBinFolder();
-		setJavaNature();
-		javaProject.setRawClasspath(new IClasspathEntry[0], null);
-		createOutputFolder(binFolder);
-		addSystemLibraries();
-	}
-	public IProject getProject() {
-		return project;
-	}
-	public IJavaProject getJavaProject() {
-		return javaProject;
-	}
-	public void addJar(String plugin, String jar) throws MalformedURLException,
-			IOException, JavaModelException {
-		Path result = findFileInPlugin(plugin, jar);
-		IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
-		IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
-		System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
-		newEntries[oldEntries.length] = JavaCore.newLibraryEntry(result, null,
-				null);
-		javaProject.setRawClasspath(newEntries, null);
-	}
-	public IPackageFragment createPackage(String name) throws CoreException {
-		if (sourceFolder == null)
-			sourceFolder = createSourceFolder();
-		return sourceFolder.createPackageFragment(name, false, null);
-	}
-	public IType createType(IPackageFragment pack, String cuName, String source)
-			throws JavaModelException {
-		StringBuffer buf = new StringBuffer();
-		buf.append("package " + pack.getElementName() + ";\n");
-		buf.append("\n");
-		buf.append(source);
-		ICompilationUnit cu = pack.createCompilationUnit(cuName,
-				buf.toString(), false, null);
-		return cu.getTypes()[0];
-	}
-	public void dispose() throws CoreException {
-		waitForIndexer();
-		project.delete(true, true, null);
-	}
-	private IFolder createBinFolder() throws CoreException {
-		IFolder binFolder = project.getFolder("bin");
-		binFolder.create(false, true, null);
-		return binFolder;
-	}
-	
-	public IFolder createWebModule(String moduleName, String contents) throws CoreException {
-		IFolder moduleFolder = project.getFolder(moduleName);
-		moduleFolder.create(false, true, null);
-		
-		IFolder folder = project.getFolder(moduleName + "/WEB-INF");
-		folder.create(false, true, null);
-		folder = project.getFolder(moduleName + "/WEB-INF/classes");
-		folder.create(false, true, null); 
-		folder = project.getFolder(moduleName + "/WEB-INF/lib");
-		folder.create(false, true, null);
-
-		ByteArrayInputStream stream = new ByteArrayInputStream(contents.getBytes());
-		IFile file = project.getFile(moduleName + "/WEB-INF/web.xml");
-		file.create(stream, true, null);
-
-		return moduleFolder;
-	}
-	
-	private void setJavaNature() throws CoreException {
-		IProjectDescription description = project.getDescription();
-		description.setNatureIds(new String[]{JavaCore.NATURE_ID});
-		project.setDescription(description, null);
-	}
-	private void createOutputFolder(IFolder binFolder)
-			throws JavaModelException {
-		IPath outputLocation = binFolder.getFullPath();
-		javaProject.setOutputLocation(outputLocation, null);
-	}
-	public IPackageFragmentRoot createSourceFolder() throws CoreException {
-		IFolder folder = project.getFolder("src");
-		folder.create(false, true, null);
-		IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(folder);
-		IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
-		IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
-		System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
-		newEntries[oldEntries.length] = JavaCore.newSourceEntry(root.getPath());
-		javaProject.setRawClasspath(newEntries, null);
-		return root;
-	}
-	private void addSystemLibraries() throws JavaModelException {
-		IClasspathEntry[] oldEntries = javaProject.getRawClasspath();
-		IClasspathEntry[] newEntries = new IClasspathEntry[oldEntries.length + 1];
-		System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
-		newEntries[oldEntries.length] = JavaRuntime
-				.getDefaultJREContainerEntry();
-		javaProject.setRawClasspath(newEntries, null);
-	}
-	private Path findFileInPlugin(String plugin, String file)
-			throws MalformedURLException, IOException {
-		Bundle bundle = Platform.getBundle(plugin);
-		URL pluginURL = bundle.getEntry("/");
-		URL jarURL = new URL(pluginURL, file);
-		URL localJarURL = FileLocator.toFileURL(jarURL);
-		return new Path(localJarURL.getPath());
-	}
-	private void waitForIndexer() throws JavaModelException {
-		new SearchEngine().searchAllTypeNames(null, null, 
-				SearchPattern.R_CASE_SENSITIVE,
-				IJavaSearchConstants.CLASS, SearchEngine
-						.createJavaSearchScope(new IJavaElement[0]),
-				new TypeNameRequestor() {
-					public void acceptClass(char[] packageName,
-							char[] simpleTypeName, char[][] enclosingTypeNames,
-							String path) {
-					}
-					public void acceptInterface(char[] packageName,
-							char[] simpleTypeName, char[][] enclosingTypeNames,
-							String path) {
-					}
-				}, IJavaSearchConstants.WAIT_UNTIL_READY_TO_SEARCH, null);
-	}
-	/**
-	 * @return Returns the sourceFolder.
-	 */
-	public IPackageFragmentRoot getSourceFolder() {
-		return sourceFolder;
-	}
-	/**
-	 * @param sourceFolder The sourceFolder to set.
-	 */
-	public void setSourceFolder(IPackageFragmentRoot sourceFolder) {
-		this.sourceFolder = sourceFolder;
-	}
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestsPlugin.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestsPlugin.java
deleted file mode 100644
index 1b5f954..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/TestsPlugin.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 Eteration Bilisim A.S.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     Naci M. Dai - initial API and implementation
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL ETERATION A.S. OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S.  For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.server.generic.tests;
-
-import org.eclipse.ui.plugin.*;
-import org.osgi.framework.BundleContext;
-import java.util.*;
-
-
-public class TestsPlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static TestsPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	/**
-	 * The constructor.
-	 */
-	public TestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/*
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-		resourceBundle = null;
-	}
-
-	/*
-	 * Returns the shared instance.
-	 */
-	public static TestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/*
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = TestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/*
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.server.generic.tests.TestsPluginResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/XMLUtilsTest.java b/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/XMLUtilsTest.java
deleted file mode 100644
index 09466c8..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/src/org/eclipse/jst/server/generic/tests/XMLUtilsTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Cape Clear Software.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Black, Cape Clear Software - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.server.generic.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.server.generic.internal.xml.XMLUtils;
-import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
-
-/**
- * @author <a href="mailto:david.black@capeclear.com">David Black</a>
- */
-public class XMLUtilsTest extends TestCase implements TestConstants {
-
-    private XMLUtils xmlUtils;
-    
-    
-    protected void setUp() throws Exception {
-        super.setUp();
-        
-        xmlUtils = new XMLUtils();
-    }
-    
-    public void testLoadDefinitions() {
-        ServerRuntime definition = xmlUtils.getServerTypeDefinition(TestConstants.TEST_SERVERDEFONLY_RUNTIMETYPE_ID);
-        assertNotNull(definition);
-        
-        definition = xmlUtils.getServerTypeDefinition(TestConstants.TEST_SERVERDEFONLY_SERVERTYPE_ID);
-        assertNull(definition);
-
-        definition = xmlUtils.getRuntimeTypeDefinition(TestConstants.TEST_SERVERDEFONLY_RUNTIMETYPE_ID);
-        assertNull(definition);
-
-        definition = xmlUtils.getServerTypeDefinition(TestConstants.TEST_SERVERTYPE_ID);
-        assertNotNull(definition);
-
-        definition = xmlUtils.getRuntimeTypeDefinition(TestConstants.TEST_RUNTIMETYPE_ID);
-        assertNotNull(definition);
-    }
-    
-}
diff --git a/tests/org.eclipse.jst.server.generic.tests/test.xml b/tests/org.eclipse.jst.server.generic.tests/test.xml
deleted file mode 100644
index 900f5bb..0000000
--- a/tests/org.eclipse.jst.server.generic.tests/test.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.."/> -->
-	<echo message="basedir ${basedir}" />
-	<echo message="eclipse place ${eclipse-home}" />
-  <!-- sets the properties plugin-name, and library-file -->
-  <property name="plugin-name" value="org.eclipse.jst.server.generic.tests"/>
-  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="jst-folder" value="${eclipse-home}/jst_folder"/>
-    <delete dir="${jst-folder}" quiet="true"/>
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jst-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.jst.server.generic.tests.AllGenericServerTests" />
-   	  <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-</project>
\ No newline at end of file