minor test bundle fixes

tests/org.eclipse.jst.servlet.tests/META-INF/MANIFEST.MF

diff --git a/tests/org.eclipse.jst.servlet.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.servlet.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..f844d1b
--- /dev/null
+++ b/tests/org.eclipse.jst.servlet.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %PLUGIN
+Bundle-SymbolicName: org.eclipse.jst.servlet.tests
+Bundle-Version: 1.1.0.qualifier
+Bundle-ClassPath: tests.jar
+Bundle-Activator: org.eclipse.jst.servlet.tests.ServletTestsPlugin
+Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Localization: plugin
+Export-Package: org.eclipse.jst.servlet.tests,
+ org.eclipse.jst.servlet.tests.bvt,
+ org.eclipse.jst.servlet.tomcat.tests
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.commands,
+ org.eclipse.jst.common.frameworks,
+ org.eclipse.wst.common.frameworks,
+ org.eclipse.jst.j2ee.core,
+ org.eclipse.jst.j2ee.web,
+ org.eclipse.wst.common.tests,
+ org.junit;bundle-version="[3.8.1,4.0.0)",
+ org.eclipse.jst.j2ee.tests,
+ org.eclipse.jst.j2ee,
+ org.eclipse.wst.server.core,
+ org.eclipse.wst.common.modulecore,
+ org.eclipse.wst.common.project.facet.core
+Eclipse-LazyStart: true

tests/org.eclipse.jst.servlet.tests/build.properties

diff --git a/tests/org.eclipse.jst.servlet.tests/build.properties b/tests/org.eclipse.jst.servlet.tests/build.properties
index 16d5aeb..a84350d 100644
--- a/tests/org.eclipse.jst.servlet.tests/build.properties
+++ b/tests/org.eclipse.jst.servlet.tests/build.properties
@@ -1,8 +1,8 @@
 source.tests.jar = webmodule-tomcat-tests/
 output.tests.jar = bin/
-bin.includes = plugin.xml,\
-               tests.jar,\
+bin.includes = tests.jar,\
                WARImportTests/,\
                test.xml,\
                about.html,\
-               plugin.properties
+               plugin.properties,\
+               META-INF/

tests/org.eclipse.jst.servlet.tests/plugin.properties

diff --git a/tests/org.eclipse.jst.servlet.tests/plugin.properties b/tests/org.eclipse.jst.servlet.tests/plugin.properties
index ff7fcc3..a6b446a 100644
--- a/tests/org.eclipse.jst.servlet.tests/plugin.properties
+++ b/tests/org.eclipse.jst.servlet.tests/plugin.properties
@@ -10,4 +10,4 @@
 ###############################################################################
 
 PLUGIN=org.eclipse.jst.servlet.tests
-IBM=IBM
\ No newline at end of file
+Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file

tests/org.eclipse.jst.servlet.tests/plugin.xml

diff --git a/tests/org.eclipse.jst.servlet.tests/plugin.xml b/tests/org.eclipse.jst.servlet.tests/plugin.xml
deleted file mode 100644
index 28b80ef..0000000
--- a/tests/org.eclipse.jst.servlet.tests/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jst.servlet.tests"
-   name="%PLUGIN"
-   version="1.1.0"
-   provider-name="%IBM"
-   class="org.eclipse.jst.servlet.tests.ServletTestsPlugin">
-
-   <runtime>
-      <library name="tests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.commands"/>
-      <import plugin="org.eclipse.jst.common.frameworks"/>
-      <import plugin="org.eclipse.wst.common.frameworks"/>
-      <import plugin="org.eclipse.jst.j2ee.core"/>
-      <import plugin="org.eclipse.jst.j2ee.web"/>
-      <import plugin="org.eclipse.wst.common.tests"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.jst.j2ee.tests"/>
-      <import plugin="org.eclipse.jst.j2ee"/>
-      <import plugin="org.eclipse.wst.server.core"/>
-      <import plugin="org.eclipse.wst.common.modulecore"/>
-      <import plugin="org.eclipse.wst.common.project.facet.core"/>
-      
-   </requires>
-
-</plugin>