[182654] Separate preview server into own plugin
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JRERuntimeComponentProvider.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JRERuntimeComponentProvider.java
index 0b1b80e..af10bf0 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JRERuntimeComponentProvider.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JRERuntimeComponentProvider.java
@@ -78,10 +78,17 @@
 			
 			if (rcv != null) {
 				Map properties = new HashMap(3);
+				String name = "-";
 				if (vmInstallName != null)
-					properties.put("name", vmInstallName);
-				else
-					properties.put("name", "-");
+					name = vmInstallName;
+				properties.put("name", name);
+				
+				StringBuffer buf = new StringBuffer();
+				buf.append("JRE ");
+				buf.append(rcv.getVersionString());
+				buf.append(": ");
+				buf.append(name);
+				properties.put("type", buf.toString());
 				
 				if (vmInstall == null) {
 					// no classpath
diff --git a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JavaServerPlugin.java b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JavaServerPlugin.java
index 1678990..cf07924 100644
--- a/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JavaServerPlugin.java
+++ b/plugins/org.eclipse.jst.server.core/src/org/eclipse/jst/server/core/internal/JavaServerPlugin.java
@@ -47,12 +47,6 @@
 	//	cached copy of all runtime classpath providers
 	private static List runtimeClasspathProviders;
 
-	//	cached copy of all runtime component providers
-	private static List runtimeComponentProviders;
-
-	//	cached copy of all runtime facet mappings
-	private static List runtimeFacetMappings;
-
 	// cached copy of all server profilers
 	private static List serverProfilers;
 	
@@ -191,10 +185,6 @@
 		getInstance().getLog().log(status);
 	}
 
-	/*public static void logError(String msg) {
-		log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, null));
-	}*/
-
 	public static void logWarning(String msg) {
 		log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.OK, msg, null));
 	}
@@ -296,102 +286,8 @@
 		
 		Trace.trace(Trace.CONFIG, "-<- Done loading .runtimeClasspathProviders extension point -<-");
 	}
-	
-	/**
-	 * Returns an array of all known runtime classpath provider instances.
-	 * <p>
-	 * A new array is returned on each call, so clients may store or modify the result.
-	 * </p>
-	 * 
-	 * @return a possibly-empty array of runtime classpath provider instances
-	 *    {@link RuntimeClasspathProviderWrapper}
-	 */
-	public static RuntimeFacetMapping[] getRuntimeFacetMapping() {
-		if (runtimeFacetMappings == null)
-			loadRuntimeFacetMapping();
-		
-		RuntimeFacetMapping[] rfm = new RuntimeFacetMapping[runtimeFacetMappings.size()];
-		runtimeFacetMappings.toArray(rfm);
-		return rfm;
-	}
 
 	/**
-	 * Returns the runtime component provider that supports the given runtime type, or <code>null</code>
-	 * if none. This convenience method searches the list of known runtime
-	 * component providers for the one with a matching runtime type.
-	 * The runtimeType may not be null.
-	 *
-	 * @param runtimeType a runtime type
-	 * @return the runtime component provider instance, or <code>null</code> if
-	 *   there is no runtime component provider with the given id
-	 */
-	public static RuntimeComponentProviderWrapper findRuntimeComponentProvider(IRuntimeType runtimeType) {
-		if (runtimeType == null)
-			throw new IllegalArgumentException();
-
-		if (runtimeComponentProviders == null)
-			loadRuntimeComponentProviders();
-		
-		Iterator iterator = runtimeComponentProviders.iterator();
-		while (iterator.hasNext()) {
-			RuntimeComponentProviderWrapper runtimeComponentProvider = (RuntimeComponentProviderWrapper) iterator.next();
-			if (runtimeComponentProvider.supportsRuntimeType(runtimeType))
-				return runtimeComponentProvider;
-		}
-		return null;
-	}
-
-	/**
-	 * Load the runtime component providers.
-	 */
-	private static synchronized void loadRuntimeComponentProviders() {
-		if (runtimeComponentProviders != null)
-			return;
-		Trace.trace(Trace.CONFIG, "->- Loading .runtimeComponentProviders extension point ->-");
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IConfigurationElement[] cf = registry.getConfigurationElementsFor(JavaServerPlugin.PLUGIN_ID, "internalRuntimeComponentProviders");
-		
-		int size = cf.length;
-		List list = new ArrayList(size);
-		for (int i = 0; i < size; i++) {
-			try {
-				list.add(new RuntimeComponentProviderWrapper(cf[i]));
-				Trace.trace(Trace.CONFIG, "  Loaded runtimeComponentProviders: " + cf[i].getAttribute("id"));
-			} catch (Throwable t) {
-				Trace.trace(Trace.SEVERE, "  Could not load runtimeComponentProvider: " + cf[i].getAttribute("id"), t);
-			}
-		}
-		runtimeComponentProviders = list;
-		
-		Trace.trace(Trace.CONFIG, "-<- Done loading .runtimeComponentProviders extension point -<-");
-	}
-
-	/**
-	 * Load the runtime facet mappings.
-	 */
-	private static synchronized void loadRuntimeFacetMapping() {
-		if (runtimeFacetMappings != null)
-			return;
-		Trace.trace(Trace.CONFIG, "->- Loading .runtimeFacetMapping extension point ->-");
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IConfigurationElement[] cf = registry.getConfigurationElementsFor(JavaServerPlugin.PLUGIN_ID, "runtimeFacetMappings");
-
-		int size = cf.length;
-		List list = new ArrayList(size);
-		for (int i = 0; i < size; i++) {
-			try {
-				list.add(new RuntimeFacetMapping(cf[i]));
-				Trace.trace(Trace.CONFIG, "  Loaded runtimeFacetMapping: " + cf[i].getAttribute("runtimeTypeId"));
-			} catch (Throwable t) {
-				Trace.trace(Trace.SEVERE, "  Could not load runtimeFacetMapping: " + cf[i].getAttribute("id"), t);
-			}
-		}
-		runtimeFacetMappings = list;
-		
-		Trace.trace(Trace.CONFIG, "-<- Done loading .runtimeFacetMapping extension point -<-");
-	}
-	
-	/**
 	 * Returns an array of all known server profiler instances.
 	 * <p>
 	 * A new array is returned on each call, so clients may store or modify the result.
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF
index 247151a..e19f60b 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.preview.adapter/META-INF/MANIFEST.MF
@@ -3,18 +3,18 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.server.preview.adapter;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.jst.server.preview.internal.PreviewPlugin
+Bundle-Activator: org.eclipse.jst.server.preview.adapter.internal.PreviewPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.server.preview.internal;x-friends:="org.eclipse.jst.server.ui"
+Export-Package: org.eclipse.jst.server.preview.adapter.internal;x-friends:="org.eclipse.jst.server.ui"
 Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.server.core;bundle-version="[1.0.103,1.1.0)",
  org.eclipse.jst.server.core;bundle-version="[1.0.204,1.1.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.1,2.0.0)",
  org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.server.ui;bundle-version="[1.0.103,1.1.0)",
  org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.3.0)",
+ org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.3.0)",
  org.eclipse.jdt.debug.ui;bundle-version="[3.2.100,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/plugin.xml b/plugins/org.eclipse.jst.server.preview.adapter/plugin.xml
index fdbd6e0..68102c8 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/plugin.xml
+++ b/plugins/org.eclipse.jst.server.preview.adapter/plugin.xml
@@ -7,7 +7,7 @@
        id="org.eclipse.jst.server.preview.runtime"
        name="%previewRuntimeTypeName"
        description="%previewRuntimeTypeDescription"
-       class="org.eclipse.jst.server.preview.internal.core.PreviewRuntime">
+       class="org.eclipse.jst.server.preview.adapter.internal.core.PreviewRuntime">
        <moduleType
          types="wst.web"
          versions="1.0"/>
@@ -30,17 +30,17 @@
        initialState="stopped"
        hasConfiguration="false"
        launchModes="run,debug,profile"
-       launchConfigId="org.eclipse.jst.server.core.preview.launchConfigurationType"
+       launchConfigId="org.eclipse.jst.server.preview.launchConfigurationType"
        runtimeTypeId="org.eclipse.jst.server.preview.runtime"
-       class="org.eclipse.jst.server.preview.internal.core.PreviewServer"
-       behaviourClass="org.eclipse.jst.server.preview.internal.core.PreviewServerBehaviour"/>
+       class="org.eclipse.jst.server.preview.adapter.internal.core.PreviewServer"
+       behaviourClass="org.eclipse.jst.server.preview.adapter.internal.core.PreviewServerBehaviour"/>
   </extension>
- 
+
   <extension point="org.eclipse.jst.server.core.runtimeClasspathProviders">
     <runtimeClasspathProvider
       id="org.eclipse.jst.server.preview.runtimeTarget"
       runtimeTypeIds="org.eclipse.jst.server.preview.runtime"
-      class="org.eclipse.jst.server.preview.internal.core.PreviewRuntimeClasspathProvider"/>
+      class="org.eclipse.jst.server.preview.adapter.internal.core.PreviewRuntimeClasspathProvider"/>
   </extension>
 
   <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
@@ -86,14 +86,14 @@
   <extension point="org.eclipse.debug.core.sourcePathComputers">
      <sourcePathComputer
         id="org.eclipse.jst.server.preview.sourcePathComputer"
-        class="org.eclipse.jst.server.preview.internal.core.PreviewSourcePathComputerDelegate"/>
+        class="org.eclipse.jst.server.preview.adapter.internal.core.PreviewSourcePathComputerDelegate"/>
   </extension>
 
   <extension point="org.eclipse.debug.core.launchConfigurationTypes">
      <launchConfigurationType
         id="org.eclipse.jst.server.preview.launchConfigurationType"
         name="%previewLaunchConfigurationType"
-        delegate="org.eclipse.jst.server.preview.internal.core.PreviewLaunchConfigurationDelegate"
+        delegate="org.eclipse.jst.server.preview.adapter.internal.core.PreviewLaunchConfigurationDelegate"
         modes="run,debug,profile"
         sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
         sourcePathComputerId="org.eclipse.jst.server.preview.sourcePathComputer"/>
@@ -102,7 +102,7 @@
   <extension point="org.eclipse.wst.server.core.launchableAdapters">
     <launchableAdapter
       id="org.eclipse.jst.server.preview"
-      class="org.eclipse.jst.server.preview.internal.core.PreviewLaunchableAdapterDelegate"/>
+      class="org.eclipse.jst.server.preview.adapter.internal.core.PreviewLaunchableAdapterDelegate"/>
   </extension>
 
 <!--
@@ -129,11 +129,11 @@
   <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
     <adapter>
       <runtime-component id="org.eclipse.jst.server.preview.runtime"/>
-      <factory class="org.eclipse.wst.server.ui.internal.facets.RuntimeLabelProvider$Factory"/>
+      <factory class="org.eclipse.wst.server.ui.FacetRuntimeComponentLabelProvider"/>
       <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
     </adapter>
   </extension>
-  
+
   <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
     <launchConfigurationTypeImage
       id="org.eclipse.jst.server.preview.launchConfigurationTypeImage"
@@ -146,7 +146,7 @@
     <launchConfigurationTabGroup
       id="org.eclipse.jst.server.preview.launchConfigurationTabGroup"
       type="org.eclipse.jst.server.preview.launchConfigurationType"
-      class="org.eclipse.jst.server.preview.internal.ui.PreviewLaunchConfigurationTabGroup">
+      class="org.eclipse.jst.server.preview.adapter.internal.ui.PreviewLaunchConfigurationTabGroup">
     </launchConfigurationTabGroup>
   </extension>
 </plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/IMemento.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/IMemento.java
similarity index 98%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/IMemento.java
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/IMemento.java
index b4d862b..443a710 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/IMemento.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/IMemento.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.jst.server.preview.internal;
+package org.eclipse.jst.server.preview.adapter.internal;
 
 import java.util.List;
 /**
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/Messages.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Messages.java
similarity index 96%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/Messages.java
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Messages.java
index 29b071a..300a8f4 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/Messages.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Messages.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.jst.server.preview.internal;
+package org.eclipse.jst.server.preview.adapter.internal;
 
 import org.eclipse.osgi.util.NLS;
 /**
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/Messages.properties b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Messages.properties
similarity index 100%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/Messages.properties
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Messages.properties
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/PreviewPlugin.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/PreviewPlugin.java
similarity index 95%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/PreviewPlugin.java
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/PreviewPlugin.java
index d374fa9..6020f2c 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/PreviewPlugin.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/PreviewPlugin.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.jst.server.preview.internal;
+package org.eclipse.jst.server.preview.adapter.internal;
 
 import org.eclipse.core.runtime.*;
 /**
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/ProgressUtil.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/ProgressUtil.java
similarity index 97%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/ProgressUtil.java
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/ProgressUtil.java
index 1dea57b..e42adf2 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/ProgressUtil.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/ProgressUtil.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.jst.server.preview.internal;
+package org.eclipse.jst.server.preview.adapter.internal;
 
 import org.eclipse.core.runtime.*;
 /**
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/Trace.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Trace.java
similarity index 96%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/Trace.java
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Trace.java
index 96ea9b7..bf221ca 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/Trace.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/Trace.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.jst.server.preview.internal;
+package org.eclipse.jst.server.preview.adapter.internal;
 /**
  * Helper class to route trace output.
  */
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/XMLMemento.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/XMLMemento.java
similarity index 99%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/XMLMemento.java
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/XMLMemento.java
index dfbcd59..3e0a8e9 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/XMLMemento.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/XMLMemento.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.jst.server.preview.internal;
+package org.eclipse.jst.server.preview.adapter.internal;
 
 import java.io.*;
 import java.util.*;
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PingThread.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PingThread.java
similarity index 95%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PingThread.java
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PingThread.java
index 76b719c..829596b 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PingThread.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PingThread.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.jst.server.preview.internal.core;
+package org.eclipse.jst.server.preview.adapter.internal.core;
 
 import java.io.FileNotFoundException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 
-import org.eclipse.jst.server.preview.internal.Trace;
+import org.eclipse.jst.server.preview.adapter.internal.Trace;
 import org.eclipse.wst.server.core.IServer;
 /**
  * Thread used to ping server to test when it is started.
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewLaunchConfigurationDelegate.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
similarity index 95%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewLaunchConfigurationDelegate.java
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
index 583a8d5..8e368c9 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.jst.server.preview.internal.core;
+package org.eclipse.jst.server.preview.adapter.internal.core;
 
 import java.io.File;
 import java.util.Map;
@@ -24,8 +24,8 @@
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.jdt.launching.*;
 import org.eclipse.jst.server.core.ServerProfilerDelegate;
-import org.eclipse.jst.server.preview.internal.PreviewPlugin;
-import org.eclipse.jst.server.preview.internal.Trace;
+import org.eclipse.jst.server.preview.adapter.internal.PreviewPlugin;
+import org.eclipse.jst.server.preview.adapter.internal.Trace;
 
 import org.eclipse.wst.server.core.IServer;
 import org.eclipse.wst.server.core.ServerUtil;
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewLaunchableAdapterDelegate.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchableAdapterDelegate.java
similarity index 93%
copy from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewLaunchableAdapterDelegate.java
copy to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchableAdapterDelegate.java
index be5980b..c074d8c 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewLaunchableAdapterDelegate.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewLaunchableAdapterDelegate.java
@@ -8,11 +8,12 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.server.preview.internal.core;
+package org.eclipse.jst.server.preview.adapter.internal.core;
 
 import java.net.URL;
 
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jst.server.preview.adapter.internal.Trace;
 import org.eclipse.wst.server.core.IModuleArtifact;
 import org.eclipse.wst.server.core.IServer;
 import org.eclipse.wst.server.core.model.LaunchableAdapterDelegate;
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewRuntime.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewRuntime.java
similarity index 95%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewRuntime.java
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewRuntime.java
index d873ac3..8ec5445 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewRuntime.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewRuntime.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.jst.server.preview.internal.core;
+package org.eclipse.jst.server.preview.adapter.internal.core;
 
 import java.io.IOException;
 import java.net.URL;
@@ -18,8 +18,8 @@
 import org.eclipse.jdt.launching.IVMInstallType;
 import org.eclipse.jdt.launching.JavaRuntime;
 import org.eclipse.jst.server.core.IJavaRuntime;
-import org.eclipse.jst.server.preview.internal.Messages;
-import org.eclipse.jst.server.preview.internal.PreviewPlugin;
+import org.eclipse.jst.server.preview.adapter.internal.Messages;
+import org.eclipse.jst.server.preview.adapter.internal.PreviewPlugin;
 import org.eclipse.wst.server.core.model.RuntimeDelegate;
 import org.osgi.framework.Bundle;
 /**
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewRuntimeClasspathProvider.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewRuntimeClasspathProvider.java
similarity index 96%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewRuntimeClasspathProvider.java
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewRuntimeClasspathProvider.java
index 7c3caf1..6adacad 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewRuntimeClasspathProvider.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewRuntimeClasspathProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.jst.server.preview.internal.core;
+package org.eclipse.jst.server.preview.adapter.internal.core;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewServer.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewServer.java
similarity index 94%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewServer.java
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewServer.java
index 1956d5c..2da1b7d 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewServer.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewServer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.jst.server.preview.internal.core;
+package org.eclipse.jst.server.preview.adapter.internal.core;
 
 import java.net.URL;
 
@@ -18,9 +18,9 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jst.server.core.IWebModule;
-import org.eclipse.jst.server.preview.internal.Messages;
-import org.eclipse.jst.server.preview.internal.PreviewPlugin;
-import org.eclipse.jst.server.preview.internal.Trace;
+import org.eclipse.jst.server.preview.adapter.internal.Messages;
+import org.eclipse.jst.server.preview.adapter.internal.PreviewPlugin;
+import org.eclipse.jst.server.preview.adapter.internal.Trace;
 import org.eclipse.wst.server.core.IModule;
 import org.eclipse.wst.server.core.IRuntime;
 import org.eclipse.wst.server.core.IRuntimeType;
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewServerBehaviour.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewServerBehaviour.java
similarity index 95%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewServerBehaviour.java
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewServerBehaviour.java
index 7d1248e..c8349e1 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewServerBehaviour.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewServerBehaviour.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.jst.server.preview.internal.core;
+package org.eclipse.jst.server.preview.adapter.internal.core;
 
 import java.io.IOException;
 
@@ -25,12 +25,12 @@
 import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.jst.server.core.IWebModule;
-import org.eclipse.jst.server.preview.internal.IMemento;
-import org.eclipse.jst.server.preview.internal.Messages;
-import org.eclipse.jst.server.preview.internal.PreviewPlugin;
-import org.eclipse.jst.server.preview.internal.ProgressUtil;
-import org.eclipse.jst.server.preview.internal.Trace;
-import org.eclipse.jst.server.preview.internal.XMLMemento;
+import org.eclipse.jst.server.preview.adapter.internal.IMemento;
+import org.eclipse.jst.server.preview.adapter.internal.Messages;
+import org.eclipse.jst.server.preview.adapter.internal.PreviewPlugin;
+import org.eclipse.jst.server.preview.adapter.internal.ProgressUtil;
+import org.eclipse.jst.server.preview.adapter.internal.Trace;
+import org.eclipse.jst.server.preview.adapter.internal.XMLMemento;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.wst.server.core.IModule;
 import org.eclipse.wst.server.core.IServer;
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewSourcePathComputerDelegate.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewSourcePathComputerDelegate.java
similarity index 98%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewSourcePathComputerDelegate.java
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewSourcePathComputerDelegate.java
index 09c8c44..b2b760d 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewSourcePathComputerDelegate.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewSourcePathComputerDelegate.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    IBM Corporation - Initial API and implementation
  **********************************************************************/
-package org.eclipse.jst.server.preview.internal.core;
+package org.eclipse.jst.server.preview.adapter.internal.core;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewStartup.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewStartup.java
similarity index 95%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewStartup.java
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewStartup.java
index 9860f9f..2f9970c 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewStartup.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/core/PreviewStartup.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.jst.server.preview.internal.core;
+package org.eclipse.jst.server.preview.adapter.internal.core;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.server.preview.internal.Trace;
+import org.eclipse.jst.server.preview.adapter.internal.Trace;
 import org.eclipse.wst.server.core.IRuntime;
 import org.eclipse.wst.server.core.IRuntimeType;
 import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/ui/PreviewLaunchConfigurationTabGroup.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/ui/PreviewLaunchConfigurationTabGroup.java
similarity index 96%
rename from plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/ui/PreviewLaunchConfigurationTabGroup.java
rename to plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/ui/PreviewLaunchConfigurationTabGroup.java
index bf1ca4e..bf3730d 100644
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/ui/PreviewLaunchConfigurationTabGroup.java
+++ b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/adapter/internal/ui/PreviewLaunchConfigurationTabGroup.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.jst.server.preview.internal.ui;
+package org.eclipse.jst.server.preview.adapter.internal.ui;
 
 import org.eclipse.debug.ui.*;
 import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
diff --git a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewLaunchableAdapterDelegate.java b/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewLaunchableAdapterDelegate.java
deleted file mode 100644
index 6da4b71..0000000
--- a/plugins/org.eclipse.jst.server.preview.adapter/src/org/eclipse/jst/server/preview/internal/core/PreviewLaunchableAdapterDelegate.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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
- *******************************************************************************/
-package org.eclipse.jst.server.preview.internal.core;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.server.preview.internal.Trace;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.model.LaunchableAdapterDelegate;
-import org.eclipse.wst.server.core.util.HttpLaunchable;
-import org.eclipse.wst.server.core.util.WebResource;
-
-public class PreviewLaunchableAdapterDelegate extends LaunchableAdapterDelegate {
-	/*
-	 * @see LaunchableAdapterDelegate#getLaunchable(IServer, IModuleArtifact)
-	 */
-	public Object getLaunchable(IServer server, IModuleArtifact moduleArtifact) throws CoreException {
-		if (server == null || moduleArtifact == null)
-			return null;
-		
-		PreviewServer server2 = (PreviewServer) server.loadAdapter(PreviewServer.class, null);
-		if (server2 == null)
-			return null;
-		
-		try {
-			URL url = server2.getModuleRootURL(moduleArtifact.getModule());
-			
-			if (moduleArtifact instanceof WebResource) {
-				WebResource resource = (WebResource) moduleArtifact;
-				String path = resource.getPath().toString();
-				
-				if (path.startsWith("/"))
-					path = path.substring(1);
-				url = new URL(url.toExternalForm() + "/" + path);
-			}
-			return new HttpLaunchable(url);
-		} catch (Exception e) {
-			Trace.trace(Trace.SEVERE, "Error in launchable adapter", e);
-		}
-		
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/plugin.xml b/plugins/org.eclipse.jst.server.ui/plugin.xml
index e8f5f28..fbf82c5 100644
--- a/plugins/org.eclipse.jst.server.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.server.ui/plugin.xml
@@ -62,7 +62,7 @@
   <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
     <adapter>
       <runtime-component id="standard.jre"/>
-      <factory class="org.eclipse.jst.server.ui.internal.StandardJreLabelProvider$Factory"/>
+      <factory class="org.eclipse.wst.server.ui.FacetRuntimeComponentLabelProvider"/>
       <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
     </adapter>
   </extension>
@@ -85,7 +85,7 @@
   <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
     <adapter>
       <runtime-component id="org.eclipse.jst.server.core.runtimeType"/>
-      <factory class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory"/>
+      <factory class="org.eclipse.wst.server.ui.FacetRuntimeComponentLabelProvider"/>
       <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
     </adapter>
   </extension>
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/FacetMappingUtil.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/FacetMappingUtil.java
index 25a817e..04efa42 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/FacetMappingUtil.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/FacetMappingUtil.java
@@ -15,7 +15,7 @@
 import java.util.List;
 
 import org.eclipse.core.runtime.*;
-import org.eclipse.wst.server.core.IRuntimeType;
+import org.eclipse.wst.server.core.IRuntime;
 import org.eclipse.wst.server.core.internal.ServerPlugin;
 import org.eclipse.wst.server.core.internal.Trace;
 /**
@@ -47,29 +47,29 @@
 	}
 
 	/**
-	 * Returns the runtime component provider that supports the given runtime type, or <code>null</code>
-	 * if none. This convenience method searches the list of known runtime
-	 * component providers for the one with a matching runtime type.
+	 * Uses the runtime component provider(s) that supports the given runtime to add
+	 * additional runtime components to the list.
 	 * The runtimeType may not be null.
 	 *
-	 * @param runtimeType a runtime type
-	 * @return the runtime component provider instance, or <code>null</code> if
-	 *   there is no runtime component provider with the given id
+	 * @param runtime a runtime
+	 * @param components the existing list of components
 	 */
-	public static RuntimeComponentProviderWrapper findRuntimeFacetComponentProvider(IRuntimeType runtimeType) {
-		if (runtimeType == null)
+	public static void addFacetRuntimeComponents(IRuntime runtime, List components) {
+		if (runtime == null || runtime.getRuntimeType() == null)
 			throw new IllegalArgumentException();
-
+		
 		if (runtimeComponentProviders == null)
 			loadRuntimeComponentProviders();
 		
 		Iterator iterator = runtimeComponentProviders.iterator();
 		while (iterator.hasNext()) {
 			RuntimeComponentProviderWrapper runtimeComponentProvider = (RuntimeComponentProviderWrapper) iterator.next();
-			if (runtimeComponentProvider.supportsRuntimeType(runtimeType))
-				return runtimeComponentProvider;
+			if (runtimeComponentProvider.supportsRuntimeType(runtime.getRuntimeType())) {
+				List list = runtimeComponentProvider.getComponents(runtime);
+				if (list != null)
+					components.addAll(list);
+			}
 		}
-		return null;
 	}
 
 	/**
@@ -82,6 +82,7 @@
 		IExtensionRegistry registry = Platform.getExtensionRegistry();
 		IConfigurationElement[] cf = registry.getConfigurationElementsFor(ServerPlugin.PLUGIN_ID, "runtimeFacetComponentProviders");
 		
+		// load new wst extension point
 		int size = cf.length;
 		List list = new ArrayList(size);
 		for (int i = 0; i < size; i++) {
@@ -92,6 +93,19 @@
 				Trace.trace(Trace.SEVERE, "  Could not load runtimeFacetComponentProvider: " + cf[i].getAttribute("id"), t);
 			}
 		}
+		
+		// load old jst extension point
+		cf = registry.getConfigurationElementsFor("org.eclipse.jst.server.core.internalRuntimeComponentProviders");
+		
+		size = cf.length;
+		for (int i = 0; i < size; i++) {
+			try {
+				list.add(new RuntimeComponentProviderWrapper(cf[i]));
+				Trace.trace(Trace.CONFIG, "  Loaded runtimeFacetComponentProvider: " + cf[i].getAttribute("id"));
+			} catch (Throwable t) {
+				Trace.trace(Trace.SEVERE, "  Could not load runtimeFacetComponentProvider: " + cf[i].getAttribute("id"), t);
+			}
+		}
 		runtimeComponentProviders = list;
 		
 		Trace.trace(Trace.CONFIG, "-<- Done loading .runtimeFacetComponentProviders extension point -<-");
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/RuntimeBridge.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/RuntimeBridge.java
index c299f5b..ee9db90 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/RuntimeBridge.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/facets/RuntimeBridge.java
@@ -138,12 +138,7 @@
 				}
 			}
 			
-			RuntimeComponentProviderWrapper componentProvider = FacetMappingUtil.findRuntimeFacetComponentProvider(runtime.getRuntimeType());
-			if (componentProvider != null) {
-				List list = componentProvider.getComponents(runtime);
-				if (list != null)
-					components.addAll(list);
-			}
+			FacetMappingUtil.addFacetRuntimeComponents(runtime, components);
 			
 			return components;
 		}
diff --git a/plugins/org.eclipse.wst.server.http.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.http.ui/META-INF/MANIFEST.MF
index cd9c4c3..420806e 100644
--- a/plugins/org.eclipse.wst.server.http.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.http.ui/META-INF/MANIFEST.MF
@@ -11,7 +11,6 @@
  org.eclipse.wst.server.core;bundle-version="[1.0.204,2.0.0)",
  org.eclipse.wst.server.ui;bundle-version="[1.0.103,1.1.0)",
  org.eclipse.wst.server.http.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.wst.common.project.facet.ui;bundle-version="[1.2.0,2.0.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.wst.server.http.ui/plugin.xml b/plugins/org.eclipse.wst.server.http.ui/plugin.xml
index b28f4ac..6542f29 100644
--- a/plugins/org.eclipse.wst.server.http.ui/plugin.xml
+++ b/plugins/org.eclipse.wst.server.http.ui/plugin.xml
@@ -7,7 +7,7 @@
          icon="icons/obj16/server.gif"
          typeIds="org.eclipse.wst.server.http.runtime,org.eclipse.wst.server.http.server"/>
    </extension>
- 
+
    <extension point="org.eclipse.wst.common.project.facet.ui.images">
      <image runtime-component-type="org.eclipse.wst.server.http.runtime"
        path="icons/obj16/server.gif"/>
@@ -16,8 +16,7 @@
    <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
      <adapter>
        <runtime-component id="org.eclipse.wst.server.http.runtime"/>
-       <!--<factory class="org.eclipse.wst.server.http.ui.internal.RuntimeLabelProvider$Factory"/>-->
-       <factory class="org.eclipse.wst.server.ui.internal.facets.RuntimeLabelProvider$Factory"/>
+       <factory class="org.eclipse.wst.server.ui.FacetRuntimeComponentLabelProvider"/>
        <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
      </adapter>
    </extension>
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.preview.adapter/META-INF/MANIFEST.MF
index 5f2f694..408c35d 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.preview.adapter/META-INF/MANIFEST.MF
@@ -3,12 +3,10 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.server.preview.adapter;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.server.preview.internal.core.PreviewPlugin
+Bundle-Activator: org.eclipse.wst.server.preview.adapter.internal.core.PreviewPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.204,2.0.0)",
- org.eclipse.debug.core;bundle-version="[3.3.0,4.0.0)",
+Require-Bundle: org.eclipse.wst.server.core;bundle-version="[1.0.204,2.0.0)",
  org.eclipse.wst.server.ui;bundle-version="[1.0.103,1.1.0)",
  org.eclipse.debug.ui;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.wst.common.project.facet.ui;bundle-version="[1.2.0,2.0.0)"
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/plugin.xml b/plugins/org.eclipse.wst.server.preview.adapter/plugin.xml
index e07a3c0..1b3b898 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/plugin.xml
+++ b/plugins/org.eclipse.wst.server.preview.adapter/plugin.xml
@@ -8,7 +8,7 @@
        description="%previewRuntimeTypeDescription"
        facetRuntimeComponent="org.eclipse.wst.server.preview.runtime"
 	    facetRuntimeVersion="1.0"
-       class="org.eclipse.wst.server.preview.internal.core.PreviewRuntime">
+       class="org.eclipse.wst.server.preview.adapter.internal.core.PreviewRuntime">
        <moduleType
          types="wst.web"
          versions="1.0"/>
@@ -27,8 +27,8 @@
        launchModes="run,debug,profile"
        launchConfigId="org.eclipse.wst.server.preview.launchConfigurationType"
        runtimeTypeId="org.eclipse.wst.server.preview.runtime"
-       class="org.eclipse.wst.server.preview.internal.core.PreviewServer"
-       behaviourClass="org.eclipse.wst.server.preview.internal.core.PreviewServerBehaviour"/>
+       class="org.eclipse.wst.server.preview.adapter.internal.core.PreviewServer"
+       behaviourClass="org.eclipse.wst.server.preview.adapter.internal.core.PreviewServerBehaviour"/>
   </extension>
 
   <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
@@ -53,14 +53,14 @@
      <launchConfigurationType
         id="org.eclipse.wst.server.preview.launchConfigurationType"
         name="%previewLaunchConfigurationType"
-        delegate="org.eclipse.wst.server.preview.internal.core.PreviewLaunchConfigurationDelegate"
+        delegate="org.eclipse.wst.server.preview.adapter.internal.core.PreviewLaunchConfigurationDelegate"
         modes="run,debug,profile"/>
   </extension>
 
   <extension point="org.eclipse.wst.server.core.launchableAdapters">
     <launchableAdapter
       id="org.eclipse.wst.server.preview"
-      class="org.eclipse.wst.server.preview.internal.core.PreviewLaunchableAdapterDelegate"/>
+      class="org.eclipse.wst.server.preview.adapter.internal.core.PreviewLaunchableAdapterDelegate"/>
   </extension>
 
 
@@ -79,7 +79,7 @@
   <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
     <adapter>
       <runtime-component id="org.eclipse.wst.server.preview.runtime"/>
-      <factory class="org.eclipse.wst.server.ui.internal.facets.RuntimeLabelProvider$Factory"/>
+      <factory class="org.eclipse.wst.server.ui.FacetRuntimeComponentLabelProvider"/>
       <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
     </adapter>
   </extension>
@@ -96,7 +96,7 @@
     <launchConfigurationTabGroup
       id="org.eclipse.wst.server.preview.launchConfigurationTabGroup"
       type="org.eclipse.wst.server.core.preview.launchConfigurationType"
-      class="org.eclipse.wst.server.preview.internal.ui.PreviewLaunchConfigurationTabGroup">
+      class="org.eclipse.wst.server.preview.adapter.internal.ui.PreviewLaunchConfigurationTabGroup">
     </launchConfigurationTabGroup>
   </extension>
 </plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/IMemento.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/IMemento.java
similarity index 98%
rename from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/IMemento.java
rename to plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/IMemento.java
index 4049dac..0eae79b 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/IMemento.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/IMemento.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  **********************************************************************/
-package org.eclipse.wst.server.preview.internal.core;
+package org.eclipse.wst.server.preview.adapter.internal.core;
 
 import java.util.List;
 /**
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/Messages.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/Messages.java
similarity index 83%
rename from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/Messages.java
rename to plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/Messages.java
index cc068bd..02386ce 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/Messages.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/Messages.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.server.preview.internal.core;
+package org.eclipse.wst.server.preview.adapter.internal.core;
 
 import org.eclipse.osgi.util.NLS;
 /**
@@ -22,6 +22,6 @@
 	public static String errorPublish;
 
 	static {
-		NLS.initializeMessages(PreviewPlugin.PLUGIN_ID + ".internal.Messages", Messages.class);
+		NLS.initializeMessages(PreviewPlugin.PLUGIN_ID + ".internal.core.Messages", Messages.class);
 	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/Messages.properties b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/Messages.properties
similarity index 100%
rename from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/Messages.properties
rename to plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/Messages.properties
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PingThread.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PingThread.java
similarity index 97%
rename from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PingThread.java
rename to plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PingThread.java
index fec3693..2a0aeef 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PingThread.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PingThread.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.server.preview.internal.core;
+package org.eclipse.wst.server.preview.adapter.internal.core;
 
 import java.io.FileNotFoundException;
 import java.net.HttpURLConnection;
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewLaunchConfigurationDelegate.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
similarity index 98%
rename from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewLaunchConfigurationDelegate.java
rename to plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
index b56c41d..5006faa 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewLaunchConfigurationDelegate.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchConfigurationDelegate.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.server.preview.internal.core;
+package org.eclipse.wst.server.preview.adapter.internal.core;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewLaunchableAdapterDelegate.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchableAdapterDelegate.java
similarity index 96%
rename from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewLaunchableAdapterDelegate.java
rename to plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchableAdapterDelegate.java
index be5980b..a01d9da 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewLaunchableAdapterDelegate.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewLaunchableAdapterDelegate.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.server.preview.internal.core;
+package org.eclipse.wst.server.preview.adapter.internal.core;
 
 import java.net.URL;
 
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewPlugin.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewPlugin.java
similarity index 96%
rename from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewPlugin.java
rename to plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewPlugin.java
index d0a3915..034ac8e 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewPlugin.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewPlugin.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.server.preview.internal.core;
+package org.eclipse.wst.server.preview.adapter.internal.core;
 
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewRuntime.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewRuntime.java
similarity index 97%
rename from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewRuntime.java
rename to plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewRuntime.java
index ab2c90b..ba0f6f7 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewRuntime.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewRuntime.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.server.preview.internal.core;
+package org.eclipse.wst.server.preview.adapter.internal.core;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewServer.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewServer.java
similarity index 98%
rename from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewServer.java
rename to plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewServer.java
index 7d613bd..b4b892c 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewServer.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewServer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.server.preview.internal.core;
+package org.eclipse.wst.server.preview.adapter.internal.core;
 
 import java.net.URL;
 
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewServerBehaviour.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewServerBehaviour.java
similarity index 99%
rename from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewServerBehaviour.java
rename to plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewServerBehaviour.java
index 7d87bb3..3d63fdd 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewServerBehaviour.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewServerBehaviour.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.server.preview.internal.core;
+package org.eclipse.wst.server.preview.adapter.internal.core;
 
 import java.io.IOException;
 
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewStartup.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewStartup.java
similarity index 97%
rename from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewStartup.java
rename to plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewStartup.java
index f200c69..9c5d770 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/PreviewStartup.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/PreviewStartup.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.server.preview.internal.core;
+package org.eclipse.wst.server.preview.adapter.internal.core;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.wst.server.core.IRuntime;
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/ProgressUtil.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/ProgressUtil.java
similarity index 96%
rename from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/ProgressUtil.java
rename to plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/ProgressUtil.java
index fc12e36..3a3c51e 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/ProgressUtil.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/ProgressUtil.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.server.preview.internal.core;
+package org.eclipse.wst.server.preview.adapter.internal.core;
 
 import org.eclipse.core.runtime.*;
 /**
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/Trace.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/Trace.java
similarity index 97%
rename from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/Trace.java
rename to plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/Trace.java
index c1672cd..30e71db 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/Trace.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/Trace.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.server.preview.internal.core;
+package org.eclipse.wst.server.preview.adapter.internal.core;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/XMLMemento.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/XMLMemento.java
similarity index 99%
rename from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/XMLMemento.java
rename to plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/XMLMemento.java
index 08a14ea..8a18d7b 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/core/XMLMemento.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/core/XMLMemento.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.server.preview.internal.core;
+package org.eclipse.wst.server.preview.adapter.internal.core;
 
 import java.io.*;
 import java.util.*;
diff --git a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/ui/PreviewLaunchConfigurationTabGroup.java b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/ui/PreviewLaunchConfigurationTabGroup.java
similarity index 95%
rename from plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/ui/PreviewLaunchConfigurationTabGroup.java
rename to plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/ui/PreviewLaunchConfigurationTabGroup.java
index b411ce0..d56961e 100644
--- a/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/internal/ui/PreviewLaunchConfigurationTabGroup.java
+++ b/plugins/org.eclipse.wst.server.preview.adapter/src/org/eclipse/wst/server/preview/adapter/internal/ui/PreviewLaunchConfigurationTabGroup.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  *******************************************************************************/
-package org.eclipse.wst.server.preview.internal.ui;
+package org.eclipse.wst.server.preview.adapter.internal.ui;
 
 import org.eclipse.debug.ui.*;
 
diff --git a/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
index bdc9643..d0da503 100644
--- a/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
@@ -7,12 +7,14 @@
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.server.ui,
+ org.eclipse.wst.server.ui.actions,
  org.eclipse.wst.server.ui.editor,
  org.eclipse.wst.server.ui.internal;x-internal:=true,
  org.eclipse.wst.server.ui.internal.actions;x-internal:=true,
  org.eclipse.wst.server.ui.internal.audio;x-internal:=true,
  org.eclipse.wst.server.ui.internal.command;x-internal:=true,
  org.eclipse.wst.server.ui.internal.editor;x-internal:=true,
+ org.eclipse.wst.server.ui.internal.extension;x-internal:=true,
  org.eclipse.wst.server.ui.internal.provisional;x-internal:=true,
  org.eclipse.wst.server.ui.internal.view.servers;x-internal:=true,
  org.eclipse.wst.server.ui.internal.viewers;x-internal:=true,
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/FacetRuntimeComponentLabelProvider.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/FacetRuntimeComponentLabelProvider.java
new file mode 100644
index 0000000..08dff1f
--- /dev/null
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/FacetRuntimeComponentLabelProvider.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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
+ *******************************************************************************/
+package org.eclipse.wst.server.ui;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent;
+import org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider;
+/**
+ * A facet runtime label provider that can be used as an implementation of
+ * org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider in the
+ * org.eclipse.wst.common.project.facet.core.runtimes extension point.
+ */
+public class FacetRuntimeComponentLabelProvider implements IAdapterFactory {
+	private static final Class[] ADAPTER_TYPES = { IRuntimeComponentLabelProvider.class };
+
+	public final class RuntimeLabelProvider implements IRuntimeComponentLabelProvider {
+		private final IRuntimeComponent rc;
+
+		public RuntimeLabelProvider(IRuntimeComponent rc) {
+			this.rc = rc;
+		}
+
+		public String getLabel() {
+			return rc.getProperty("type");
+		}
+	}
+
+	public Object getAdapter(Object adaptable, Class adapterType) {
+		IRuntimeComponent rc = (IRuntimeComponent) adaptable;
+		return new RuntimeLabelProvider(rc);
+	}
+
+	public Class[] getAdapterList() {
+		return ADAPTER_TYPES;
+	}
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/facets/RuntimeLabelProvider.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/RuntimeLabelProvider.java
similarity index 96%
rename from plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/facets/RuntimeLabelProvider.java
rename to plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/RuntimeLabelProvider.java
index 715dd7f..f5ba2b7 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/facets/RuntimeLabelProvider.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/RuntimeLabelProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - Initial API and implementation
  ******************************************************************************/
-package org.eclipse.wst.server.ui.internal.facets;
+package org.eclipse.wst.server.ui;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent;