[147121] WSDL validation performance tests are broken
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenEditorOAGISWSDLTestcase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenEditorOAGISWSDLTestcase.java
index 351fd3c..c0b1165 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenEditorOAGISWSDLTestcase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenEditorOAGISWSDLTestcase.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance;
 
 import java.io.File;
@@ -7,8 +18,11 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+
 import javax.wsdl.WSDLException;
+
 import junit.framework.Assert;
+
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -30,8 +44,6 @@
 
 public class OpenEditorOAGISWSDLTestcase extends PerformanceTestCase
 {
-  private final String ID_WSDL_EDITOR = "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-
   public void testReadWSDL() throws MalformedURLException, WSDLException, CoreException, FileNotFoundException
   {
     String oagis80Dir = System.getProperty("oagis80Dir");
@@ -123,7 +135,7 @@
   private void openWSDL(IFile file) throws PartInitException
   {
     IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-    IEditorPart editor = workbenchWindow.getActivePage().openEditor(new FileEditorInput(file), ID_WSDL_EDITOR, true);
+    IEditorPart editor = workbenchWindow.getActivePage().openEditor(new FileEditorInput(file), PerformancePlugin.WSDL_EDITOR_ID, true);
     workbenchWindow.getActivePage().closeEditor(editor, false);
   }
 }
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLSetup.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLSetup.java
index 5d5c4ce..305ab61 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLSetup.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLSetup.java
@@ -1,20 +1,22 @@
-/**********************************************************************
- * 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
+/*******************************************************************************
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * 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/cpl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
 
 package org.eclipse.wst.wsdl.tests.performance;
 
 import java.io.IOException;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLTestCase.java
index 5a77575..53be5b4 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/OpenStockQuoteWSDLTestCase.java
@@ -1,18 +1,19 @@
-/**********************************************************************
- * 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
+/*******************************************************************************
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * 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/cpl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
 
 package org.eclipse.wst.wsdl.tests.performance;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -28,8 +29,6 @@
 
 public class OpenStockQuoteWSDLTestCase extends PerformanceTestCase
 {
-  private final String EDITOR_ID = "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-
   public static Test suite()
   {
     return new TestSuite(OpenStockQuoteWSDLTestCase.class, "OpenStockQuoteWSDLTestCase");
@@ -79,7 +78,7 @@
     IProject project = getProject(OpenStockQuoteWSDLSetup.PROJECT_NAME);
     IEditorInput editorInput = new FileEditorInput((IFile)project.findMember("StockQuote.wsdl"));
     startMeasuring();
-    IEditorPart editorPart = openEditor(editorInput, EDITOR_ID);
+    IEditorPart editorPart = openEditor(editorInput, PerformancePlugin.WSDL_EDITOR_ID);
     stopMeasuring();
     commitMeasurements();
     assertPerformance();
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/PerformancePlugin.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/PerformancePlugin.java
index 478f4ab..2e68d5d 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/PerformancePlugin.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/PerformancePlugin.java
@@ -1,19 +1,21 @@
-/**********************************************************************
- * 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
+/*******************************************************************************
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * 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/cpl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
 
 package org.eclipse.wst.wsdl.tests.performance;
 
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
-import java.util.*;
 
 /**
  * The main plugin class to be used in the desktop.
@@ -23,8 +25,15 @@
 	private static PerformancePlugin plugin;
 	//Resource bundle.
 	private ResourceBundle resourceBundle;
+
+  // TODO: These two constants should really be pulled from the plugin which declares it.
+  // This will avoid "magic string" dependencies which can be easily broken.
+  public static final String WSDL_EDITOR_ID = "org.eclipse.wst.wsdl.ui.internal.WSDLEditor"; //$NON-NLS-1$
+  public static final String WSDL_VALIDATOR_ID = "org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator"; //$NON-NLS-1$
+  
+  public static final String BUNDLE_ID = "org.eclipse.wst.wsdl.tests.performance";	//$NON-NLS-1$
 	
-	/**
+  /**
 	 * The constructor.
 	 */
 	public PerformancePlugin() {
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadOAGISWSDLTestcase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadOAGISWSDLTestcase.java
index 13d566e..0c69682 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadOAGISWSDLTestcase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadOAGISWSDLTestcase.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance;
 
 import java.io.File;
@@ -5,8 +16,11 @@
 import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.wsdl.WSDLException;
+
 import junit.framework.Assert;
+
 import org.eclipse.test.performance.Dimension;
 import org.eclipse.test.performance.PerformanceTestCase;
 import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLReaderImpl;
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLEMFTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLEMFTestCase.java
index 5f7b53d..7067c70 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLEMFTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLEMFTestCase.java
@@ -1,13 +1,13 @@
-/**********************************************************************
- * 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
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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/cpl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
 
 package org.eclipse.wst.wsdl.tests.performance;
 
@@ -15,6 +15,7 @@
 import java.util.Hashtable;
 
 import javax.wsdl.Definition;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLTestCase.java
index a78fc6b..532caaf 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ReadStockQuoteWSDLTestCase.java
@@ -1,21 +1,24 @@
-/**********************************************************************
- * 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
+/*******************************************************************************
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * 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/cpl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
 
 package org.eclipse.wst.wsdl.tests.performance;
 
 import java.net.URL;
+
 import javax.wsdl.Definition;
 import javax.wsdl.xml.WSDLReader;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
 import org.eclipse.test.performance.PerformanceTestCase;
 import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
 import org.xml.sax.InputSource;
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSDLTestcase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSDLTestcase.java
index a4adbb9..b8d2e2f 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSDLTestcase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSDLTestcase.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance;
 
 import java.io.File;
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSITestcase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSITestcase.java
index c6a379d..1c5dbf8 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSITestcase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateOAGISWSITestcase.java
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance;
 
 import java.io.File;
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSDLTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSDLTestCase.java
index e14f845..76e34a8 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSDLTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSDLTestCase.java
@@ -1,13 +1,13 @@
-/**********************************************************************
- * 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
+/*******************************************************************************
+ * Copyright (c) 2005 2006 IBM Corporation and others.
+ * 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/cpl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
 
 package org.eclipse.wst.wsdl.tests.performance;
 
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSITestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSITestCase.java
index 01fed9c..01cc307 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSITestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateStockQuoteWSITestCase.java
@@ -1,13 +1,13 @@
-/**********************************************************************
- * 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
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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/cpl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
 
 package org.eclipse.wst.wsdl.tests.performance;
 
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateWSDLProjectTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateWSDLProjectTestCase.java
index be5e660..3fd25a2 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateWSDLProjectTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/ValidateWSDLProjectTestCase.java
@@ -1,13 +1,14 @@
-/**********************************************************************
- * 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
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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/cpl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
  * Contributors:
- *    IBM - Initial API and implementation
- **********************************************************************/
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance;
 
 import java.io.File;
@@ -42,7 +43,7 @@
  */
 public class ValidateWSDLProjectTestCase extends PerformanceTestCase {
 	
-	public static Test suite() {
+  public static Test suite() {
 		return new TestSuite(ValidateWSDLProjectTestCase.class, "Test");
 	}
 
@@ -74,7 +75,7 @@
 
 			IWorkspaceRunnable myRunnable = new OneValidatorOperation(
 					project,
-					"org.eclipse.wst.wsdl.ui.internal.validation.Validator",
+          PerformancePlugin.WSDL_VALIDATOR_ID,
 					true, 
 					false);
 			IWorkspace workspace = ResourcesPlugin.getWorkspace();
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open100KBFileTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open100KBFileTestCase.java
index cfa35de..e6baf2c 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open100KBFileTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open100KBFileTestCase.java
@@ -1,19 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.OpenEditorTestCase;
-
-public class Open100KBFileTestCase extends OpenEditorTestCase
+public class Open100KBFileTestCase extends OpenWSDLEditorTestCase
 {
-  protected String getEditorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
   protected String getFilePath()
   {
     return "data/100KB.wsdl";
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open10KBFileTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open10KBFileTestCase.java
index 623d8c0..26a0f7d 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open10KBFileTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open10KBFileTestCase.java
@@ -1,19 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.OpenEditorTestCase;
-
-public class Open10KBFileTestCase extends OpenEditorTestCase
+public class Open10KBFileTestCase extends OpenWSDLEditorTestCase
 {
-  protected String getEditorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
   protected String getFilePath()
   {
     return "data/10KB.wsdl";
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open1KBFileTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open1KBFileTestCase.java
index 1f5a00b..fdd8ec6 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open1KBFileTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open1KBFileTestCase.java
@@ -1,19 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.OpenEditorTestCase;
-
-public class Open1KBFileTestCase extends OpenEditorTestCase
+public class Open1KBFileTestCase extends OpenWSDLEditorTestCase
 {
-  protected String getEditorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
   protected String getFilePath()
   {
     return "data/1KB.wsdl";
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open1MBFileTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open1MBFileTestCase.java
index 20ac5cc..338b5a8 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open1MBFileTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open1MBFileTestCase.java
@@ -1,19 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.OpenEditorTestCase;
-
-public class Open1MBFileTestCase extends OpenEditorTestCase
+public class Open1MBFileTestCase extends OpenWSDLEditorTestCase
 {
-  protected String getEditorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
   protected String getFilePath()
   {
     return "data/1MB.wsdl";
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open200KBFileTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open200KBFileTestCase.java
index c55b244..1f004e2 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open200KBFileTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open200KBFileTestCase.java
@@ -1,19 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.OpenEditorTestCase;
-
-public class Open200KBFileTestCase extends OpenEditorTestCase
+public class Open200KBFileTestCase extends OpenWSDLEditorTestCase
 {
-  protected String getEditorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
   protected String getFilePath()
   {
     return "data/200KB.wsdl";
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open500KBFileTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open500KBFileTestCase.java
index 288a2aa..a9f64f0 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open500KBFileTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Open500KBFileTestCase.java
@@ -1,19 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.OpenEditorTestCase;
-
-public class Open500KBFileTestCase extends OpenEditorTestCase
+public class Open500KBFileTestCase extends OpenWSDLEditorTestCase
 {
-  protected String getEditorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
   protected String getFilePath()
   {
     return "data/500KB.wsdl";
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/OpenWSDLEditorTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/OpenWSDLEditorTestCase.java
new file mode 100644
index 0000000..5d413d6
--- /dev/null
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/OpenWSDLEditorTestCase.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.wsdl.tests.performance.scalability;
+
+import org.eclipse.wst.common.tests.performance.internal.scalability.OpenEditorTestCase;
+import org.eclipse.wst.wsdl.tests.performance.PerformancePlugin;
+
+public abstract class OpenWSDLEditorTestCase extends OpenEditorTestCase
+{
+  protected String getEditorId()
+  {
+    return PerformancePlugin.WSDL_EDITOR_ID;
+  }
+
+  protected String getBundleId()
+  {
+    return PerformancePlugin.BUNDLE_ID;
+  }
+}
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx100TestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx100TestCase.java
index 193a9a9..2ac9964 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx100TestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx100TestCase.java
@@ -1,24 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RepeatOpenEditorTestCase;
-
-public class RepeatOpenEditorx100TestCase extends RepeatOpenEditorTestCase
+public class RepeatOpenEditorx100TestCase extends RepeatOpenWSDLEditorTestCase
 {
-  protected String getEditorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
-  protected String getFilePath()
-  {
-    return "data/100KB.wsdl";
-  }
-
   protected int getRepeatCount()
   {
     return 100;
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx10TestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx10TestCase.java
index ec4f3d0..e2d27a5 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx10TestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx10TestCase.java
@@ -1,24 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RepeatOpenEditorTestCase;
-
-public class RepeatOpenEditorx10TestCase extends RepeatOpenEditorTestCase
+public class RepeatOpenEditorx10TestCase extends RepeatOpenWSDLEditorTestCase
 {
-  protected String getEditorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
-  protected String getFilePath()
-  {
-    return "data/100KB.wsdl";
-  }
-
   protected int getRepeatCount()
   {
     return 10;
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx1TestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx1TestCase.java
index d597270..dac33d7 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx1TestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx1TestCase.java
@@ -1,24 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RepeatOpenEditorTestCase;
-
-public class RepeatOpenEditorx1TestCase extends RepeatOpenEditorTestCase
+public class RepeatOpenEditorx1TestCase extends RepeatOpenWSDLEditorTestCase
 {
-  protected String getEditorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
-  protected String getFilePath()
-  {
-    return "data/100KB.wsdl";
-  }
-
   protected int getRepeatCount()
   {
     return 1;
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx25TestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx25TestCase.java
index 52db3be..fb10251 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx25TestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx25TestCase.java
@@ -1,24 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RepeatOpenEditorTestCase;
-
-public class RepeatOpenEditorx25TestCase extends RepeatOpenEditorTestCase
+public class RepeatOpenEditorx25TestCase extends RepeatOpenWSDLEditorTestCase
 {
-  protected String getEditorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
-  protected String getFilePath()
-  {
-    return "data/100KB.wsdl";
-  }
-
   protected int getRepeatCount()
   {
     return 25;
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx50TestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx50TestCase.java
index 58a0aa3..4a041d4 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx50TestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx50TestCase.java
@@ -1,24 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RepeatOpenEditorTestCase;
-
-public class RepeatOpenEditorx50TestCase extends RepeatOpenEditorTestCase
+public class RepeatOpenEditorx50TestCase extends RepeatOpenWSDLEditorTestCase
 {
-  protected String getEditorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
-  protected String getFilePath()
-  {
-    return "data/100KB.wsdl";
-  }
-
   protected int getRepeatCount()
   {
     return 50;
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx75TestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx75TestCase.java
index 730ff4c..8eb4800 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx75TestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenEditorx75TestCase.java
@@ -1,24 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RepeatOpenEditorTestCase;
-
-public class RepeatOpenEditorx75TestCase extends RepeatOpenEditorTestCase
+public class RepeatOpenEditorx75TestCase extends RepeatOpenWSDLEditorTestCase
 {
-  protected String getEditorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
-  protected String getFilePath()
-  {
-    return "data/100KB.wsdl";
-  }
-
   protected int getRepeatCount()
   {
     return 75;
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenWSDLEditorTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenWSDLEditorTestCase.java
new file mode 100644
index 0000000..795263d
--- /dev/null
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatOpenWSDLEditorTestCase.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.wsdl.tests.performance.scalability;
+
+import org.eclipse.wst.common.tests.performance.internal.scalability.RepeatOpenEditorTestCase;
+import org.eclipse.wst.wsdl.tests.performance.PerformancePlugin;
+
+public abstract class RepeatOpenWSDLEditorTestCase extends RepeatOpenEditorTestCase
+{
+  protected String getEditorId()
+  {
+    return PerformancePlugin.WSDL_EDITOR_ID;
+  }
+
+  protected String getBundleId()
+  {
+    return PerformancePlugin.BUNDLE_ID;
+  }
+
+  protected String getFilePath()
+  {
+    return "data/100KB.wsdl";
+  }
+}
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatRunWSDLValidatorTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatRunWSDLValidatorTestCase.java
new file mode 100644
index 0000000..1fc54d8
--- /dev/null
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatRunWSDLValidatorTestCase.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+* Copyright (c) 2006 IBM Corporation and others.
+* 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:
+* IBM Corporation - initial API and implementation
+*******************************************************************************/ 
+
+package org.eclipse.wst.wsdl.tests.performance.scalability;
+
+import org.eclipse.wst.common.tests.performance.internal.scalability.RepeatRunValidatorTestCase;
+import org.eclipse.wst.wsdl.tests.performance.PerformancePlugin;
+
+public abstract class RepeatRunWSDLValidatorTestCase extends RepeatRunValidatorTestCase
+{
+  protected String getValidatorId()
+  {
+    return PerformancePlugin.WSDL_VALIDATOR_ID;
+  }
+
+  protected String getBundleId()
+  {
+    return PerformancePlugin.BUNDLE_ID;
+  }
+
+  protected String getFilePath()
+  {
+    return "data/100KB.wsdl";
+  }
+
+}
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex100TestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex100TestCase.java
index 215de77..5d40275 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex100TestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex100TestCase.java
@@ -1,29 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RepeatRunValidatorTestCase;
-
-public class RepeatValidatex100TestCase extends RepeatRunValidatorTestCase
+public class RepeatValidatex100TestCase extends RepeatRunWSDLValidatorTestCase
 {
   protected int getRepeatCount()
   {
     return 100;
   }
 
-  protected String getValidatorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
-  protected String getFilePath()
-  {
-    return "data/100KB.wsdl";
-  }
-
   public void testValidatex100()
   {
     try
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex10TestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex10TestCase.java
index 33278ba..3efaadf 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex10TestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex10TestCase.java
@@ -1,29 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RepeatRunValidatorTestCase;
-
-public class RepeatValidatex10TestCase extends RepeatRunValidatorTestCase
+public class RepeatValidatex10TestCase extends RepeatRunWSDLValidatorTestCase
 {
   protected int getRepeatCount()
   {
     return 10;
   }
 
-  protected String getValidatorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
-  protected String getFilePath()
-  {
-    return "data/100KB.wsdl";
-  }
-
   public void testValidatex10()
   {
     try
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex1TestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex1TestCase.java
index 9128369..143d103 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex1TestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex1TestCase.java
@@ -1,29 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RepeatRunValidatorTestCase;
-
-public class RepeatValidatex1TestCase extends RepeatRunValidatorTestCase
+public class RepeatValidatex1TestCase extends RepeatRunWSDLValidatorTestCase
 {
   protected int getRepeatCount()
   {
     return 1;
   }
 
-  protected String getValidatorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
-  protected String getFilePath()
-  {
-    return "data/100KB.wsdl";
-  }
-
   public void testValidatex1()
   {
     try
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex25TestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex25TestCase.java
index 85e2eb9..68e464d 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex25TestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex25TestCase.java
@@ -1,29 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RepeatRunValidatorTestCase;
-
-public class RepeatValidatex25TestCase extends RepeatRunValidatorTestCase
+public class RepeatValidatex25TestCase extends RepeatRunWSDLValidatorTestCase
 {
   protected int getRepeatCount()
   {
     return 25;
   }
 
-  protected String getValidatorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
-  protected String getFilePath()
-  {
-    return "data/100KB.wsdl";
-  }
-
   public void testValidatex25()
   {
     try
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex50TestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex50TestCase.java
index bb47cc1..771326b 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex50TestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex50TestCase.java
@@ -1,29 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RepeatRunValidatorTestCase;
-
-public class RepeatValidatex50TestCase extends RepeatRunValidatorTestCase
+public class RepeatValidatex50TestCase extends RepeatRunWSDLValidatorTestCase
 {
   protected int getRepeatCount()
   {
     return 50;
   }
 
-  protected String getValidatorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
-  protected String getFilePath()
-  {
-    return "data/100KB.wsdl";
-  }
-
   public void testValidatex50()
   {
     try
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex75TestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex75TestCase.java
index 8170c5b..ce69bd9 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex75TestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RepeatValidatex75TestCase.java
@@ -1,29 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RepeatRunValidatorTestCase;
-
-public class RepeatValidatex75TestCase extends RepeatRunValidatorTestCase
+public class RepeatValidatex75TestCase extends RepeatRunWSDLValidatorTestCase
 {
   protected int getRepeatCount()
   {
     return 75;
   }
 
-  protected String getValidatorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
-  protected String getFilePath()
-  {
-    return "data/100KB.wsdl";
-  }
-
   public void testValidatex75()
   {
     try
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RunWSDLValidatorTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RunWSDLValidatorTestCase.java
new file mode 100644
index 0000000..2b74db3
--- /dev/null
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/RunWSDLValidatorTestCase.java
@@ -0,0 +1,30 @@
+/*******************************************************************************
+* Copyright (c) 2006 IBM Corporation and others.
+* 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:
+* IBM Corporation - initial API and implementation
+*******************************************************************************/ 
+
+package org.eclipse.wst.wsdl.tests.performance.scalability;
+
+import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
+import org.eclipse.wst.wsdl.tests.performance.PerformancePlugin;
+
+public abstract class RunWSDLValidatorTestCase extends RunValidatorTestCase
+{
+
+  protected String getValidatorId()
+  {
+      return PerformancePlugin.WSDL_VALIDATOR_ID;
+  }
+
+  protected String getBundleId()
+  {
+      return PerformancePlugin.BUNDLE_ID;
+  }
+
+}
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1000WSDLsCrossDependsTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1000WSDLsCrossDependsTestCase.java
index 2f920a7..63a9414 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1000WSDLsCrossDependsTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1000WSDLsCrossDependsTestCase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
+ * Copyright (c) 2006 IBM Corporation and others.
  * 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
@@ -12,22 +12,11 @@
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
 import org.eclipse.wst.ws.internal.plugin.WSPlugin;
 import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
 
-public class Validate1000WSDLsCrossDependsTestCase extends RunValidatorTestCase
+public class Validate1000WSDLsCrossDependsTestCase extends RunWSDLValidatorTestCase
 {
-	protected String getValidatorId()
-	{
-	    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-	}
-
-	protected String getBundleId()
-	{
-	    return "org.eclipse.wst.wsdl.tests.performance";
-	}
-	
 	protected void setUp() throws Exception
 	{
 		WSPlugin.getDefault().getWSIAPContext().updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
@@ -43,7 +32,7 @@
 
 	protected String getFilePath()
 	{
-	    return "data/1000WSDLsCrossDepends/sample0.xsd";
+	    return "data/1000WSDLsCrossDepends/sample0.wsdl";
 	}
 	
 	public void testValidate1000WSDLsCrossDepends()
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1000WSDLsNoDependsTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1000WSDLsNoDependsTestCase.java
index 9315110..4fb7027 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1000WSDLsNoDependsTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1000WSDLsNoDependsTestCase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
+ * Copyright (c) 2006 IBM Corporation and others.
  * 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
@@ -12,22 +12,11 @@
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
 import org.eclipse.wst.ws.internal.plugin.WSPlugin;
 import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
 
-public class Validate1000WSDLsNoDependsTestCase extends RunValidatorTestCase
+public class Validate1000WSDLsNoDependsTestCase extends RunWSDLValidatorTestCase
 {
-	protected String getValidatorId()
-	{
-	    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-	}
-
-	protected String getBundleId()
-	{
-	    return "org.eclipse.wst.wsdl.tests.performance";
-	}
-	
 	protected void setUp() throws Exception
 	{
 		WSPlugin.getDefault().getWSIAPContext().updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
@@ -43,7 +32,7 @@
 
 	protected String getFilePath()
 	{
-	    return "data/1000WSDLsNoDepends/sample0.xsd";
+	    return "data/1000WSDLsNoDepends/sample0.wsdl";
 	}
 	
 	public void testValidate1000WSDLsNoDepends()
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1000WSDLsXSDDependsTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1000WSDLsXSDDependsTestCase.java
index 148c2d1..6577094 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1000WSDLsXSDDependsTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1000WSDLsXSDDependsTestCase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
+ * Copyright (c) 2006 IBM Corporation and others.
  * 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
@@ -12,22 +12,11 @@
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
 import org.eclipse.wst.ws.internal.plugin.WSPlugin;
 import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
 
-public class Validate1000WSDLsXSDDependsTestCase extends RunValidatorTestCase
+public class Validate1000WSDLsXSDDependsTestCase extends RunWSDLValidatorTestCase
 {
-	protected String getValidatorId()
-	{
-	    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-	}
-
-	protected String getBundleId()
-	{
-	    return "org.eclipse.wst.wsdl.tests.performance";
-	}
-	
 	protected void setUp() throws Exception
 	{
 		WSPlugin.getDefault().getWSIAPContext().updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
@@ -43,7 +32,7 @@
 
 	protected String getFilePath()
 	{
-	    return "data/1000WSDLsXSDDepends/sample0.xsd";
+	    return "data/1000WSDLsXSDDepends/sample0.wsdl";
 	}
 	
 	public void testValidate1000WSDLsXSDDepends()
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100KBFileTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100KBFileTestCase.java
index 7bfc579..5d178e1 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100KBFileTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100KBFileTestCase.java
@@ -1,19 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
 
-public class Validate100KBFileTestCase extends RunValidatorTestCase
+public class Validate100KBFileTestCase extends RunWSDLValidatorTestCase
 {
-  protected String getValidatorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
   protected String getFilePath()
   {
     return "data/100KB.wsdl";
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100WSDLsCrossDependsTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100WSDLsCrossDependsTestCase.java
index 9499c90..b4cb17e 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100WSDLsCrossDependsTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100WSDLsCrossDependsTestCase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
+ * Copyright (c) 2006 IBM Corporation and others.
  * 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
@@ -12,22 +12,11 @@
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
 import org.eclipse.wst.ws.internal.plugin.WSPlugin;
 import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
 
-public class Validate100WSDLsCrossDependsTestCase extends RunValidatorTestCase
+public class Validate100WSDLsCrossDependsTestCase extends RunWSDLValidatorTestCase
 {
-	protected String getValidatorId()
-	{
-	    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-	}
-
-	protected String getBundleId()
-	{
-	    return "org.eclipse.wst.wsdl.tests.performance";
-	}
-	
 	protected void setUp() throws Exception
 	{
 		WSPlugin.getDefault().getWSIAPContext().updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
@@ -43,7 +32,7 @@
 
 	protected String getFilePath()
 	{
-	    return "data/100WSDLsCrossDepends/sample0.xsd";
+	    return "data/100WSDLsCrossDepends/sample0.wsdl";
 	}
 	
 	public void testValidate100WSDLsCrossDepends()
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100WSDLsNoDependsTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100WSDLsNoDependsTestCase.java
index e870300..161a02d 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100WSDLsNoDependsTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100WSDLsNoDependsTestCase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
+ * Copyright (c) 2006 IBM Corporation and others.
  * 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
@@ -12,22 +12,11 @@
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
 import org.eclipse.wst.ws.internal.plugin.WSPlugin;
 import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
 
-public class Validate100WSDLsNoDependsTestCase extends RunValidatorTestCase
+public class Validate100WSDLsNoDependsTestCase extends RunWSDLValidatorTestCase
 {
-	protected String getValidatorId()
-	{
-	    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-	}
-
-	protected String getBundleId()
-	{
-	    return "org.eclipse.wst.wsdl.tests.performance";
-	}
-	
 	protected void setUp() throws Exception
 	{
 		WSPlugin.getDefault().getWSIAPContext().updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
@@ -43,7 +32,7 @@
 
 	protected String getFilePath()
 	{
-	    return "data/100WSDLsNoDepends/sample0.xsd";
+	    return "data/100WSDLsNoDepends/sample0.wsdl";
 	}
 	
 	public void testValidate100WSDLsNoDepends()
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100WSDLsXSDDependsTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100WSDLsXSDDependsTestCase.java
index 774e8d6..59d2f5d 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100WSDLsXSDDependsTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate100WSDLsXSDDependsTestCase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
+ * Copyright (c) 2006 IBM Corporation and others.
  * 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
@@ -12,22 +12,11 @@
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
 import org.eclipse.wst.ws.internal.plugin.WSPlugin;
 import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
 
-public class Validate100WSDLsXSDDependsTestCase extends RunValidatorTestCase
+public class Validate100WSDLsXSDDependsTestCase extends RunWSDLValidatorTestCase
 {
-	protected String getValidatorId()
-	{
-	    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-	}
-
-	protected String getBundleId()
-	{
-	    return "org.eclipse.wst.wsdl.tests.performance";
-	}
-	
 	protected void setUp() throws Exception
 	{
 		WSPlugin.getDefault().getWSIAPContext().updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10KBFileTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10KBFileTestCase.java
index 9c9fa8c..ff2d260 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10KBFileTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10KBFileTestCase.java
@@ -1,19 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
-
-public class Validate10KBFileTestCase extends RunValidatorTestCase
+public class Validate10KBFileTestCase extends RunWSDLValidatorTestCase
 {
-  protected String getValidatorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
   protected String getFilePath()
   {
     return "data/10KB.wsdl";
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10WSDLsCrossDependsTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10WSDLsCrossDependsTestCase.java
index 2de6161..7b1d0d1 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10WSDLsCrossDependsTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10WSDLsCrossDependsTestCase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
+ * Copyright (c) 2006 IBM Corporation and others.
  * 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
@@ -12,22 +12,11 @@
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
 import org.eclipse.wst.ws.internal.plugin.WSPlugin;
 import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
 
-public class Validate10WSDLsCrossDependsTestCase extends RunValidatorTestCase
+public class Validate10WSDLsCrossDependsTestCase extends RunWSDLValidatorTestCase
 {
-	protected String getValidatorId()
-	{
-	    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-	}
-
-	protected String getBundleId()
-	{
-	    return "org.eclipse.wst.wsdl.tests.performance";
-	}
-	
 	protected void setUp() throws Exception
 	{
 		WSPlugin.getDefault().getWSIAPContext().updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
@@ -43,7 +32,7 @@
 
 	protected String getFilePath()
 	{
-	    return "data/10WSDLsCrossDepends/sample0.xsd";
+	    return "data/10WSDLsCrossDepends/sample0.wsdl";
 	}
 	
 	public void testValidate10WSDLsCrossDepends()
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10WSDLsNoDependsTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10WSDLsNoDependsTestCase.java
index aa59979..ba247d5 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10WSDLsNoDependsTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10WSDLsNoDependsTestCase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
+ * Copyright (c) 2006 IBM Corporation and others.
  * 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
@@ -12,22 +12,11 @@
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
 import org.eclipse.wst.ws.internal.plugin.WSPlugin;
 import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
 
-public class Validate10WSDLsNoDependsTestCase extends RunValidatorTestCase
+public class Validate10WSDLsNoDependsTestCase extends RunWSDLValidatorTestCase
 {
-	protected String getValidatorId()
-	{
-	    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-	}
-
-	protected String getBundleId()
-	{
-	    return "org.eclipse.wst.wsdl.tests.performance";
-	}
-	
 	protected void setUp() throws Exception
 	{
 		WSPlugin.getDefault().getWSIAPContext().updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
@@ -43,7 +32,7 @@
 
 	protected String getFilePath()
 	{
-	    return "data/10WSDLsNoDepends/sample0.xsd";
+	    return "data/10WSDLsNoDepends/sample0.wsdl";
 	}
 	
 	public void testValidate10WSDLsNoDepends()
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10WSDLsXSDDependsTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10WSDLsXSDDependsTestCase.java
index 1f754dd..6096b94 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10WSDLsXSDDependsTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate10WSDLsXSDDependsTestCase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
+ * Copyright (c) 2006 IBM Corporation and others.
  * 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
@@ -12,22 +12,11 @@
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
 import org.eclipse.wst.ws.internal.plugin.WSPlugin;
 import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext;
 
-public class Validate10WSDLsXSDDependsTestCase extends RunValidatorTestCase
+public class Validate10WSDLsXSDDependsTestCase extends RunWSDLValidatorTestCase
 {
-	protected String getValidatorId()
-	{
-	    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-	}
-
-	protected String getBundleId()
-	{
-	    return "org.eclipse.wst.wsdl.tests.performance";
-	}
-	
 	protected void setUp() throws Exception
 	{
 		WSPlugin.getDefault().getWSIAPContext().updateWSICompliances(PersistentWSIContext.IGNORE_NON_WSI);
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1KBFileTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1KBFileTestCase.java
index 510cc93..faa80ae 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1KBFileTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1KBFileTestCase.java
@@ -1,19 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
-
-public class Validate1KBFileTestCase extends RunValidatorTestCase
+public class Validate1KBFileTestCase extends RunWSDLValidatorTestCase
 {
-  protected String getValidatorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
   protected String getFilePath()
   {
     return "data/1KB.wsdl";
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1MBFileTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1MBFileTestCase.java
index f9f0e0e..aa44c08 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1MBFileTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate1MBFileTestCase.java
@@ -1,19 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
-
-public class Validate1MBFileTestCase extends RunValidatorTestCase
+public class Validate1MBFileTestCase extends RunWSDLValidatorTestCase
 {
-  protected String getValidatorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
   protected String getFilePath()
   {
     return "data/1MB.wsdl";
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate200KBFileTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate200KBFileTestCase.java
index 3f9f840..96f4337 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate200KBFileTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate200KBFileTestCase.java
@@ -1,19 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
-
-public class Validate200KBFileTestCase extends RunValidatorTestCase
+public class Validate200KBFileTestCase extends RunWSDLValidatorTestCase
 {
-  protected String getValidatorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
   protected String getFilePath()
   {
     return "data/200KB.wsdl";
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate500KBFileTestCase.java b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate500KBFileTestCase.java
index fb28c9b..bb55ba0 100644
--- a/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate500KBFileTestCase.java
+++ b/tests/org.eclipse.wst.wsdl.tests.performance/performance/org/eclipse/wst/wsdl/tests/performance/scalability/Validate500KBFileTestCase.java
@@ -1,19 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * 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:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.wst.wsdl.tests.performance.scalability;
 
-import org.eclipse.wst.common.tests.performance.internal.scalability.RunValidatorTestCase;
-
-public class Validate500KBFileTestCase extends RunValidatorTestCase
+public class Validate500KBFileTestCase extends RunWSDLValidatorTestCase
 {
-  protected String getValidatorId()
-  {
-    return "org.eclipse.wst.wsdl.ui.internal.validation.Validator";
-  }
-
-  protected String getBundleId()
-  {
-    return "org.eclipse.wst.wsdl.tests.performance";
-  }
-
   protected String getFilePath()
   {
     return "data/500KB.wsdl";