Good-bye, IServerConfigurations!

diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/AllTests.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/AllTests.java
index 0314445..62b4c1f 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/AllTests.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/AllTests.java

@@ -46,7 +46,6 @@
 		suite.addTestSuite(ServerTypesTestCase.class);
 		suite.addTestSuite(ServerTasksTestCase.class);
 		suite.addTestSuite(ServerLocatorsTestCase.class);
-		suite.addTestSuite(ServerConfigurationTypesTestCase.class);
 		suite.addTestSuite(ModuleObjectAdaptersTestCase.class);
 		suite.addTestSuite(LaunchableAdaptersTestCase.class);
 		suite.addTestSuite(ClientsTestCase.class);

diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ModuleObjectAdaptersTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ModuleObjectAdaptersTestCase.java
index 0f6414a..a3b2689 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ModuleObjectAdaptersTestCase.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ModuleObjectAdaptersTestCase.java

@@ -14,7 +14,7 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.eclipse.wst.server.core.IModuleObjectAdapter;
+import org.eclipse.wst.server.core.IModuleArtifactAdapter;
 import org.eclipse.wst.server.core.ServerCore;
 
 public class ModuleObjectAdaptersTestCase extends TestCase {
@@ -23,7 +23,7 @@
 	}
 
 	public void testModuleObjectAdaptersExtension() throws Exception {
-		IModuleObjectAdapter[] moa = ServerCore.getModuleObjectAdapters();
+		IModuleArtifactAdapter[] moa = ServerCore.getModuleArtifactAdapters();
 		if (moa != null) {
 			int size = moa.length;
 			for (int i = 0; i < size; i++)

diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerConfigurationTypesTestCase.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerConfigurationTypesTestCase.java
deleted file mode 100644
index d19a881..0000000
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/extension/ServerConfigurationTypesTestCase.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * 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:
- *    IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.wst.server.core.tests.extension;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.server.core.IServerConfigurationType;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class ServerConfigurationTypesTestCase extends TestCase {
-	public static Test suite() {
-		return new TestSuite(ServerConfigurationTypesTestCase.class, "ServerConfigurationTypesTestCase");
-	}
-
-	public void testServerConfigurationTypesExtension() throws Exception {
-		IServerConfigurationType[] serverConfigTypes = ServerCore.getServerConfigurationTypes();
-		if (serverConfigTypes != null) {
-			int size = serverConfigTypes.length;
-			for (int i = 0; i < size; i++)
-				System.out.println(serverConfigTypes[i].getId() + " - " + serverConfigTypes[i].getName());
-		}
-	}
-}
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/common/AbstractOpenEditorTestCase.java b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/common/AbstractOpenEditorTestCase.java
index 7765166..6f8194f 100644
--- a/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/common/AbstractOpenEditorTestCase.java
+++ b/tests/org.eclipse.wst.server.tests.performance/performance/org/eclipse/wst/server/tests/performance/common/AbstractOpenEditorTestCase.java

@@ -23,7 +23,7 @@
 		startMeasuring();
 		IServer server = getFirstServer(getServerTypeId());
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		IEditorPart editor = page.openEditor(new ServerEditorInput(server.getId(), server.getServerConfiguration().getId()), SERVER_EDITOR_ID, true);
+		IEditorPart editor = page.openEditor(new ServerEditorInput(server.getId()), SERVER_EDITOR_ID, true);
 		stopMeasuring();
 		commitMeasurements();
 		assertPerformance();