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

4 files changed, 11 insertions, 10 deletions

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 db400fcf3..161345c7f 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 @@ Require-Bundle: org.eclipse.core.resources,
  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 7a820cbc3..34304b536 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 000000000..98b1b7f4c
--- /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 3798ccb92..18e0c6873 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 java.util.ResourceBundle;
 
 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 @@ public class JSPEncodingTestsPlugin extends Plugin {
 		if (!topDir.isDirectory()) {
 			throw new IllegalArgumentException(topDirName + " is not a directory");
 		}
-		else {
-			result = getFilesInDir(topDir);
-		}
+
+		result = getFilesInDir(topDir);
 		return result;
 	}
 
@@ -76,7 +76,7 @@ public class JSPEncodingTestsPlugin extends Plugin {
 		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