[262285] AutomatedBVT intermitantly "does not finish"

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

diff --git a/tests/org.eclipse.jst.jee.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jee.tests/META-INF/MANIFEST.MF
index 61dbcd7..2b880d6 100644
--- a/tests/org.eclipse.jst.jee.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.jee.tests/META-INF/MANIFEST.MF
@@ -1,12 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: JEE Tests Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.jst.jee.tests;singleton:=true
 Bundle-Version: 1.0.000.qualifier
 Bundle-ClassPath: jee-tests.jar
 Bundle-Activator: org.eclipse.wtp.jee.headless.tests.plugin.HeadlessTestsPlugin
 Bundle-Localization: plugin
-Export-Package: org.eclipse.wtp.jee.headless.tests.appclient.operations,
+Export-Package: org.eclipse.jst.jee.tests.bvt,
+ org.eclipse.wtp.jee.headless.tests.appclient.operations,
  org.eclipse.wtp.jee.headless.tests.ejb.operations,
  org.eclipse.wtp.jee.headless.tests.plugin,
  org.eclipse.wtp.jee.headless.tests.web.operations
@@ -15,5 +16,5 @@
  org.eclipse.wst.server.core,
  org.eclipse.jem.util,
  org.eclipse.core.runtime
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

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

diff --git a/tests/org.eclipse.jst.jee.tests/build.properties b/tests/org.eclipse.jst.jee.tests/build.properties
index 3e78a96..4a01f5b 100644
--- a/tests/org.eclipse.jst.jee.tests/build.properties
+++ b/tests/org.eclipse.jst.jee.tests/build.properties
@@ -17,7 +17,8 @@
                about.html,\
                DefectTestData/,\
                META-INF/,\
-               bvt.properties
+               bvt.properties,\
+               plugin.properties
 src.includes = build.properties,\
                test.xml,\
                plugin.xml,\

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

diff --git a/tests/org.eclipse.jst.jee.tests/plugin.properties b/tests/org.eclipse.jst.jee.tests/plugin.properties
new file mode 100644
index 0000000..a8f2ce8
--- /dev/null
+++ b/tests/org.eclipse.jst.jee.tests/plugin.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2010 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+#Properties file for org.eclipse.jst.jee.tests
+Bundle-Name = JEE Tests Plug-in
\ No newline at end of file