[223737] Cleanup
diff --git a/tests/org.eclipse.jst.server.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.core.tests/META-INF/MANIFEST.MF
index b35b661..263aa37 100644
--- a/tests/org.eclipse.jst.server.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.server.core.tests/META-INF/MANIFEST.MF
@@ -16,5 +16,5 @@
  org.eclipse.jdt.launching,
  org.eclipse.wst.server.core,
  org.eclipse.jst.server.core
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/OrderedTestSuite.java b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/OrderedTestSuite.java
index a722814..78a2b58 100644
--- a/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/OrderedTestSuite.java
+++ b/tests/org.eclipse.jst.server.core.tests/src/org/eclipse/jst/server/core/tests/OrderedTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 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
@@ -20,6 +20,7 @@
 		super(theClass);
 	}
 
+	@SuppressWarnings("unchecked")
 	public Enumeration tests() {
 		Enumeration<TestCase> enum2 = super.tests();
 		
diff --git a/tests/org.eclipse.jst.server.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.ui.tests/META-INF/MANIFEST.MF
index 4c3006f..c4ed688 100644
--- a/tests/org.eclipse.jst.server.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.server.ui.tests/META-INF/MANIFEST.MF
@@ -12,5 +12,5 @@
  org.eclipse.ui,
  org.eclipse.jst.server.ui,
  org.eclipse.wst.common.project.facet.core
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/OrderedTestSuite.java b/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/OrderedTestSuite.java
index f8945b0..205db15 100644
--- a/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/OrderedTestSuite.java
+++ b/tests/org.eclipse.jst.server.ui.tests/src/org/eclipse/jst/server/ui/tests/OrderedTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 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
@@ -20,6 +20,7 @@
 		super(theClass);
 	}
 
+	@SuppressWarnings("unchecked")
 	public Enumeration tests() {
 		Enumeration<TestCase> enum2 = super.tests();
 		
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.internet.monitor.core.tests/META-INF/MANIFEST.MF
index db3f4d9..5f6d4e2 100644
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.internet.monitor.core.tests/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.junit;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.wst.internet.monitor.core
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/OrderedTestSuite.java b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/OrderedTestSuite.java
index 3a9b38c..dc6e8a1 100644
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/OrderedTestSuite.java
+++ b/tests/org.eclipse.wst.internet.monitor.core.tests/src/org/eclipse/wst/internet/monitor/core/tests/OrderedTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 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
@@ -20,6 +20,7 @@
 		super(theClass);
 	}
 
+	@SuppressWarnings("unchecked")
 	public Enumeration tests() {
 		Enumeration<TestCase> enum2 = super.tests();
 		
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.internet.monitor.ui.tests/META-INF/MANIFEST.MF
index 87d5318..5065821 100644
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.internet.monitor.ui.tests/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@
  org.eclipse.ui,
  org.eclipse.wst.internet.monitor.core,
  org.eclipse.wst.internet.monitor.ui
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/OrderedTestSuite.java b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/OrderedTestSuite.java
index b2791f0..3f4f65a 100644
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/OrderedTestSuite.java
+++ b/tests/org.eclipse.wst.internet.monitor.ui.tests/src/org/eclipse/wst/internet/monitor/ui/tests/OrderedTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 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
@@ -20,6 +20,7 @@
 		super(theClass);
 	}
 
+	@SuppressWarnings("unchecked")
 	public Enumeration tests() {
 		Enumeration<TestCase> enum2 = super.tests();
 		
diff --git a/tests/org.eclipse.wst.server.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.server.core.tests/META-INF/MANIFEST.MF
index b7bc113..98e1fb7 100644
--- a/tests/org.eclipse.wst.server.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.server.core.tests/META-INF/MANIFEST.MF
@@ -17,5 +17,5 @@
  org.eclipse.debug.core,
  org.junit;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.wst.server.core
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/OrderedTestSuite.java b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/OrderedTestSuite.java
index a420477..947290a 100644
--- a/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/OrderedTestSuite.java
+++ b/tests/org.eclipse.wst.server.core.tests/src/org/eclipse/wst/server/core/tests/OrderedTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 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
@@ -20,6 +20,7 @@
 		super(theClass);
 	}
 
+	@SuppressWarnings("unchecked")
 	public Enumeration tests() {
 		Enumeration<TestCase> enum2 = super.tests();
 		
diff --git a/tests/org.eclipse.wst.server.http.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.server.http.core.tests/META-INF/MANIFEST.MF
index de2017e..ce1cc1e 100644
--- a/tests/org.eclipse.wst.server.http.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.server.http.core.tests/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@
  org.junit;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.wst.server.core,
  org.eclipse.wst.server.http.core
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.wst.server.http.core.tests/src/org/eclipse/wst/server/http/core/tests/OrderedTestSuite.java b/tests/org.eclipse.wst.server.http.core.tests/src/org/eclipse/wst/server/http/core/tests/OrderedTestSuite.java
index c599110..87b5501 100644
--- a/tests/org.eclipse.wst.server.http.core.tests/src/org/eclipse/wst/server/http/core/tests/OrderedTestSuite.java
+++ b/tests/org.eclipse.wst.server.http.core.tests/src/org/eclipse/wst/server/http/core/tests/OrderedTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2008 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
@@ -20,6 +20,7 @@
 		super(theClass);
 	}
 
+	@SuppressWarnings("unchecked")
 	public Enumeration tests() {
 		Enumeration<TestCase> enum2 = super.tests();
 		
diff --git a/tests/org.eclipse.wst.server.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.server.tests.performance/META-INF/MANIFEST.MF
index fb37be9..2ed3335 100644
--- a/tests/org.eclipse.wst.server.tests.performance/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.server.tests.performance/META-INF/MANIFEST.MF
@@ -16,5 +16,5 @@
  org.eclipse.wst.server.core,
  org.eclipse.wst.server.ui,
  org.eclipse.wst.server.ui.tests
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.wst.server.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.server.ui.tests/META-INF/MANIFEST.MF
index 4e9dc0d..bc1239b 100644
--- a/tests/org.eclipse.wst.server.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.wst.server.ui.tests/META-INF/MANIFEST.MF
@@ -21,5 +21,5 @@
  org.eclipse.debug.ui,
  org.eclipse.wst.server.core,
  org.eclipse.wst.server.ui
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/OrderedTestSuite.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/OrderedTestSuite.java
index 679ed18..6b3c143 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/OrderedTestSuite.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/OrderedTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 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
@@ -20,6 +20,7 @@
 		super(theClass);
 	}
 
+	@SuppressWarnings("unchecked")
 	public Enumeration tests() {
 		Enumeration<TestCase> enum2 = super.tests();
 		
diff --git a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerTooltipTestCase.java b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerTooltipTestCase.java
index 71a0443..d7c33f4 100644
--- a/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerTooltipTestCase.java
+++ b/tests/org.eclipse.wst.server.ui.tests/src/org/eclipse/wst/server/ui/tests/ServerTooltipTestCase.java
@@ -8,7 +8,6 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
- 
 package org.eclipse.wst.server.ui.tests;
 
 import junit.framework.TestCase;
@@ -19,19 +18,17 @@
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.ui.IServerToolTip;
+import org.eclipse.wst.server.ui.internal.provisional.IServerToolTip;
 import org.eclipse.wst.server.ui.internal.ServerToolTip;
 
-public class ServerTooltipTestCase extends TestCase{
-	
+public class ServerTooltipTestCase extends TestCase {
 	public ServerTooltipTestCase() {
 		super();
 	}
 
 	protected static ServerToolTip tooltip;
 	protected static IServerToolTip exTooltip;
-	
-	
+
 	public void test00CreateExtensionToolTip(){
 		exTooltip = new IServerToolTip(){
 			public void createContent(Composite parent, IServer server) {
@@ -51,6 +48,5 @@
 	
 	public void test02DeactivateToolTip(){
 		tooltip.deactivate();
-	}
-	
-}
+	}	
+}
\ No newline at end of file