[129531] Need to spec 'internals', 'friends', and "organize manifests".

diff --git a/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
index b2d68ec..ce895ad 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF

@@ -1,17 +1,19 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: JSP Core Tests
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.jsp.core.tests
 Bundle-Version: 1.0.0
 Bundle-ClassPath: jspcoretests.jar
 Bundle-Activator: org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jst.jsp.core.tests,
  org.eclipse.jst.jsp.core.tests.cleanupformat,
  org.eclipse.jst.jsp.core.tests.cleanupformat.testfiles,
  org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific,
- org.eclipse.jst.jsp.core.tests.dom
+ org.eclipse.jst.jsp.core.tests.dom,
+ org.eclipse.jst.jsp.core.tests.model,
+ org.eclipse.jst.jsp.core.tests.taglibindex
 Require-Bundle: org.junit,
  org.eclipse.wst.html.core,
  org.eclipse.wst.xml.core,
@@ -20,4 +22,4 @@
  org.eclipse.core.runtime,
  org.eclipse.jst.jsp.core,
  org.eclipse.wst.css.core
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true

diff --git a/tests/org.eclipse.jst.jsp.core.tests/build.properties b/tests/org.eclipse.jst.jsp.core.tests/build.properties
index 7011bc6..c9283b0 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/build.properties
+++ b/tests/org.eclipse.jst.jsp.core.tests/build.properties

@@ -8,8 +8,7 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bin.includes = plugin.xml,\
-               test.xml,\
+bin.includes = test.xml,\
                jspcoretests.jar,\
                META-INF/,\
                about.html,\
@@ -18,6 +17,5 @@
 source.jspcoretests.jar = src/
 output.jspcoretests.jar = bin/
 src.includes = test.xml,\
-               plugin.xml,\
                META-INF/,\
                testfiles/

diff --git a/tests/org.eclipse.jst.jsp.core.tests/plugin.properties b/tests/org.eclipse.jst.jsp.core.tests/plugin.properties
new file mode 100644
index 0000000..f13db37
--- /dev/null
+++ b/tests/org.eclipse.jst.jsp.core.tests/plugin.properties

@@ -0,0 +1,3 @@
+# properties file for org.eclipse.jst.jsp.core.tests
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Name.0 = JSP Core Tests
\ No newline at end of file

diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java
index 7f38eae..bf5b3b7 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java

@@ -16,6 +16,7 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 
@@ -74,7 +75,7 @@
 		URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.core.tests").getEntry("/");
 		URL resolvedLocation = null;
 		try {
-			resolvedLocation = Platform.resolve(installLocation);
+			resolvedLocation = FileLocator.resolve(installLocation);
 		}
 		catch (IOException e) {
 			// impossible

diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java
index d1f8e03..0e72b76 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java

@@ -15,9 +15,9 @@
 
 import junit.framework.TestCase;
 
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 
 /**
  * This class tests basic creation of IModelManager plugin and the

diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java
index 62f7d05..b45933e 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java

@@ -16,8 +16,8 @@
 import junit.framework.Test;
 import junit.framework.TestCase;
 
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 
 /**

diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java
index 4fb7adb..ff3ca24 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java

@@ -19,13 +19,13 @@
 
 import org.eclipse.wst.html.core.internal.cleanup.HTMLCleanupProcessorImpl;
 import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor;
 import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
+import org.eclipse.wst.sse.core.utils.StringUtils;
 import org.eclipse.wst.xml.core.internal.cleanup.CleanupProcessorXML;
 
 public class CleanupTester extends TestCase {

diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java
index 3920351..e09d390 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java

@@ -17,13 +17,13 @@
 import junit.framework.TestCase;
 
 import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.format.AbstractStructuredFormatProcessor;
 import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
+import org.eclipse.wst.sse.core.utils.StringUtils;
 import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
 import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML;
 

diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java
index 7cb8921..e443744 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java

@@ -15,7 +15,7 @@
 import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
 import org.eclipse.jst.jsp.core.tests.Logger;
 import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.xml.core.internal.document.AttrImpl;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.w3c.dom.Document;

diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java
index 69f5cf4..c28996f 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java

@@ -17,9 +17,9 @@
 import junit.framework.TestCase;
 
 import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
 

diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java
index 89fadcf..1b13763 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java

@@ -15,8 +15,8 @@
 import junit.framework.TestCase;
 
 import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 
 public class TestModelRelease extends TestCase {

diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java
index 59f786a..f84bee6 100644
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java
+++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java

@@ -30,9 +30,9 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
 import org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 
 public class TestModelWithNoFile extends TestCase {

diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
index db400fc..161345c 100644
--- a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF

@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: JSP Encoding Tests Plug-in
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.jsp.tests.encoding
 Bundle-Version: 1.0.0
 Bundle-ClassPath: jspencodingtests.jar
 Bundle-Activator: org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jst.jsp.tests.encoding,
  org.eclipse.jst.jsp.tests.encoding.jsp
@@ -16,4 +16,4 @@
  org.junit,
  org.eclipse.wst.sse.core,
  org.eclipse.wst.xml.tests.encoding
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true

diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties b/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
index 7a820cb..34304b5 100644
--- a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
+++ b/tests/org.eclipse.jst.jsp.tests.encoding/build.properties

@@ -1,12 +1,10 @@
 source.jspencodingtests.jar = src/
 output.jspencodingtests.jar = bin/
-bin.includes = plugin.xml,\
-               jspencodingtests.jar,\
+bin.includes = jspencodingtests.jar,\
                testfiles/,\
                test.xml,\
                META-INF/,\
                about.html
 src.includes = testfiles/,\
                test.xml,\
-               plugin.xml,\
                META-INF/

diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties b/tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties
new file mode 100644
index 0000000..98b1b7f
--- /dev/null
+++ b/tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties

@@ -0,0 +1,3 @@
+# properties file for org.eclipse.jst.jsp.tests.encoding
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Name.0 = JSP Encoding Tests Plug-in
\ No newline at end of file

diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
index 3798ccb..18e0c68 100644
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
+++ b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java

@@ -23,6 +23,7 @@
 
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 
@@ -43,9 +44,8 @@
 		if (!topDir.isDirectory()) {
 			throw new IllegalArgumentException(topDirName + " is not a directory");
 		}
-		else {
-			result = getFilesInDir(topDir);
-		}
+
+		result = getFilesInDir(topDir);
 		return result;
 	}
 
@@ -76,7 +76,7 @@
 		URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.tests.encoding").getEntry("/");
 		URL resolvedLocation = null;
 		try {
-			resolvedLocation = Platform.resolve(installLocation);
+			resolvedLocation = FileLocator.resolve(installLocation);
 		}
 		catch (IOException e) {
 			// impossible

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.core.prefs
index cf1194c..151969b 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.core.prefs

@@ -1,48 +1,48 @@
-#Wed Jan 12 16:47:06 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+#Mon Feb 27 01:23:12 EST 2006
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
 org.eclipse.jdt.core.builder.invalidClasspath=abort
 org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
 org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
index adf3d75..cfb741e 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF

@@ -1,15 +1,16 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Structured Source Editor for JSP Tests
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.jsp.ui.tests; singleton:=true
 Bundle-Version: 1.0.0
 Bundle-ClassPath: jspuitests.jar
 Bundle-Activator: org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jst.jsp.ui.tests,
  org.eclipse.jst.jsp.ui.tests.contentassist,
  org.eclipse.jst.jsp.ui.tests.contentassist.testfiles,
+ org.eclipse.jst.jsp.ui.tests.contentdescription,
  org.eclipse.jst.jsp.ui.tests.document,
  org.eclipse.jst.jsp.ui.tests.examples,
  org.eclipse.jst.jsp.ui.tests.model,
@@ -20,6 +21,7 @@
  org.eclipse.jst.jsp.ui.tests.partitioning.testfiles.jsp,
  org.eclipse.jst.jsp.ui.tests.registry,
  org.eclipse.jst.jsp.ui.tests.search,
+ org.eclipse.jst.jsp.ui.tests.threaded,
  org.eclipse.jst.jsp.ui.tests.util,
  org.eclipse.jst.jsp.ui.tests.viewer
 Require-Bundle: org.eclipse.jface.text,
@@ -40,6 +42,5 @@
  org.eclipse.ui.views,
  org.eclipse.core.runtime,
  org.eclipse.wst.xml.ui,
- org.eclipse.wst.html.ui,
  com.ibm.icu
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/build.properties b/tests/org.eclipse.jst.jsp.ui.tests/build.properties
index 771a50e..eba3c73 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/build.properties
+++ b/tests/org.eclipse.jst.jsp.ui.tests/build.properties

@@ -9,7 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = plugin.xml,\
-               PerformanceResults/,\
                testfiles.zip,\
                test.xml,\
                projecttestfiles/,\

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/plugin.properties b/tests/org.eclipse.jst.jsp.ui.tests/plugin.properties
new file mode 100644
index 0000000..645b414
--- /dev/null
+++ b/tests/org.eclipse.jst.jsp.ui.tests/plugin.properties

@@ -0,0 +1,4 @@
+# properties file for org.eclipse.jst.jsp.ui.tests
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Name.0 = Structured Source Editor for JSP Tests
+view.name.0 = Embedded JSP Structured Text Viewer
\ No newline at end of file

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml b/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml
index 93adf9f..4e05633 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml
+++ b/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml

@@ -4,8 +4,8 @@
 
 	<extension point="org.eclipse.ui.views">
 		<view
-			name="Embedded JSP Structured Text Viewer"
-			icon="icons/sourceEditor.gif"
+			name="%view.name.0"
+			icon="$nl$/icons/sourceEditor.gif"
 			category="org.eclipse.wst.sse.ui.tests"
 			class="org.eclipse.jst.jsp.ui.tests.viewer.ViewerTestJSP"
 			id="org.eclipse.jst.jsp.ui.tests.viewer.ViewerTestJSP" />

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java
index 13f504a..5ec1b64 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java

@@ -16,6 +16,7 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 
@@ -75,7 +76,7 @@
 		URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.ui.tests").getEntry("/");
 		URL resolvedLocation = null;
 		try {
-			resolvedLocation = Platform.resolve(installLocation);
+			resolvedLocation = FileLocator.resolve(installLocation);
 		}
 		catch (IOException e) {
 			// impossible

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java
index 68bb8a9..faaa540 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java

@@ -21,11 +21,11 @@
 import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
 import org.eclipse.wst.html.core.internal.modelhandler.EmbeddedHTML;
 import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.xml.core.internal.modelhandler.EmbeddedXML;
 import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java
index 5751c4e..7889e5b 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java

@@ -18,12 +18,12 @@
 import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter;
 import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
 import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
 import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerUtility;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.w3c.dom.Document;

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java
index 4b165d7..ade3dce 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java

@@ -12,17 +12,19 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 
 import junit.framework.TestCase;
 
 import org.eclipse.jst.jsp.core.internal.java.JSPTranslator;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 
 /**
  * This class tests the sed JSPJavaTranslator class
+ * 
  * @author pavery
  */
 public class JSPJavaTranslatorTest extends TestCase {
@@ -31,12 +33,12 @@
 		super(name);
 	}
 
-	public void testAllFiles() {
-		// this test is for PMR: 91930  CMVC:218469
+	public void testAllFiles() throws UnsupportedEncodingException, IOException {
+		// this test is for PMR: 91930 CMVC:218469
 		testJSPInJavascript("testfiles/jspInJavascript.jsp");
-	}
+	} 
 
-	public void testJSPInJavascript(String filename) {
+	public void testJSPInJavascript(String filename) throws UnsupportedEncodingException, IOException {
 		IStructuredModel sm = getStructuredModelForRead(filename);
 		if (sm != null) {
 			IDOMNode xmlNode = (IDOMNode) sm.getIndexedRegion(0);
@@ -44,14 +46,17 @@
 			if (xmlNode != null) {
 				JSPTranslator jspt = new JSPTranslator();
 				jspt.reset(xmlNode, null);
-				//int sourceTextPos = text.indexOf("<%= testJspString") + 17;
-				//jspt.setSourceCursor(sourceTextPos); // right after the text
+				// int sourceTextPos = text.indexOf("<%= testJspString") + 17;
+				// jspt.setSourceCursor(sourceTextPos); // right after the
+				// text
 				jspt.translate();
 				String translation = jspt.getTranslation().toString();
 				// offsets are found using JSPTranslation now
-				//int translatedCursorPosition = jspt.getCursorPosition();
-				//assertEquals("incorrect cursor position >" + translatedCursorPosition, 519, translatedCursorPosition);
-				//assertEquals("translation was incorrect", "testJspString", translation.substring(519, 532));
+				// int translatedCursorPosition = jspt.getCursorPosition();
+				// assertEquals("incorrect cursor position >" +
+				// translatedCursorPosition, 519, translatedCursorPosition);
+				// assertEquals("translation was incorrect", "testJspString",
+				// translation.substring(519, 532));
 				int cursorStart = translation.indexOf("out.print(\"\"+\n testJspString") + 14;
 				assertEquals("incorrect cursor position >" + cursorStart, 667, cursorStart);
 			}
@@ -60,21 +65,19 @@
 	}
 
 	/**
-	 * IMPORTANT whoever calls this must releaseFromRead after they are done using it.
+	 * IMPORTANT whoever calls this must releaseFromRead after they are done
+	 * using it.
+	 * 
 	 * @param filename
 	 * @return
+	 * @throws IOException 
+	 * @throws UnsupportedEncodingException  
 	 */
-	protected IStructuredModel getStructuredModelForRead(String filename) {
-		try {
-			// create model
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			InputStream inStream = getClass().getResourceAsStream(filename);
-			IStructuredModel sModel = modelManager.getModelForRead(filename, inStream, null);
-			return sModel;
-		}
-		catch (IOException ioex) {
-			System.out.println("couldn't open file > " + filename);
-		}
-		return null;
+	protected IStructuredModel getStructuredModelForRead(String filename) throws UnsupportedEncodingException, IOException {
+		// create model
+		IModelManager modelManager = StructuredModelManager.getModelManager();
+		InputStream inStream = getClass().getResourceAsStream(filename);
+		IStructuredModel sModel = modelManager.getModelForRead(filename, inStream, null);
+		return sModel;
 	}
 }
\ No newline at end of file

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java
index b54a28a..0c651db 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java

@@ -34,9 +34,9 @@
 import org.eclipse.jst.jsp.ui.tests.util.FileUtil;
 import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
 import org.eclipse.osgi.service.datalocation.Location;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 
 /**

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java
index d41da59..f348a8b 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java

@@ -15,9 +15,9 @@
 import junit.framework.TestCase;
 
 import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.eclipse.wst.xml.core.internal.provisional.format.NodeFormatter;

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java
index ea12422..6e9e4f9 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java

@@ -21,10 +21,10 @@
 import org.eclipse.jst.jsp.core.internal.text.StructuredTextPartitionerForJSP;
 import org.eclipse.jst.jsp.ui.tests.document.UnzippedProjectTester;
 import org.eclipse.wst.html.core.internal.text.StructuredTextPartitionerForHTML;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
 import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java
index 98d730e..e1aad84 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java

@@ -21,14 +21,15 @@
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
 
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
 import org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin;
 import org.eclipse.jst.jsp.ui.tests.Logger;
 import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryProvider;
 import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistry;
 import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
@@ -71,7 +72,8 @@
 	public static void main(java.lang.String[] args) {
 		if (args == null || args.length == 0) {
 			runAll();
-		} else if (args.length == 1) {
+		}
+		else if (args.length == 1) {
 			String methodToRun = args[0].trim();
 			runOne(methodToRun);
 		}
@@ -209,17 +211,16 @@
 	 * 
 	 * Note: May require a functioning network connection for the references
 	 * to be resolved properly.
+	 * 
+	 * @throws IOException
 	 */
-	public void testDTDLoadFromSystemID_1() {
+	public void testDTDLoadFromSystemID_1() throws IOException {
 		if (testShippedDTDLookup) {
 			setUpXML();
 			URL installationPath = Platform.getBundle(JSPUITestsPlugin.ID).getEntry("/");
 			String diskLocation = null;
-			try {
-				diskLocation = Platform.resolve(installationPath).toExternalForm();
-			} catch (IOException e) {
-			} catch (NullPointerException e) {
-			}
+			diskLocation = FileLocator.resolve(installationPath).toExternalForm();
+
 			assertTrue("failed to resolve plugin install path", diskLocation != null);
 			String content = "<?xml version=\"1.0\"?><!DOCTYPE html SYSTEM " + diskLocation + "TestFiles/DTDs/wapDTDs/WAP-2-0/wml20.dtd\"" + "><html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:wml=\"http://www.wapforum.org/2001/wml\"></html>";
 			fModel.getStructuredDocument().set(content);
@@ -240,16 +241,15 @@
 	 * 
 	 * Note: May require a functioning network connection for the references
 	 * to be resolved properly.
+	 * @throws IOException 
 	 */
-	public void testDTDLoadFromSystemID_2() {
+	public void testDTDLoadFromSystemID_2() throws IOException {
 		if (testShippedDTDLookup) {
 			URL installationPath = Platform.getBundle(JSPUITestsPlugin.ID).getEntry("/");
 			String diskLocation = null;
-			try {
-				diskLocation = Platform.resolve(installationPath).toExternalForm();
-			} catch (IOException e) {
-			} catch (NullPointerException e) {
-			}
+
+			diskLocation = FileLocator.resolve(installationPath).toExternalForm();
+
 			assertTrue("failed to resolve plugin install path", diskLocation != null);
 			setUpXML();
 			String content = "<?xml version=\"1.0\"?><!DOCTYPE html SYSTEM " + diskLocation + "testfiles/XHTML/xhtml1-transitional.dtd\"" + "><html></html>";
@@ -292,26 +292,41 @@
 	public void testDTDLoadFromPublicID() {
 		// No longer provided in WTP
 		// TODO: provide DTD?
-//		if (testShippedDTDLookup) {
-//			setUpXML();
-//			String contents = "<!DOCTYPE taglib PUBLIC \"-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN\"> <taglib><tag>foo</tag></taglib>";
-//			fModel.getStructuredDocument().set(contents);
-//
-//			CMDocumentManager documentManagaer = fModelQuery.getCMDocumentManager();
-//			documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD, false);
-//			documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD, true);
-//
-//
-//			// taglib
-//			CMNode node = fModelQuery.getCMNode((Node) fModel.getIndexedRegion(contents.length() - 2));
-//			assertTrue("web-jsptaglibrary_1_2.dtd failed to load through catalog", node != null && node.getNodeType() == CMNode.ELEMENT_DECLARATION && node.getNodeName().equalsIgnoreCase("taglib"));
-//
-//			// tag
-//			node = fModelQuery.getCMNode((Node) fModel.getIndexedRegion(contents.length() - 12));
-//			assertTrue("CMElementDeclaration for \"tag\" from web-jsptaglibrary_1_2.dtd is missing", node != null && node.getNodeType() == CMNode.ELEMENT_DECLARATION && node.getNodeName().equalsIgnoreCase("tag"));
-//			CMContent content = ((CMElementDeclaration) node).getContent();
-//			assertTrue("only one occurrence of child group allowed", content.getNodeType() == CMNode.GROUP && content.getMaxOccur() == 1);
-//		}
+		// if (testShippedDTDLookup) {
+		// setUpXML();
+		// String contents = "<!DOCTYPE taglib PUBLIC \"-//Sun Microsystems,
+		// Inc.//DTD JSP Tag Library 1.2//EN\">
+		// <taglib><tag>foo</tag></taglib>";
+		// fModel.getStructuredDocument().set(contents);
+		//
+		// CMDocumentManager documentManagaer =
+		// fModelQuery.getCMDocumentManager();
+		// documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD,
+		// false);
+		// documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD,
+		// true);
+		//
+		//
+		// // taglib
+		// CMNode node = fModelQuery.getCMNode((Node)
+		// fModel.getIndexedRegion(contents.length() - 2));
+		// assertTrue("web-jsptaglibrary_1_2.dtd failed to load through
+		// catalog", node != null && node.getNodeType() ==
+		// CMNode.ELEMENT_DECLARATION &&
+		// node.getNodeName().equalsIgnoreCase("taglib"));
+		//
+		// // tag
+		// node = fModelQuery.getCMNode((Node)
+		// fModel.getIndexedRegion(contents.length() - 12));
+		// assertTrue("CMElementDeclaration for \"tag\" from
+		// web-jsptaglibrary_1_2.dtd is missing", node != null &&
+		// node.getNodeType() == CMNode.ELEMENT_DECLARATION &&
+		// node.getNodeName().equalsIgnoreCase("tag"));
+		// CMContent content = ((CMElementDeclaration) node).getContent();
+		// assertTrue("only one occurrence of child group allowed",
+		// content.getNodeType() == CMNode.GROUP && content.getMaxOccur() ==
+		// 1);
+		// }
 	}
 
 
@@ -330,7 +345,8 @@
 				if (provider.isFor(model.getModelHandler())) {
 					provider.addAdapterFactories(model);
 				}
-			} catch (Exception e) {
+			}
+			catch (Exception e) {
 				Logger.logException(e);
 			}
 		}
@@ -348,7 +364,8 @@
 		if (valuesHelper.getImpliedValueKind() == CMDataType.IMPLIED_VALUE_FIXED && valuesHelper.getImpliedValue() != null) {
 			// FIXED value
 			values.add(valuesHelper.getImpliedValue());
-		} else {
+		}
+		else {
 			// ENUMERATED values
 			String[] valueStrings = null;
 			// new way

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java
index a3f4676..fd699c1 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java

@@ -84,7 +84,7 @@
 			int end = lastStructuredDocumentRegion.getEnd();
 
 			String outString = topNode.toString();
-			outString = org.eclipse.wst.sse.core.internal.util.StringUtils.escape(outString);
+			outString = org.eclipse.wst.sse.core.utils.StringUtils.escape(outString);
 			out.println("[" + start + ", " + end + "]" + outString); //$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
 		}
 		// now do its children

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java
index aa76a6d..56aff37 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java

@@ -20,11 +20,11 @@
 
 import org.eclipse.jst.jsp.core.internal.modelhandler.ModelHandlerForJSP;
 import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
 import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
 import org.eclipse.wst.sse.core.internal.ltk.parser.BlockTagParser;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java
index 7c6aaad..4c3cf2c 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java

@@ -32,7 +32,7 @@
 import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
 import org.eclipse.wst.sse.core.internal.text.StructuredDocumentRegionIterator;
 import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
+import org.eclipse.wst.sse.core.utils.StringUtils;
 import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
 import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
 

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java
index 63ade96..3a39107 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java

@@ -14,8 +14,8 @@
 import java.io.InputStream;
 
 import org.eclipse.jst.jsp.ui.tests.Logger;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
 import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
 import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
@@ -25,7 +25,7 @@
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
 import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
+import org.eclipse.wst.sse.core.utils.StringUtils;
 import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.w3c.dom.Node;

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java
index 072f404..bb04fd3 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java

@@ -18,10 +18,10 @@
 import junit.framework.TestSuite;
 
 import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
 import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
 import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
 import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java
index daa6587..284f711 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java

@@ -16,13 +16,13 @@
 
 import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter;
 import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
 import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
 import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.xml.core.internal.modelhandler.EmbeddedXML;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java
index 6b7fdde..895cc2b 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java

@@ -21,11 +21,11 @@
 import org.eclipse.jst.jsp.core.text.IJSPPartitions;
 import org.eclipse.wst.css.core.text.ICSSPartitions;
 import org.eclipse.wst.html.core.text.IHTMLPartitions;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
+import org.eclipse.wst.sse.core.utils.StringUtils;
 import org.eclipse.wst.xml.core.text.IXMLPartitions;
 
 import com.ibm.icu.text.DecimalFormat;

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/search/JSPSearchTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/search/JSPSearchTests.java
index 00d92ae..50bbff3 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/search/JSPSearchTests.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/search/JSPSearchTests.java

@@ -37,9 +37,9 @@
 import org.eclipse.jst.jsp.ui.tests.util.FileUtil;
 import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
 import org.eclipse.osgi.service.datalocation.Location;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/threaded/ThreadedModelReadEditTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/threaded/ThreadedModelReadEditTest.java
index d5c61fc..b549674 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/threaded/ThreadedModelReadEditTest.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/threaded/ThreadedModelReadEditTest.java

@@ -26,9 +26,9 @@
 import org.eclipse.jst.jsp.core.internal.java.JSPTranslator;
 import org.eclipse.jst.jsp.ui.tests.util.ProjectUtil;
 import org.eclipse.text.edits.InsertEdit;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/DateUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/DateUtil.java
index 49b7b4a..fb3bde5 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/DateUtil.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/DateUtil.java

@@ -10,11 +10,12 @@
  *******************************************************************************/
 package org.eclipse.jst.jsp.ui.tests.util;
 
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
+import com.ibm.icu.text.DateFormat;
+import com.ibm.icu.text.SimpleDateFormat;
+
 /**
  * @author davidw
  *

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/FileUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/FileUtil.java
index ddff073..08aa562 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/FileUtil.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/FileUtil.java

@@ -15,6 +15,7 @@
 import java.io.IOException;
 import java.net.URL;
 
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.osgi.framework.Bundle;
 
@@ -58,7 +59,7 @@
 			// add known file so URL method below can be used
 			// (doesn't seem to work for directory?)
 			URL totalURL = new URL(url, "plugin.xml");
-			URL finalurl = Platform.asLocalURL(totalURL);
+			URL finalurl = FileLocator.toFileURL(totalURL);
 			String finalFile = finalurl.getFile();
 			File file = new File(finalFile);
 			String finalPath = file.getParent();
@@ -89,7 +90,7 @@
 	public static File makeFileFor(String directory, String filename, String testResultsDirectoryPrefix) throws IOException {
 		Bundle bundle = Platform.getBundle(JSP_EDITOR_TESTS_PLUGIN_ID);
 		URL url = bundle.getEntry("/");
-		URL localURL = Platform.asLocalURL(url);
+		URL localURL = FileLocator.toFileURL(url);
 		String installPath = localURL.getPath();
 		String totalDirectory = installPath + directory;
 		String totalPath = totalDirectory + "/" + filename;

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/TimestampUtil.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/TimestampUtil.java
index fb6450e..a856dc9 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/TimestampUtil.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/util/TimestampUtil.java

@@ -10,11 +10,12 @@
  *******************************************************************************/
 package org.eclipse.jst.jsp.ui.tests.util;
 
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
+import com.ibm.icu.text.DateFormat;
+import com.ibm.icu.text.SimpleDateFormat;
+
 /**
  * @author davidw
  *

diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/ViewerTestJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/ViewerTestJSP.java
index 59c57d0..a445736 100644
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/ViewerTestJSP.java
+++ b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/viewer/ViewerTestJSP.java

@@ -38,9 +38,9 @@
 import org.eclipse.ui.part.ViewPart;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
 import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
 import org.w3c.dom.Attr;

diff --git a/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
index 72b0211..feb06a4 100644
--- a/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF

@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CSS Core Tests Plug-in
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.css.core.tests
 Bundle-Version: 1.0.0
 Bundle-ClassPath: csscoretests.jar
 Bundle-Activator: org.eclipse.wst.css.core.tests.CSSCoreTestsPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.css.core.tests,
  org.eclipse.wst.css.core.tests.model,
@@ -16,6 +16,6 @@
 Require-Bundle: org.eclipse.wst.css.core,
  org.junit,
  org.eclipse.wst.sse.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime
-Eclipse-AutoStart: true
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources
+Eclipse-LazyStart: true

diff --git a/tests/org.eclipse.wst.css.core.tests/build.properties b/tests/org.eclipse.wst.css.core.tests/build.properties
index e6bcd37..2793a9a 100644
--- a/tests/org.eclipse.wst.css.core.tests/build.properties
+++ b/tests/org.eclipse.wst.css.core.tests/build.properties

@@ -8,13 +8,11 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bin.includes = plugin.xml,\
-               test.xml,\
+bin.includes = test.xml,\
                csscoretests.jar,\
                src/,\
                META-INF/,\
                about.html
-src.includes = plugin.xml
 jars.compile.order = csscoretests.jar
 source.csscoretests.jar = src/
 output.csscoretests.jar = bin/

diff --git a/tests/org.eclipse.wst.css.core.tests/plugin.properties b/tests/org.eclipse.wst.css.core.tests/plugin.properties
new file mode 100644
index 0000000..4e130a2
--- /dev/null
+++ b/tests/org.eclipse.wst.css.core.tests/plugin.properties

@@ -0,0 +1,3 @@
+# properties file for org.eclipse.wst.css.core.tests
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Name.0 = CSS Core Tests Plug-in
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java
index 42d3c78..568e089 100644
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java
+++ b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java

@@ -20,11 +20,12 @@
 import java.io.Writer;
 import java.net.URL;
 
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.osgi.framework.Bundle;
 
 /**
@@ -36,7 +37,7 @@
 	public static File createFile(String directory, String filename) throws IOException {
 		Bundle bundle = Platform.getBundle("org.eclipse.wst.css.core.tests"); //$NON-NLS-1$
 		URL url = bundle.getEntry("/"); //$NON-NLS-1$
-		URL localURL = Platform.asLocalURL(url);
+		URL localURL = FileLocator.toFileURL(url);
 		String installPath = localURL.getPath();
 		String totalDirectory = installPath + directory;
 		String totalPath = totalDirectory + "/" + filename; //$NON-NLS-1$

diff --git a/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF
index 3f05c36..f61c419 100644
--- a/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF

@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CSS Encoding Tests Plug-in
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.css.tests.encoding
 Bundle-Version: 1.0.0
 Bundle-ClassPath: cssencodingtests.jar
 Bundle-Activator: org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.css.tests.encoding,
  org.eclipse.wst.css.tests.encoding.css
@@ -15,4 +15,4 @@
  org.junit,
  org.eclipse.wst.sse.core,
  org.eclipse.wst.xml.tests.encoding
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true

diff --git a/tests/org.eclipse.wst.css.tests.encoding/build.properties b/tests/org.eclipse.wst.css.tests.encoding/build.properties
index 525754e..5960054 100644
--- a/tests/org.eclipse.wst.css.tests.encoding/build.properties
+++ b/tests/org.eclipse.wst.css.tests.encoding/build.properties

@@ -1,11 +1,9 @@
-bin.includes = plugin.xml,\
-               cssencodingtests.jar,\
+bin.includes = cssencodingtests.jar,\
                testfiles/,\
                test.xml,\
                META-INF/,\
                about.html
-src.includes = cssencodingtests.jar,\
-               plugin.xml
+src.includes = cssencodingtests.jar
 source.cssencodingtests.jar = src/
 output.cssencodingtests.jar = bin/
                
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.css.tests.encoding/plugin.properties b/tests/org.eclipse.wst.css.tests.encoding/plugin.properties
new file mode 100644
index 0000000..053e969
--- /dev/null
+++ b/tests/org.eclipse.wst.css.tests.encoding/plugin.properties

@@ -0,0 +1,3 @@
+# properties file for org.eclipse.wst.css.tests.encoding
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Name.0 = CSS Encoding Tests Plug-in
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java
index b0788b9..49ed324 100644
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java
+++ b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java

@@ -23,6 +23,7 @@
 
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 
@@ -43,9 +44,7 @@
 		if (!topDir.isDirectory()) {
 			throw new IllegalArgumentException(topDirName + " is not a directory");
 		}
-		else {
-			result = getFilesInDir(topDir);
-		}
+		result = getFilesInDir(topDir);
 		return result;
 	}
 
@@ -76,7 +75,7 @@
 		URL installLocation = Platform.getBundle("org.eclipse.wst.css.tests.encoding").getEntry("/");
 		URL resolvedLocation = null;
 		try {
-			resolvedLocation = Platform.resolve(installLocation);
+			resolvedLocation = FileLocator.resolve(installLocation);
 		}
 		catch (IOException e) {
 			// impossible

diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java
index eb5a3d6..e89741c 100644
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java
+++ b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java

@@ -25,7 +25,7 @@
 	private String fcharset;
 	private final String fileDir = "css/";
 	private final String fileHome = "testfiles/";
-	private final String fileLocation = fileHome + fileDir;
+	private final String fileLocation = this.fileHome + this.fileDir;
 
 	private void doTestFile(String filename, String expectedName) throws IOException {
 		doTestFile(filename, expectedName, null);
@@ -35,7 +35,7 @@
 		CSSHeadTokenizer tokenizer = null;
 		Reader fileReader = null;
 		try {
-			if (DEBUG) {
+			if (this.DEBUG) {
 				System.out.println();
 				System.out.println("       " + filename);
 				System.out.println();
@@ -50,7 +50,7 @@
 
 		HeadParserToken resultToken = null;
 		HeadParserToken token = parseHeader(tokenizer);
-		String resultValue = fcharset;
+		String resultValue = this.fcharset;
 		fileReader.close();
 		if (finalTokenType != null) {
 			assertTrue("did not end as expected. found:  " + token.getType(), finalTokenType.equals(token.getType()));
@@ -67,10 +67,14 @@
 	}
 
 	private boolean isLegalString(String tokenType) {
-		if (tokenType == null)
-			return false;
-		else
-			return tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
+		boolean result = false;
+		if (tokenType == null) {
+			result = false;
+		}
+		else {
+			result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
+		}
+		return result;
 	}
 
 	/**
@@ -88,7 +92,7 @@
 					HeadParserToken valueToken = tokenizer.getNextToken();
 					String valueTokenType = valueToken.getType();
 					if (isLegalString(valueTokenType)) {
-						fcharset = valueToken.getText();
+						this.fcharset = valueToken.getText();
 
 					}
 				}
@@ -101,43 +105,43 @@
 	}
 
 	public void testBestCase() throws IOException {
-		String filename = fileLocation + "nonStandard.css";
+		String filename = this.fileLocation + "nonStandard.css";
 		doTestFile(filename, "ISO-8859-6");
 
 	}
 
 	public void testEmptyFile() throws IOException {
-		String filename = fileLocation + "emptyFile.css";
+		String filename = this.fileLocation + "emptyFile.css";
 		doTestFile(filename, null);
 	}
 
 	public void testEUCJP() throws IOException {
-		String filename = fileLocation + "encoding_test_eucjp.css";
+		String filename = this.fileLocation + "encoding_test_eucjp.css";
 		doTestFile(filename, "EUC-JP");
 	}
 
 	public void testJIS() throws IOException {
-		String filename = fileLocation + "encoding_test_jis.css";
+		String filename = this.fileLocation + "encoding_test_jis.css";
 		doTestFile(filename, "ISO-2022-JP");
 	}
 
 	public void testNoEncoding() throws IOException {
-		String filename = fileLocation + "noEncoding.css";
+		String filename = this.fileLocation + "noEncoding.css";
 		doTestFile(filename, null);
 	}
 
 	public void testnonStandardIllFormed() throws IOException {
-		String filename = fileLocation + "nonStandardIllFormed.css";
+		String filename = this.fileLocation + "nonStandardIllFormed.css";
 		doTestFile(filename, "ISO-8859-6");
 	}
 
 	public void testnonStandardIllFormed2() throws IOException {
-		String filename = fileLocation + "nonStandardIllFormed2.css";
+		String filename = this.fileLocation + "nonStandardIllFormed2.css";
 		doTestFile(filename, "ISO-8859-6");
 	}
 
 	public void testShiftJIS() throws IOException {
-		String filename = fileLocation + "encoding_test_sjis.css";
+		String filename = this.fileLocation + "encoding_test_sjis.css";
 		doTestFile(filename, "SHIFT_JIS");
 	}
 }
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF
index 3a85cbe..dfd32b5 100644
--- a/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF

@@ -1,24 +1,22 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CSS UI Tests Plug-in
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.css.ui.tests
 Bundle-Version: 1.0.0
 Bundle-Activator: org.eclipse.wst.css.ui.tests.CSSUITestsPlugin
-Bundle-Vendor: Eclipse
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.css.ui.tests
+Export-Package: org.eclipse.wst.css.ui.tests,
+ org.eclipse.wst.css.ui.tests.viewer
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.junit,
  org.eclipse.wst.css.ui,
  org.eclipse.wst.sse.ui,
  org.eclipse.wst.css.core,
  org.eclipse.jface.text,
- org.eclipse.ui.editors,
- org.eclipse.ui.views,
  org.eclipse.ui.workbench,
- org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
  org.eclipse.wst.sse.core,
  org.junit
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
 Bundle-ClassPath: cssuitests.jar

diff --git a/tests/org.eclipse.wst.css.ui.tests/plugin.properties b/tests/org.eclipse.wst.css.ui.tests/plugin.properties
new file mode 100644
index 0000000..21ad1f7
--- /dev/null
+++ b/tests/org.eclipse.wst.css.ui.tests/plugin.properties

@@ -0,0 +1,3 @@
+# properties file for org.eclipse.wst.css.ui.tests
+Bundle-Vendor.0 = Eclipse
+Bundle-Name.0 = CSS UI Tests Plug-in
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs
index f64871c..6fcfc28 100644
--- a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-#Fri May 27 23:39:55 EDT 2005
+#Mon Feb 27 00:58:25 EST 2006
 eclipse.preferences.version=1
 org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -29,7 +29,8 @@
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

diff --git a/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF
index 6e6129b..56c3cb4 100644
--- a/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF

@@ -1,19 +1,18 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: DTD UI Tests
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.dtd.ui.tests
 Bundle-Version: 1.0.0
 Bundle-ClassPath: dtduitests.jar
 Bundle-Activator: org.eclipse.wst.dtd.ui.tests.internal.DTDUITestsPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.dtd.ui.tests,
- org.eclipse.wst.dtd.ui.tests.internal,
+ org.eclipse.wst.dtd.ui.tests.internal;x-internal:=true,
  org.eclipse.wst.dtd.ui.tests.viewer
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface.text,
  org.eclipse.ui,
- org.eclipse.ui.editors,
  org.eclipse.ui.views,
  org.eclipse.ui.workbench,
  org.eclipse.ui.workbench.texteditor,
@@ -23,4 +22,4 @@
  org.eclipse.wst.sse.ui,
  org.eclipse.wst.xml.core,
  org.junit
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true

diff --git a/tests/org.eclipse.wst.dtd.ui.tests/build.properties b/tests/org.eclipse.wst.dtd.ui.tests/build.properties
index e33d4aa..939b036 100644
--- a/tests/org.eclipse.wst.dtd.ui.tests/build.properties
+++ b/tests/org.eclipse.wst.dtd.ui.tests/build.properties

@@ -1,8 +1,7 @@
 source.dtduitests.jar = src/
 output.dtduitests.jar = bin/
-bin.includes = plugin.xml,\
-               dtduitests.jar,\
+bin.includes = dtduitests.jar,\
                test.xml,\
                META-INF/,\
                about.html
-src.includes = plugin.xml
+

diff --git a/tests/org.eclipse.wst.dtd.ui.tests/plugin.properties b/tests/org.eclipse.wst.dtd.ui.tests/plugin.properties
new file mode 100644
index 0000000..31fe230
--- /dev/null
+++ b/tests/org.eclipse.wst.dtd.ui.tests/plugin.properties

@@ -0,0 +1,3 @@
+# properties file for org.eclipse.wst.dtd.ui.tests
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Name.0 = DTD UI Tests
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java
index 5397305..d85215c 100644
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java
+++ b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java

@@ -48,14 +48,6 @@
 		}
 	}
 
-	private void bundleGetPreference(String bundleName, String prefKey) {
-		String defaultValue = Long.toString(System.currentTimeMillis()); // random
-																			// string
-
-		String value = Platform.getPreferencesService().getString(bundleName, prefKey, defaultValue, null);
-		assertNotSame("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue, value);
-	}
-
 	/**
 	 * Tests default values of preferences.
 	 * 
@@ -64,11 +56,7 @@
 	 */
 	public void testPluginGetDefaultPreferences() {
 		IPreferenceStore store = DTDUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	private void pluginGetDefaultPreference(IPreferenceStore store, String prefKey, String expected) {
-		String defaultValue = store.getDefaultString(prefKey);
-		assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, defaultValue);
+		assertNotNull("dtd preference store was null", store);
 	}
 
 	/**
@@ -76,29 +64,8 @@
 	 * certain value, then getting the preference value to verify it was set.
 	 */
 	public void testPluginSetPreferences() {
+		//ISSUE: this does NOT use SET
 		IPreferenceStore store = DTDUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	private void pluginSetPreferenceBoolean(IPreferenceStore store, String prefKey) {
-		boolean originalValue = store.getBoolean(prefKey);
-		boolean expectedValue = !originalValue;
-		store.setValue(prefKey, expectedValue);
-		boolean foundValue = store.getBoolean(prefKey);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		store.setValue(prefKey, originalValue);
-	}
-
-	private void pluginSetPreferenceString(IPreferenceStore store, String prefKey) {
-		String originalValue = store.getString(prefKey);
-		String expectedValue = Long.toString(System.currentTimeMillis()); // random
-																			// string
-		store.setValue(prefKey, expectedValue);
-		String foundValue = store.getString(prefKey);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		store.setValue(prefKey, originalValue);
+		assertNotNull("dtd preference store was null", store);
 	}
 }

diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/ViewerTestDTD.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/ViewerTestDTD.java
index 1aa3af5..77c6722 100644
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/ViewerTestDTD.java
+++ b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/ViewerTestDTD.java

@@ -38,9 +38,9 @@
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
 import org.eclipse.wst.dtd.ui.StructuredTextViewerConfigurationDTD;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
 import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
 import org.w3c.dom.Attr;

diff --git a/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF
index 4e2be5f..3604de8 100644
--- a/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF

@@ -1,14 +1,15 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: HTML Core Tests
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.html.core.tests
 Bundle-Version: 1.0.0
 Bundle-ClassPath: htmlcoretests.jar
 Bundle-Activator: org.eclipse.wst.html.core.tests.HTMLCoreTestsPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.html.core.tests,
  org.eclipse.wst.html.core.tests.misc,
+ org.eclipse.wst.html.core.tests.model,
  org.eclipse.wst.html.core.tests.parser,
  org.eclipse.wst.html.core.tests.parser.css,
  org.eclipse.wst.html.core.tests.text,
@@ -18,8 +19,8 @@
  org.eclipse.wst.html.core,
  org.eclipse.wst.xml.core,
  org.eclipse.wst.sse.core,
- org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.wst.css.core,
- com.ibm.icu
-Eclipse-AutoStart: true
+ com.ibm.icu,
+ org.eclipse.core.resources
+Eclipse-LazyStart: true

diff --git a/tests/org.eclipse.wst.html.core.tests/plugin.properties b/tests/org.eclipse.wst.html.core.tests/plugin.properties
new file mode 100644
index 0000000..e8b3778
--- /dev/null
+++ b/tests/org.eclipse.wst.html.core.tests/plugin.properties

@@ -0,0 +1,3 @@
+# properties file for org.eclipse.wst.html.core.tests
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Name.0 = HTML Core Tests
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/ModelModifications.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/ModelModifications.java
index 6c98f86..7687762 100644
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/ModelModifications.java
+++ b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/ModelModifications.java

@@ -22,10 +22,10 @@
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
 import org.eclipse.wst.html.core.tests.utils.TestWriter;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.encoding.util.NullInputStream;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;

diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ModelTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ModelTest.java
index 30f8115..d59cfe7 100644
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ModelTest.java
+++ b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ModelTest.java

@@ -23,12 +23,12 @@
 import org.eclipse.wst.html.core.tests.utils.FileUtil;
 import org.eclipse.wst.html.core.tests.utils.StringCompareUtil;
 import org.eclipse.wst.html.core.tests.utils.TestWriter;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
+import org.eclipse.wst.sse.core.utils.StringUtils;
 import org.eclipse.wst.xml.core.internal.document.StructuredDocumentRegionChecker;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.w3c.dom.Node;

diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/TestStructuredPartitionerHTML.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/TestStructuredPartitionerHTML.java
index 9cd22fd..fcde0d5 100644
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/TestStructuredPartitionerHTML.java
+++ b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/TestStructuredPartitionerHTML.java

@@ -21,13 +21,13 @@
 import org.eclipse.jface.text.IDocumentPartitioner;
 import org.eclipse.jface.text.ITypedRegion;
 import org.eclipse.wst.html.core.text.IHTMLPartitions;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredTextPartitioner;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
+import org.eclipse.wst.sse.core.utils.StringUtils;
 import org.eclipse.wst.xml.core.text.IXMLPartitions;
 
 import com.ibm.icu.text.DecimalFormat;

diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/FileUtil.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/FileUtil.java
index 41a1c6d..5871438 100644
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/FileUtil.java
+++ b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/FileUtil.java

@@ -15,11 +15,12 @@
 import java.io.IOException;
 import java.net.URL;
 
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.encoding.util.NullInputStream;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
 import org.osgi.framework.Bundle;
 
@@ -65,7 +66,7 @@
 			// add known file so URL method below can be used
 			// (doesn't seem to work for directory?)
 			URL totalURL = new URL(url, "plugin.xml");
-			URL finalurl = Platform.asLocalURL(totalURL);
+			URL finalurl = FileLocator.toFileURL(totalURL);
 			String finalFile = finalurl.getFile();
 			File file = new File(finalFile);
 			String finalPath = file.getParent();
@@ -96,7 +97,7 @@
 	public static File makeFileFor(String directory, String filename, String testResultsDirectoryPrefix) throws IOException {
 		Bundle bundle = Platform.getBundle(PLUGIN_ID);
 		URL url = bundle.getEntry("/");  //$NON-NLS-1$
-		URL localURL = Platform.asLocalURL(url);
+		URL localURL = FileLocator.toFileURL(url);
 		String installPath = localURL.getPath();
 		String totalDirectory = installPath + directory;
 		String totalPath = totalDirectory + "/" + filename;

diff --git a/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF
index 46fc4e1..28fecf1 100644
--- a/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF

@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: HTML Encoding Tests Plug-in
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.html.tests.encoding
 Bundle-Version: 1.0.0
 Bundle-ClassPath: htmlencodingtests.jar
 Bundle-Activator: org.eclipse.wst.html.tests.encoding.HTMLEncodingTestsPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.html.tests.encoding,
  org.eclipse.wst.html.tests.encoding.html
@@ -16,4 +16,4 @@
  org.eclipse.wst.xml.core,
  org.junit,
  org.eclipse.wst.sse.core
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true

diff --git a/tests/org.eclipse.wst.html.tests.encoding/build.properties b/tests/org.eclipse.wst.html.tests.encoding/build.properties
index 210c6c1..a3b623d 100644
--- a/tests/org.eclipse.wst.html.tests.encoding/build.properties
+++ b/tests/org.eclipse.wst.html.tests.encoding/build.properties

@@ -1,9 +1,8 @@
 source.htmlencodingtests.jar = src/
 output.htmlencodingtests.jar = bin/
-bin.includes = plugin.xml,\
-               htmlencodingtests.jar,\
+bin.includes = htmlencodingtests.jar,\
                testfiles/,\
                test.xml,\
                META-INF/,\
                about.html
-src.includes = plugin.xml
+

diff --git a/tests/org.eclipse.wst.html.tests.encoding/plugin.properties b/tests/org.eclipse.wst.html.tests.encoding/plugin.properties
new file mode 100644
index 0000000..36c1fc1
--- /dev/null
+++ b/tests/org.eclipse.wst.html.tests.encoding/plugin.properties

@@ -0,0 +1,3 @@
+# properties file for org.eclipse.wst.html.tests.encoding
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Name.0 = HTML Encoding Tests Plug-in
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java
index b31bdae..fbf9ef8 100644
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java
+++ b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java

@@ -23,6 +23,7 @@
 
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 
@@ -43,9 +44,7 @@
 		if (!topDir.isDirectory()) {
 			throw new IllegalArgumentException(topDirName + " is not a directory");
 		}
-		else {
-			result = getFilesInDir(topDir);
-		}
+		result = getFilesInDir(topDir);
 		return result;
 	}
 
@@ -76,7 +75,7 @@
 		URL installLocation = Platform.getBundle("org.eclipse.wst.html.tests.encoding").getEntry("/");
 		URL resolvedLocation = null;
 		try {
-			resolvedLocation = Platform.resolve(installLocation);
+			resolvedLocation = FileLocator.resolve(installLocation);
 		}
 		catch (IOException e) {
 			// impossible

diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java
index 4760b43..60ec4b2 100644
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java
+++ b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java

@@ -29,7 +29,7 @@
 	private String fContentTypeValue;
 	private final String fileDir = "html/";
 	private final String fileHome = "testfiles/";
-	private final String fileLocation = fileHome + fileDir;
+	private final String fileLocation = this.fileHome + this.fileDir;
 	private String fPageEncodingValue = null;
 	private String fXMLDecEncodingName;
 
@@ -41,7 +41,7 @@
 		HTMLHeadTokenizer tokenizer = null;
 		Reader fileReader = null;
 		try {
-			if (DEBUG) {
+			if (this.DEBUG) {
 				System.out.println();
 				System.out.println("       " + filename);
 				System.out.println();
@@ -102,20 +102,27 @@
 	 */
 	private String getAppropriateEncoding() {
 		String result = null;
-		if (fXMLDecEncodingName != null)
-			result = fXMLDecEncodingName;
-		else if (fPageEncodingValue != null)
-			result = fPageEncodingValue;
-		else if (fCharset != null)
-			result = fCharset;
+		if (this.fXMLDecEncodingName != null) {
+			result = this.fXMLDecEncodingName;
+		}
+		else if (this.fPageEncodingValue != null) {
+			result = this.fPageEncodingValue;
+		}
+		else if (this.fCharset != null) {
+			result = this.fCharset;
+		}
 		return result;
 	}
 
 	private boolean isLegalString(String tokenType) {
-		if (tokenType == null)
-			return false;
-		else
-			return tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
+		boolean result = false;
+		if (tokenType == null) {
+			result = false;
+		}
+		else {
+			result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
+		}
+		return result;
 	}
 
 	private void parseContentTypeValue(String contentType) {
@@ -131,8 +138,8 @@
 						int eqpos = parts[0].indexOf('=');
 						eqpos = eqpos + 1;
 						if (eqpos < parts[0].length()) {
-							fCharset = parts[0].substring(eqpos);
-							fCharset = fCharset.trim();
+							this.fCharset = parts[0].substring(eqpos);
+							this.fCharset = this.fCharset.trim();
 						}
 					}
 				}
@@ -143,7 +150,7 @@
 
 		}
 		if (parts.length > 1) {
-			fCharset = parts[1];
+			this.fCharset = parts[1];
 		}
 	}
 
@@ -152,8 +159,8 @@
 	 * value;
 	 */
 	private HeadParserToken parseHeader(HTMLHeadTokenizer tokenizer) throws IOException {
-		fPageEncodingValue = null;
-		fCharset = null;
+		this.fPageEncodingValue = null;
+		this.fCharset = null;
 		/*
 		 * if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) { if
 		 * (tokenizer.hasMoreTokens()) { ITextHeadRegion valueToken =
@@ -166,19 +173,19 @@
 		HeadParserToken finalToken = null;
 		do {
 			token = tokenizer.getNextToken();
-			if (DEBUG) {
+			if (this.DEBUG) {
 				System.out.println(token);
 			}
 			String tokenType = token.getType();
 			if (tokenType == HTMLHeadTokenizerConstants.MetaTagContentType) {
 				if (tokenizer.hasMoreTokens()) {
 					HeadParserToken valueToken = tokenizer.getNextToken();
-					if (DEBUG) {
+					if (this.DEBUG) {
 						System.out.println(valueToken);
 					}
 					String valueTokenType = valueToken.getType();
 					if (isLegalString(valueTokenType)) {
-						fContentTypeValue = valueToken.getText();
+						this.fContentTypeValue = valueToken.getText();
 
 					}
 				}
@@ -186,8 +193,8 @@
 
 		}
 		while (tokenizer.hasMoreTokens());
-		if (fContentTypeValue != null) {
-			parseContentTypeValue(fContentTypeValue);
+		if (this.fContentTypeValue != null) {
+			parseContentTypeValue(this.fContentTypeValue);
 		}
 		finalToken = token;
 		return finalToken;
@@ -195,7 +202,7 @@
 	}
 
 	public void testBestCase() throws IOException {
-		String filename = fileLocation + "NormalNonDefault.html";
+		String filename = this.fileLocation + "NormalNonDefault.html";
 		doTestFile(filename, "UTF-8");
 
 	}
@@ -213,39 +220,39 @@
 	// doTestFile(filename);
 	// }
 	public void testEmptyFile() throws IOException {
-		String filename = fileLocation + "EmptyFile.html";
+		String filename = this.fileLocation + "EmptyFile.html";
 		doTestFile(filename, null);
 	}
 
 	public void testIllFormedNormalNonDefault() throws IOException {
-		String filename = fileLocation + "IllformedNormalNonDefault.html";
+		String filename = this.fileLocation + "IllformedNormalNonDefault.html";
 		doTestFile(filename, "UTF-8");
 	}
 
 	public void testLargeCase() throws IOException {
-		String filename = fileLocation + "LargeNonDefault.html";
+		String filename = this.fileLocation + "LargeNonDefault.html";
 		doTestFile(filename, "ISO-8859-1");
 
 	}
 
 	public void testLargeNoEncoding() throws IOException {
-		String filename = fileLocation + "LargeNoEncoding.html";
+		String filename = this.fileLocation + "LargeNoEncoding.html";
 		doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED);
 
 	}
 
 	public void testMultiNonDefault() throws IOException {
-		String filename = fileLocation + "MultiNonDefault.html";
+		String filename = this.fileLocation + "MultiNonDefault.html";
 		doTestFile(filename, "ISO-8859-6");
 	}
 
 	public void testNoEncoding() throws IOException {
-		String filename = fileLocation + "NoEncoding.html";
+		String filename = this.fileLocation + "NoEncoding.html";
 		doTestFile(filename, null);
 	}
 
 	public void testnoquotes() throws IOException {
-		String filename = fileLocation + "noquotes.html";
+		String filename = this.fileLocation + "noquotes.html";
 		doTestFile(filename, "UTF-8");
 
 	}

diff --git a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.core.prefs
index 2c5ed01..e7ae638 100644
--- a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.core.prefs

@@ -1,48 +1,48 @@
-#Wed Jan 12 16:48:38 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+#Mon Feb 27 01:03:26 EST 2006
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
 org.eclipse.jdt.core.builder.invalidClasspath=abort
 org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
 org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error

diff --git a/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF
index 918db0d..d1cab38 100644
--- a/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF

@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Structured Source Editor for HTML Tests
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.html.ui.tests; singleton:=true
 Bundle-Version: 1.0.0
 Bundle-ClassPath: htmluitests.jar
 Bundle-Activator: org.eclipse.wst.html.ui.tests.HTMLUITestsPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.html.ui.tests,
  org.eclipse.wst.html.ui.tests.viewer
@@ -13,7 +13,6 @@
  org.eclipse.jface.text,
  org.eclipse.wst.html.ui,
  org.eclipse.wst.sse.ui,
- org.eclipse.ui.editors,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.wst.sse.core,
  org.eclipse.wst.xml.core,
@@ -22,4 +21,4 @@
  org.eclipse.ui.views,
  org.eclipse.core.runtime,
  org.eclipse.wst.xml.ui
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true

diff --git a/tests/org.eclipse.wst.html.ui.tests/plugin.properties b/tests/org.eclipse.wst.html.ui.tests/plugin.properties
new file mode 100644
index 0000000..ec61822
--- /dev/null
+++ b/tests/org.eclipse.wst.html.ui.tests/plugin.properties

@@ -0,0 +1,4 @@
+# properties file for org.eclipse.wst.html.ui.tests
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Name.0 = Structured Source Editor for HTML Tests
+view.name.0 = Embedded HTML Structured Text Viewer
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.html.ui.tests/plugin.xml b/tests/org.eclipse.wst.html.ui.tests/plugin.xml
index f65aa9e..ff9dcb3 100644
--- a/tests/org.eclipse.wst.html.ui.tests/plugin.xml
+++ b/tests/org.eclipse.wst.html.ui.tests/plugin.xml

@@ -4,8 +4,8 @@
 
 	<extension point="org.eclipse.ui.views">
 		<view
-			name="Embedded HTML Structured Text Viewer"
-			icon="icons/sourceEditor.gif"
+			name="%view.name.0"
+			icon="$nl$/icons/sourceEditor.gif"
 			category="org.eclipse.wst.sse.ui.tests"
 			class="org.eclipse.wst.html.ui.tests.viewer.ViewerTestHTML"
 			id="org.eclipse.wst.html.ui.tests.viewer.ViewerTestHTML">

diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java
index 08b04f4..1e201cf 100644
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java
+++ b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java

@@ -38,9 +38,9 @@
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
 import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
 import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
 import org.w3c.dom.Attr;

diff --git a/tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF
index 153cf7e..9fdff28 100644
--- a/tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF

@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Tests Plug-in
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.sse.core.tests
 Bundle-Version: 1.0.0
 Bundle-ClassPath: ssemodeltests.jar
 Bundle-Activator: org.eclipse.wst.sse.core.tests.SSEModelTestsPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.sse.core.tests,
  org.eclipse.wst.sse.core.tests.adaptdom,
@@ -18,4 +18,4 @@
  org.junit,
  org.eclipse.wst.sse.core,
  org.eclipse.core.runtime
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true

diff --git a/tests/org.eclipse.wst.sse.core.tests/build.properties b/tests/org.eclipse.wst.sse.core.tests/build.properties
index 2a19373..07cd48f 100644
--- a/tests/org.eclipse.wst.sse.core.tests/build.properties
+++ b/tests/org.eclipse.wst.sse.core.tests/build.properties

@@ -8,11 +8,9 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bin.includes = plugin.xml,\
-               ssemodeltests.jar,\
+bin.includes = ssemodeltests.jar,\
                test.xml,\
                META-INF/,\
                about.html
 source.ssemodeltests.jar = src/
 output.ssemodeltests.jar = bin/
-src.includes = plugin.xml

diff --git a/tests/org.eclipse.wst.sse.core.tests/plugin.properties b/tests/org.eclipse.wst.sse.core.tests/plugin.properties
new file mode 100644
index 0000000..da827dc
--- /dev/null
+++ b/tests/org.eclipse.wst.sse.core.tests/plugin.properties

@@ -0,0 +1,3 @@
+# properties file for org.eclipse.wst.sse.core.tests
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Name.0 = Tests Plug-in
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestAbstractAdapterFactory.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestAbstractAdapterFactory.java
index 35c40c4..ee942f0 100644
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestAbstractAdapterFactory.java
+++ b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestAbstractAdapterFactory.java

@@ -50,6 +50,7 @@
 //	}
 	
 	public void testCreate() {
+		// TODO: create unit test
 
 	}
 }

diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterFactoryTestOnly.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterFactoryTestOnly.java
index a2ed451..a8c3993 100644
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterFactoryTestOnly.java
+++ b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterFactoryTestOnly.java

@@ -22,11 +22,13 @@
 
 /**
  * This class exists only to satisfy some of the unit tests.
- *
+ * 
  * To test, use following line in client, such as when it intitialized.
- *  FactoryRegistry.getFactoryRegistry().addFactory(new AdapterFactoryTestOnly());
- *
+ * FactoryRegistry.getFactoryRegistry().addFactory(new
+ * AdapterFactoryTestOnly());
+ * 
  * Creation date: (11/14/00 7:08:18 PM)
+ * 
  * @author: David Williams
  */
 public class AdapterFactoryTestOnly implements INodeAdapterFactory {
@@ -44,19 +46,20 @@
 	}
 
 	/**
-	 * Method that returns the adapter associated with the this factory and the given object,
-	 * and "sets up" the adaptable object to use the adapter.
-	 *
-	 * The adapter may be a singleton or not ... depending on the needs of the INodeAdapter  ...
-	 * but in general it is recommended for an adapter to be stateless, 
-	 * so the efficiencies of a singleton can be gained.
-	 *
+	 * Method that returns the adapter associated with the this factory and
+	 * the given object, and "sets up" the adaptable object to use the
+	 * adapter.
+	 * 
+	 * The adapter may be a singleton or not ... depending on the needs of the
+	 * INodeAdapter ... but in general it is recommended for an adapter to be
+	 * stateless, so the efficiencies of a singleton can be gained.
+	 * 
 	 * The implementation of this method should call addAdapter on the adapted
 	 * object with the correct instance of the adapter.
 	 */
 	public INodeAdapter adapt(INodeNotifier target) {
-		//object.addAdapter(adapterInstance);
-		//return adapterInstance;
+		// object.addAdapter(adapterInstance);
+		// return adapterInstance;
 		INodeAdapter result = null;
 
 		Iterator adaptersList = adapters.iterator();
@@ -65,8 +68,8 @@
 			if (adapter.isAdapterForType(target)) {
 				INodeAdapter existingAdapter = target.getExistingAdapter(adapter);
 				if (existingAdapter == null) {
-				target.addAdapter(adapter);
-				result = adapter;
+					target.addAdapter(adapter);
+					result = adapter;
 				}
 			}
 		}
@@ -101,9 +104,11 @@
 	}
 
 	/**
-	 *
+	 * 
 	 */
 	public void release() {
+		// TODO: create unit test
+
 	}
 
 	public INodeAdapterFactory copy() {

diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForAttrTestOnly.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForAttrTestOnly.java
index fdc17ed..e86b84c 100644
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForAttrTestOnly.java
+++ b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForAttrTestOnly.java

@@ -16,8 +16,8 @@
 
 
 /**
- * Insert the type's description here.
- * Creation date: (1/9/01 3:37:01 PM) 
+ * Insert the type's description here. Creation date: (1/9/01 3:37:01 PM)
+ * 
  * @author: David Williams
  */
 public class AdapterForAttrTestOnly implements INodeAdapter {
@@ -29,19 +29,20 @@
 	}
 
 	/**
-	 * Allowing the INodeAdapter to compare itself against the type
-	 * allows it to return true in more than one case.
+	 * Allowing the INodeAdapter to compare itself against the type allows it
+	 * to return true in more than one case.
 	 */
 	public boolean isAdapterForType(Object type) {
-		if (type instanceof Attr)
-			return true;
-		else
-			return false;
+		boolean result = false;
+		if (type instanceof Attr) {
+			result = true;
+		}
+		return result;
 	}
 
 	/**
 	 */
 	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		System.out.println("INodeAdapter AdapterForAttrTestOnly " +  this.hashCode() + " has been notified of " + INodeNotifier.EVENT_TYPE_STRINGS[eventType] + " (when " + notifier + " notified it)");
+		System.out.println("INodeAdapter AdapterForAttrTestOnly " + this.hashCode() + " has been notified of " + INodeNotifier.EVENT_TYPE_STRINGS[eventType] + " (when " + notifier + " notified it)");
 	}
 }
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForDocumentTestOnly.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForDocumentTestOnly.java
index 62c962b..f8875c9 100644
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForDocumentTestOnly.java
+++ b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForDocumentTestOnly.java

@@ -16,8 +16,8 @@
 
 
 /**
- * Insert the type's description here.
- * Creation date: (1/9/01 3:37:01 PM)
+ * Insert the type's description here. Creation date: (1/9/01 3:37:01 PM)
+ * 
  * @author: David Williams
  */
 public class AdapterForDocumentTestOnly implements INodeAdapter {
@@ -29,19 +29,20 @@
 	}
 
 	/**
-	 * Allowing the INodeAdapter to compare itself against the type
-	 * allows it to return true in more than one case.
+	 * Allowing the INodeAdapter to compare itself against the type allows it
+	 * to return true in more than one case.
 	 */
 	public boolean isAdapterForType(Object type) {
-		if (type instanceof Document)
-			return true;
-		else
-			return false;
+		boolean result = false;
+		if (type instanceof Document) {
+			result = true;
+		}
+		return result;
 	}
 
 	/**
 	 */
 	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		System.out.println("INodeAdapter AdapterForDocumentTestOnly " +  this.hashCode() + " has been notified of " + INodeNotifier.EVENT_TYPE_STRINGS[eventType] + " (when " + notifier + " notified it)");
+		System.out.println("INodeAdapter AdapterForDocumentTestOnly " + this.hashCode() + " has been notified of " + INodeNotifier.EVENT_TYPE_STRINGS[eventType] + " (when " + notifier + " notified it)");
 	}
 }
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForElementTestOnly.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForElementTestOnly.java
index 2d589b4..0781564 100644
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForElementTestOnly.java
+++ b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForElementTestOnly.java

@@ -16,8 +16,8 @@
 
 
 /**
- * Insert the type's description here. 
- * Creation date: (1/9/01 3:37:01 PM)
+ * Insert the type's description here. Creation date: (1/9/01 3:37:01 PM)
+ * 
  * @author: David Williams
  */
 public class AdapterForElementTestOnly implements INodeAdapter {
@@ -29,19 +29,20 @@
 	}
 
 	/**
-	 * Allowing the INodeAdapter to compare itself against the type
-	 * allows it to return true in more than one case.
+	 * Allowing the INodeAdapter to compare itself against the type allows it
+	 * to return true in more than one case.
 	 */
 	public boolean isAdapterForType(Object type) {
-		if (type instanceof Element)
-			return true;
-		else
-			return false;
+		boolean result = false;
+		if (type instanceof Element) {
+			result = true;
+		}
+		return result;
 	}
 
 	/**
 	 */
 	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		System.out.println("INodeAdapter AdapterForElementTestOnly " +  this.hashCode() + " has been notified of " + INodeNotifier.EVENT_TYPE_STRINGS[eventType] + " (when " + notifier + " notified it)");
+		System.out.println("INodeAdapter AdapterForElementTestOnly " + this.hashCode() + " has been notified of " + INodeNotifier.EVENT_TYPE_STRINGS[eventType] + " (when " + notifier + " notified it)");
 	}
 }
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestAboutToBeChangedEvent.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestAboutToBeChangedEvent.java
index b91874d..79f84da 100644
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestAboutToBeChangedEvent.java
+++ b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestAboutToBeChangedEvent.java

@@ -50,15 +50,6 @@
 		assertTrue(true);
 	}
 
-	/*
-	 * Class under test for String toString()
-	 */
-	public void testToString() {
-		AboutToBeChangedEvent event = getBasicEvent();
-		String r = event.toString();
-		assertNotNull(r);
-	}
-
 	private AboutToBeChangedEvent getBasicEvent() {
 		IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(new NullParser());
 		AboutToBeChangedEvent event = new AboutToBeChangedEvent(document, this, "test", 0, 0);

diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalImprovement.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalImprovement.java
index 743dbb9..a193ad5 100644
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalImprovement.java
+++ b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalImprovement.java

@@ -14,8 +14,8 @@
 
 import junit.framework.TestCase;
 
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
 import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;

diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalWithChanges.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalWithChanges.java
index b9cc6b1..23c643d 100644
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalWithChanges.java
+++ b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalWithChanges.java

@@ -15,8 +15,8 @@
 
 import junit.framework.TestCase;
 
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
 import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;

diff --git a/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF
index 782db8a..3cbf78d 100644
--- a/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF

@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Structured Source Editor Tests
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.sse.ui.tests; singleton:=true
 Bundle-Version: 1.0.0
 Bundle-ClassPath: sseeditortests.jar
 Bundle-Activator: org.eclipse.wst.sse.ui.tests.SSETestsPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.sse.ui.tests,
  org.eclipse.wst.sse.ui.tests.viewer
@@ -20,4 +20,4 @@
  org.eclipse.jface.text,
  org.eclipse.core.runtime,
  org.eclipse.wst.common.modulecore
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true

diff --git a/tests/org.eclipse.wst.sse.ui.tests/plugin.properties b/tests/org.eclipse.wst.sse.ui.tests/plugin.properties
new file mode 100644
index 0000000..9f4e1fb
--- /dev/null
+++ b/tests/org.eclipse.wst.sse.ui.tests/plugin.properties

@@ -0,0 +1,8 @@
+# properties file for org.eclipse.wst.sse.ui.tests
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Name.0 = Structured Source Editor Tests
+editor.name.0 = Generic Structured Text Editor
+category.name.0 = SSE Testing
+view.name.0 = ExtendedStorageEditorInput Management Tester
+view.name.1 = Action Tester
+action.label.0 = org.eclipse.ui.popupMenus Test Action
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.sse.ui.tests/plugin.xml b/tests/org.eclipse.wst.sse.ui.tests/plugin.xml
index 12353e5..9b85cdf 100644
--- a/tests/org.eclipse.wst.sse.ui.tests/plugin.xml
+++ b/tests/org.eclipse.wst.sse.ui.tests/plugin.xml

@@ -5,9 +5,9 @@
 	<extension point="org.eclipse.ui.editors">
 		<editor
 			default="true"
-			name="Generic Structured Text Editor"
+			name="%editor.name.0"
 			extensions="project, classpath, websettings, serverPreference"
-			icon="icons/sourceEditor.gif"
+			icon="$nl$/icons/sourceEditor.gif"
 			class="org.eclipse.wst.sse.ui.StructuredTextEditor"
 			contributorClass="org.eclipse.wst.sse.ui.internal.actions.ActionContributor"
 			id="org.eclipse.wst.sse.ui.StructuredTextEditor.test">
@@ -32,17 +32,17 @@
 
 	<extension point="org.eclipse.ui.views">
 		<category
-			name="SSE Testing"
+			name="%category.name.0"
 			id="org.eclipse.wst.sse.ui.tests">
 		</category>
 		<view
-			name="ExtendedStorageEditorInput Management Tester"
+			name="%view.name.0"
 			category="org.eclipse.wst.sse.ui.tests"
 			class="org.eclipse.wst.sse.ui.tests.ExtendedStorageEditorInputView"
 			id="org.eclipse.wst.sse.ui.tests.ExtendedStorageEditorInputView">
 		</view>
 		<view
-			name="Action Tester"
+			name="%view.name.1"
 			category="org.eclipse.wst.sse.ui.tests"
 			class="org.eclipse.wst.sse.ui.tests.ActionTestView"
 			id="org.eclipse.wst.sse.ui.tests.ActionTestView">
@@ -54,7 +54,7 @@
 			targetID="org.eclipse.wst.sse.ui.StructuredTextEditor.EditorContext"
 			id="org.eclipse.wst.sse.ui.tests.test">
 			<action
-				label="org.eclipse.ui.popupMenus Test Action"
+				label="%action.label.0"
 				class="org.eclipse.wst.sse.ui.tests.TestActionDelegate"
 				menubarPath="additions"
 				id="org.eclipse.wst.sse.ui.tests.test.1" />

diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ExtendedStorageEditorInputView.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ExtendedStorageEditorInputView.java
index 76c595d..8eab992 100644
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ExtendedStorageEditorInputView.java
+++ b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ExtendedStorageEditorInputView.java

@@ -80,7 +80,7 @@
 import org.eclipse.ui.part.ViewPart;
 import org.eclipse.ui.texteditor.IElementStateListener;
 import org.eclipse.ui.texteditor.IUpdate;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
+import org.eclipse.wst.sse.core.utils.StringUtils;
 import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
 import org.eclipse.wst.sse.ui.internal.provisional.extensions.breakpoint.IExtendedStorageEditorInput;
 
@@ -139,9 +139,11 @@
 		ILabelProvider baseProvider = new WorkbenchLabelProvider();
 
 		public void addListener(ILabelProviderListener listener) {
+			// not implemented
 		}
 
 		public void dispose() {
+			// no need
 		}
 
 		public Image getColumnImage(Object element, int columnIndex) {
@@ -195,7 +197,7 @@
 		}
 
 		public void removeListener(ILabelProviderListener listener) {
-
+			// not implemented
 		}
 	}
 

diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestActionDelegate.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestActionDelegate.java
index 96feed2..36c0e50 100644
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestActionDelegate.java
+++ b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestActionDelegate.java

@@ -25,7 +25,7 @@
  */
 public class TestActionDelegate extends Action implements IEditorActionDelegate {
 	IEditorPart editor = null;
-	IAction action = null;
+	IAction faction = null;
 
 	/**
 	 * 
@@ -65,7 +65,7 @@
 	 */
 	public void setActiveEditor(IAction targetAction, IEditorPart targetEditor) {
 		editor = targetEditor;
-		action = targetAction;
+		faction = targetAction;
 	}
 
 	/*
@@ -84,5 +84,6 @@
 	 *      org.eclipse.jface.viewers.ISelection)
 	 */
 	public void selectionChanged(IAction action, ISelection selection) {
+		// do nothing
 	}
 }

diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestLineStyleProvider.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestLineStyleProvider.java
index 80d3d03..81f3ae4 100644
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestLineStyleProvider.java
+++ b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestLineStyleProvider.java

@@ -41,6 +41,7 @@
 	 *      org.eclipse.wst.sse.ui.style.Highlighter)
 	 */
 	public void init(IStructuredDocument document, Highlighter highlighter) {
+		// nothing to init
 	}
 
 	/*
@@ -63,6 +64,7 @@
 	 * @see org.eclipse.wst.sse.ui.style.LineStyleProvider#release()
 	 */
 	public void release() {
+		// nothing to release
 	}
 
 }

diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java
index 3e5536b..eccd14b 100644
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java
+++ b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java

@@ -33,7 +33,6 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.ui.part.IShowInTargetList;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 import org.eclipse.wst.sse.ui.StructuredTextEditor;
 import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
 
@@ -142,11 +141,6 @@
 		assertTrue("Unable to initialize document provider", true);
 	}
 
-	public void testGetModel() {
-		IStructuredModel model = fEditor.getModel();
-		assertNotNull("Editor's model was null", model);
-	}
-
 	public void testGetOrientation() {
 		int or = fEditor.getOrientation();
 		assertEquals(SWT.LEFT_TO_RIGHT, or);

diff --git a/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
index 83d552f..4e963e2 100644
--- a/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF

@@ -1,15 +1,18 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SSE Model XML Tests
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.xml.core.tests; singleton:=true
 Bundle-Version: 1.0.0
 Bundle-ClassPath: ssemodelxmltests.jar
 Bundle-Activator: org.eclipse.wst.xml.core.tests.SSEModelXMLTestsPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.xml.core.tests,
+ org.eclipse.wst.xml.core.tests.contentmodel,
  org.eclipse.wst.xml.core.tests.document,
  org.eclipse.wst.xml.core.tests.dom,
+ org.eclipse.wst.xml.core.tests.format,
+ org.eclipse.wst.xml.core.tests.format.testfiles.xml,
  org.eclipse.wst.xml.core.tests.model,
  org.eclipse.wst.xml.core.tests.text,
  org.eclipse.wst.xml.core.tests.text.testfiles.xml,
@@ -23,6 +26,5 @@
  org.eclipse.ui.ide,
  org.eclipse.text,
  org.eclipse.wst.sse.core,
- org.eclipse.wst.common.uriresolver,
  com.ibm.icu
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true

diff --git a/tests/org.eclipse.wst.xml.core.tests/plugin.properties b/tests/org.eclipse.wst.xml.core.tests/plugin.properties
new file mode 100644
index 0000000..4808a5e
--- /dev/null
+++ b/tests/org.eclipse.wst.xml.core.tests/plugin.properties

@@ -0,0 +1,3 @@
+# properties file for org.eclipse.wst.xml.core.tests
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Name.0 = SSE Model XML Tests
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java
index f4665ba..e3bbc4e 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java

@@ -15,6 +15,7 @@
 import java.net.URL;
 import java.util.ResourceBundle;
 
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 
@@ -59,7 +60,7 @@
 		URL installLocation = Platform.getBundle("org.eclipse.wst.xml.core.tests").getEntry("/");
 		URL resolvedLocation = null;
 		try {
-			resolvedLocation = Platform.resolve(installLocation);
+			resolvedLocation = FileLocator.resolve(installLocation);
 		}
 		catch (IOException e) {
 			// impossible

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java
index bbba16f..346dfb3 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java

@@ -109,7 +109,7 @@
 
   protected static class IsRepeatableVisitor extends CMVisitor
   {                                             
-    public boolean result = false;;
+    public boolean result = false;
     protected CMGroup currentGroup;
 
     protected CMNode root;

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java
index 56a316b..f65276a 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java

@@ -2,8 +2,8 @@
 
 import junit.framework.TestCase;
 
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
 import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java
index d03349e..440d766 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java

@@ -14,10 +14,10 @@
 import org.eclipse.jface.text.BadPositionCategoryException;
 import org.eclipse.jface.text.Position;
 import org.eclipse.osgi.service.datalocation.Location;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
 import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
 import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java
index b0f6c06..71a4daa 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java

@@ -22,8 +22,8 @@
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentExtension3;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
 import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java
index 51ab925..2093424 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java

@@ -12,10 +12,10 @@
 
 package org.eclipse.wst.xml.core.tests.dom;
 
-import org.eclipse.wst.xml.core.internal.provisional.NameValidator;
-
 import junit.framework.TestCase;
 
+import org.eclipse.wst.xml.core.internal.provisional.NameValidator;
+
 public class NameValidatorTests extends TestCase {
 
 	private int nTrials = 100;

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java
index f982152..0e11205 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java

@@ -21,10 +21,10 @@
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.util.URIResolver;
 import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
 import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML;

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestFragFile.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestFragFile.java
index f115b12..90e8360 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestFragFile.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestFragFile.java

@@ -18,9 +18,9 @@
 
 import junit.framework.TestCase;
 
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 
 
 

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java
index b2a215b..26993c7 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java

@@ -12,9 +12,9 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.osgi.service.datalocation.Location;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
 import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java
index 2da9af5..63b484e 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java

@@ -20,9 +20,9 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
 import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
 import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java
index bf4b37f..276fdee 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java

@@ -11,10 +11,10 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.osgi.service.datalocation.Location;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelStateListener;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.xml.core.internal.modelhandler.XMLModelLoader;
 import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java
index 421bae8..0577e59 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java

@@ -19,13 +19,13 @@
 import org.eclipse.jface.text.IDocumentExtension3;
 import org.eclipse.jface.text.IDocumentPartitioner;
 import org.eclipse.jface.text.ITypedRegion;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
 import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredTextPartitioner;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
+import org.eclipse.wst.sse.core.utils.StringUtils;
 import org.eclipse.wst.xml.core.text.IXMLPartitions;
 
 import com.ibm.icu.text.DecimalFormat;

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java
index 73521d4..63d8cd0 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java

@@ -10,11 +10,12 @@
  *******************************************************************************/
 package org.eclipse.wst.xml.core.tests.util;
 
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
+import com.ibm.icu.text.DateFormat;
+import com.ibm.icu.text.SimpleDateFormat;
+
 /**
  * @author davidw
  *

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java
index 6b08a1f..0c46ed4 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java

@@ -15,6 +15,7 @@
 import java.io.IOException;
 import java.net.URL;
 
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.osgi.framework.Bundle;
 
@@ -58,7 +59,7 @@
 			// add known file so URL method below can be used
 			// (doesn't seem to work for directory?)
 			URL totalURL = new URL(url, "plugin.xml");
-			URL finalurl = Platform.asLocalURL(totalURL);
+			URL finalurl = FileLocator.toFileURL(totalURL);
 			String finalFile = finalurl.getFile();
 			File file = new File(finalFile);
 			String finalPath = file.getParent();
@@ -89,7 +90,7 @@
 	public static File makeFileFor(String directory, String filename, String testResultsDirectoryPrefix) throws IOException {
 		Bundle bundle = Platform.getBundle(XML_CORE_TESTS_PLUGIN_ID);
 		URL url = bundle.getEntry("/");
-		URL localURL = Platform.asLocalURL(url);
+		URL localURL = FileLocator.toFileURL(url);
 		String installPath = localURL.getPath();
 		String totalDirectory = installPath + directory;
 		String totalPath = totalDirectory + "/" + filename;

diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java
index 20a7310..1f201f7 100644
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java
+++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java

@@ -10,11 +10,12 @@
  *******************************************************************************/
 package org.eclipse.wst.xml.core.tests.util;
 
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
+import com.ibm.icu.text.DateFormat;
+import com.ibm.icu.text.SimpleDateFormat;
+
 /**
  * @author davidw
  *

diff --git a/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF
index d23810c..91fa561 100644
--- a/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF

@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Encoding Tests Plug-in
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.xml.tests.encoding
 Bundle-Version: 1.0.0
 Bundle-ClassPath: tests.jar
 Bundle-Activator: org.eclipse.wst.xml.tests.encoding.TestsPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.xml.tests.encoding,
  org.eclipse.wst.xml.tests.encoding.pref,
@@ -22,4 +22,4 @@
  org.eclipse.wst.xml.core,
  org.eclipse.core.runtime,
  org.eclipse.wst.sse.core
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true

diff --git a/tests/org.eclipse.wst.xml.tests.encoding/build.properties b/tests/org.eclipse.wst.xml.tests.encoding/build.properties
index 34814be..641c2ff 100644
--- a/tests/org.eclipse.wst.xml.tests.encoding/build.properties
+++ b/tests/org.eclipse.wst.xml.tests.encoding/build.properties

@@ -8,18 +8,11 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-bin.includes = plugin.xml,\
-               *.jar,\
-               tests.jar,\
-               config/,\
+bin.includes = tests.jar,\
                testfiles/,\
                testfiles.zip,\
-               info/,\
                test.xml,\
                META-INF/,\
                about.html
-src.includes = plugin.xml,\
-               info/,\
-               config/
 source.tests.jar = src/
 output.tests.jar = bin/

diff --git a/tests/org.eclipse.wst.xml.tests.encoding/plugin.properties b/tests/org.eclipse.wst.xml.tests.encoding/plugin.properties
new file mode 100644
index 0000000..c96f3f0
--- /dev/null
+++ b/tests/org.eclipse.wst.xml.tests.encoding/plugin.properties

@@ -0,0 +1,3 @@
+# properties file for org.eclipse.wst.xml.tests.encoding
+Bundle-Vendor.0 = Eclipse.org
+Bundle-Name.0 = Encoding Tests Plug-in
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/FileUtil.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/FileUtil.java
index f637647..b1fc4eb 100644
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/FileUtil.java
+++ b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/FileUtil.java

@@ -14,7 +14,7 @@
 import java.io.IOException;
 import java.net.URL;
 
-import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.FileLocator;
 
 /**
  * @author davidw
@@ -36,7 +36,7 @@
 		String totalDirectory = installPath + directory;
 		String totalPath = totalDirectory + "/" + filename;
 		URL totalURL = new URL(url, totalPath);
-		URL finalurl = Platform.asLocalURL(totalURL);
+		URL finalurl = FileLocator.toFileURL(totalURL);
 		String finalFile = finalurl.getFile();
 		File file = new File(finalFile);
 		String finalPath = file.getParent();

diff --git a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/TestsPlugin.java b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/TestsPlugin.java
index 4a466b1..2f3566e 100644
--- a/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/TestsPlugin.java
+++ b/tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/TestsPlugin.java

@@ -24,6 +24,7 @@
 
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.wst.xml.core.internal.contenttype.ByteReader;
@@ -76,7 +77,7 @@
 		URL installLocation = Platform.getBundle("org.eclipse.wst.xml.tests.encoding").getEntry("/");
 		URL resolvedLocation = null;
 		try {
-			resolvedLocation = Platform.resolve(installLocation);
+			resolvedLocation = FileLocator.resolve(installLocation);
 		}
 		catch (IOException e) {
 			// impossible

diff --git a/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.jdt.core.prefs
index 16d2f86..8d2e4d1 100644
--- a/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.jdt.core.prefs

@@ -1,48 +1,48 @@
-#Wed Jan 12 16:49:37 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+#Mon Feb 27 01:32:17 EST 2006
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
 org.eclipse.jdt.core.builder.invalidClasspath=abort
 org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
 org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error

diff --git a/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF
index 4140905..ecce10e 100644
--- a/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: XML UI Tests
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.xml.ui.tests; singleton:=true
 Bundle-Version: 1.0.0
 Bundle-ClassPath: xmluitests.jar
@@ -14,7 +14,6 @@
  org.eclipse.jface.text,
  org.eclipse.wst.xml.ui,
  org.eclipse.wst.sse.ui,
- org.eclipse.ui.editors,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.ui.ide,
  org.junit,
@@ -23,4 +22,4 @@
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.wst.xml.core
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true

diff --git a/tests/org.eclipse.wst.xml.ui.tests/plugin.properties b/tests/org.eclipse.wst.xml.ui.tests/plugin.properties
index 2e49616..dabbca0 100644
--- a/tests/org.eclipse.wst.xml.ui.tests/plugin.properties
+++ b/tests/org.eclipse.wst.xml.ui.tests/plugin.properties

@@ -9,3 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 providerName=Eclipse.org
+
+Bundle-Name.0 = XML UI Tests
+view.name.0 = Embedded XML Structured Text Viewer
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.xml.ui.tests/plugin.xml b/tests/org.eclipse.wst.xml.ui.tests/plugin.xml
index 22ae0bf..c3716eb 100644
--- a/tests/org.eclipse.wst.xml.ui.tests/plugin.xml
+++ b/tests/org.eclipse.wst.xml.ui.tests/plugin.xml

@@ -5,8 +5,8 @@
 	<extension point="org.eclipse.ui.views">
 
 		<view
-			name="Embedded XML Structured Text Viewer"
-			icon="icons/sourceEditor.gif"
+			name="%view.name.0"
+			icon="$nl$/icons/sourceEditor.gif"
 			category="org.eclipse.wst.sse.ui.tests"
 			class="org.eclipse.wst.xml.ui.tests.viewer.ViewerTestXML"
 			id="org.eclipse.wst.xml.ui.tests.viewer.ViewerTestXML">

diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java
index cd9bf9b..2ab3409 100644
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java
+++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java

@@ -24,6 +24,8 @@
 
 public class BreakpointErrorProvider implements IBreakpointProvider {
 
+	ISourceEditingTextTools fTool;
+
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -57,5 +59,6 @@
 	 * @see org.eclipse.wst.sse.ui.extensions.breakpoint.IBreakpointProvider#setSourceEditingTextTools(org.eclipse.wst.sse.ui.extensions.breakpoint.SourceEditingTextTools)
 	 */
 	public void setSourceEditingTextTools(ISourceEditingTextTools tool) {
+		fTool = tool;
 	}
 }
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java
index 3bbeac4..9062cce 100644
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java
+++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java

@@ -18,6 +18,8 @@
 
 
 public class EnableWarningAction extends Action implements IExtendedEditorAction {
+	IExtendedSimpleEditor activeEditor;
+
 	public EnableWarningAction() {
 		super();
 		XMLUITestsPlugin.getDefault().getPreferenceStore().setDefault("break-error", false);
@@ -93,6 +95,7 @@
 	 * @see org.eclipse.wst.sse.ui.extension.IExtendedEditorAction#setActiveExtendedEditor(org.eclipse.wst.sse.ui.extension.IExtendedSimpleEditor)
 	 */
 	public void setActiveExtendedEditor(IExtendedSimpleEditor targetEditor) {
+		activeEditor = targetEditor;
 	}
 
 	/*

diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java
index 672992c..23d0914 100644
--- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java
+++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java

@@ -36,9 +36,9 @@
 import org.eclipse.ui.part.ViewPart;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.wst.sse.core.StructuredModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
 import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
 import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
 import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;

diff --git a/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF
index 52a4b72..17004d1 100644
--- a/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF

@@ -1,16 +1,15 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: XML Validator Tests Plug-in
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.xml.validation.tests
 Bundle-Version: 1.0.0
 Bundle-ClassPath: validatexmltests.jar
 Bundle-Activator: org.eclipse.wst.xml.validation.tests.internal.XMLValidatorTestsPlugin
-Bundle-Vendor: Eclipse
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.validation.tests.internal
-Require-Bundle: org.eclipse.core.resources,
- org.junit,
+Export-Package: org.eclipse.wst.xml.validation.tests.internal;x-internal:=true
+Require-Bundle: org.junit,
  org.eclipse.core.runtime,
  org.eclipse.wst.xml.core,
  org.eclipse.wst.xml.ui
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true

diff --git a/tests/org.eclipse.wst.xml.validation.tests/build.properties b/tests/org.eclipse.wst.xml.validation.tests/build.properties
index f50c282..4b89c52 100644
--- a/tests/org.eclipse.wst.xml.validation.tests/build.properties
+++ b/tests/org.eclipse.wst.xml.validation.tests/build.properties

@@ -1,11 +1,7 @@
-bin.includes = plugin.xml,\
-               test.xml,\
+bin.includes = test.xml,\
                testresources/,\
                validatexmltests.jar,\
                META-INF/,\
                about.html
 source.validatexmltests.jar = src/
-src.includes = plugin.xml,\
-               .options,\
-               build.properties
 bin.excludes = testresources/.cvsignore

diff --git a/tests/org.eclipse.wst.xml.validation.tests/plugin.properties b/tests/org.eclipse.wst.xml.validation.tests/plugin.properties
new file mode 100644
index 0000000..65c0568
--- /dev/null
+++ b/tests/org.eclipse.wst.xml.validation.tests/plugin.properties

@@ -0,0 +1,3 @@
+# properties file for org.eclipse.wst.xml.validation.tests
+Bundle-Vendor.0 = Eclipse
+Bundle-Name.0 = XML Validator Tests Plug-in
\ No newline at end of file

diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java
index ac1bcd9..7adaba0 100644
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java
+++ b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java

@@ -11,6 +11,7 @@
 
 package org.eclipse.wst.xml.validation.tests.internal;
 
+import java.io.IOException;
 import java.util.List;
 
 import junit.framework.TestCase;
@@ -38,7 +39,7 @@
   /* (non-Javadoc)
    * @see junit.framework.TestCase#setUp()
    */
-  protected void setUp()
+  protected void setUp() throws IOException
   {
     PLUGIN_ABSOLUTE_PATH = XMLValidatorTestsPlugin.getPluginLocation().toString() + "/";
   }

diff --git a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java
index 7d82f27..94f61d2 100644
--- a/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java
+++ b/tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java

@@ -10,33 +10,27 @@
  *******************************************************************************/
 
 package org.eclipse.wst.xml.validation.tests.internal;
+
 import java.io.IOException;
 
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
+
 /**
  * The plugin class for this test plugin.
  * 
  * @author Lawrence Mandel, IBM
  */
-public class XMLValidatorTestsPlugin extends Plugin
-{
-  private static XMLValidatorTestsPlugin plugin = null;
- 
-  public XMLValidatorTestsPlugin()
-  {
-  	plugin = this;
-  }
+public class XMLValidatorTestsPlugin extends Plugin {
+	private static XMLValidatorTestsPlugin plugin = null;
 
- public static String getPluginLocation()
-  {
-    try
-    {
-      return new Path(Platform.resolve(plugin.getBundle().getEntry("/")).getFile()).removeTrailingSeparator().toString();
-    } catch (IOException e)
-    {
-    }
-    return null;
-  }
+	public XMLValidatorTestsPlugin() {
+		plugin = this;
+	}
+
+	public static String getPluginLocation() throws IOException {
+		String file = FileLocator.resolve(plugin.getBundle().getEntry("/")).getFile();
+		return new Path(file).removeTrailingSeparator().toString();
+	}
 }

diff --git a/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF
index 2a7c472..c267e6e 100644
--- a/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF

@@ -1,17 +1,16 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: XSD Validation Tests Plug-in
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.xsd.validation.tests
 Bundle-Version: 1.0.100
 Bundle-ClassPath: validatexsdtests.jar
 Bundle-Activator: org.eclipse.wst.xsd.validation.tests.internal.XSDValidationTestsPlugin
-Bundle-Vendor: Eclipse
+Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.resources,
  org.junit,
  org.eclipse.wst.xml.core,
  org.eclipse.core.runtime,
- org.eclipse.wst.xsd.core,
  org.eclipse.wst.xsd.ui
-Eclipse-AutoStart: true
-Export-Package: org.eclipse.wst.xsd.validation.tests.internal
+Eclipse-LazyStart: true
+Export-Package: org.eclipse.wst.xsd.validation.tests.internal;x-internal:=true

diff --git a/tests/org.eclipse.wst.xsd.validation.tests/build.properties b/tests/org.eclipse.wst.xsd.validation.tests/build.properties
index d584972..4f4bed0 100644
--- a/tests/org.eclipse.wst.xsd.validation.tests/build.properties
+++ b/tests/org.eclipse.wst.xsd.validation.tests/build.properties

@@ -1,15 +1,9 @@
-bin.includes = plugin.xml,\
-               *.jar,\
-               validatexsdtests.jar,\
+bin.includes = validatexsdtests.jar,\
                test.xml,\
                testresources/,\
                META-INF/,\
                about.html
-source.validatexsdtests.jar = src/
-src.includes = plugin.xml,\
-               build.xml,\
-               .options,\
-               build.properties
+source.validatexsdtests.jar = src/ 
 
 bin.excludes = testresources/.cvsignore,\
                testresources/generatedResults/

diff --git a/tests/org.eclipse.wst.xsd.validation.tests/plugin.properties b/tests/org.eclipse.wst.xsd.validation.tests/plugin.properties
new file mode 100644
index 0000000..65a540d
--- /dev/null
+++ b/tests/org.eclipse.wst.xsd.validation.tests/plugin.properties

@@ -0,0 +1,3 @@
+# properties file for org.eclipse.wst.xsd.validation.tests
+Bundle-Vendor.0 = Eclipse
+Bundle-Name.0 = XSD Validation Tests Plug-in
\ No newline at end of file