Got the tomcat runtime bridge to work.
diff --git a/plugins/org.eclipse.jst.server.core/plugin.xml b/plugins/org.eclipse.jst.server.core/plugin.xml
index 9d49dc8..fa12f2d 100644
--- a/plugins/org.eclipse.jst.server.core/plugin.xml
+++ b/plugins/org.eclipse.jst.server.core/plugin.xml
@@ -88,31 +88,24 @@
       class="org.eclipse.jst.server.core.internal.J2EELaunchableClient"/>
   </extension>
 
-<!--
   <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
     <runtime-component-type
        id="org.eclipse.jst.server.tomcat">
-      <icon>images/tomcat.gif</icon>
+      <!-- <icon>images/tomcat.gif</icon> -->
     </runtime-component-type>
 
     <runtime-component-version
-       type="org.eclipse.jst.server.tomcat" version="5.5">
-      <delegate
-         class="org.eclipse.wst.common.project.facet.base.TomcatRuntimeComponentDelegate"/>
-    </runtime-component-version>
+       type="org.eclipse.jst.server.tomcat" version="5.5"/>
 
     <runtime-component-version
         type="org.eclipse.jst.server.tomcat"
-        version="4.1">
-      <delegate
-         class="org.eclipse.wst.common.project.facet.base.TomcatRuntimeComponentDelegate"/>
-    </runtime-component-version>
+        version="4.1"/>
 
     <adapter>
       <runtime-component
          id="org.eclipse.jst.server.tomcat"/>
       <factory
-         class="org.eclipse.wst.common.project.facet.base.TomcatClasspathProvider$Factory"/>
+         class="org.eclipse.jst.server.core.internal.TomcatClasspathProvider$Factory"/>
       <type
          class="org.eclipse.wst.common.project.facet.core.runtime.classpath.IClasspathProvider"/>
     </adapter>
@@ -129,13 +122,37 @@
 
     <supported>
       <runtime-component
-         id="tomcat"
+         id="org.eclipse.jst.server.tomcat"
          version="4.1"
          allow-newer="true"/>
       <facet
          id="web"
          version="2.3"/>
     </supported>
+    
+    <runtime-component-type id="standard.jre">
+      <!-- <icon>images/jre.gif</icon> -->
+    </runtime-component-type>
+    
+    <runtime-component-version type="standard.jre" version="1.4"/>
+    <runtime-component-version type="standard.jre" version="5.0"/>
+
+    <adapter>
+      <runtime-component id="standard.jre"/>
+      <factory class="org.eclipse.jst.server.core.internal.StandardJreClasspathProvider$Factory"/>
+      <type class="org.eclipse.wst.common.project.facet.core.runtime.classpath.IClasspathProvider"/>
+    </adapter>
+
+    <supported>
+      <runtime-component id="standard.jre" version="1.4"/>
+      <facet id="java" version="1.4"/>
+    </supported>
+
+    <supported>
+      <runtime-component id="standard.jre" version="5.0"/>
+      <facet id="java" version="5.0"/>
+    </supported>
+    
   </extension>
--->
+
 </plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeBridge.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeBridge.java
index c2b7de7..a391b9d 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeBridge.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeBridge.java
@@ -22,6 +22,7 @@
 import org.eclipse.jdt.launching.IVMInstallType;
 import org.eclipse.jdt.launching.JavaRuntime;
 import org.eclipse.jst.server.core.ClasspathRuntimeTargetHandler;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeBridge;
 import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponentVersion;
 import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
 import org.eclipse.wst.server.core.IRuntime;
@@ -30,18 +31,18 @@
 /**
  * 
  */
-public final class RuntimeBridge {
+public final class RuntimeBridge implements IRuntimeBridge {
 	private static Map mappings = new HashMap();
 
 	static {
 		mappings.put("org.eclipse.jst.server.tomcat.runtime.55", RuntimeManager.get()
-				.getRuntimeComponentType("tomcat").getVersion("5.5"));
+				.getRuntimeComponentType("org.eclipse.jst.server.tomcat").getVersion("5.5"));
 
 		mappings.put("org.eclipse.jst.server.tomcat.runtime.41", RuntimeManager.get()
-				.getRuntimeComponentType("tomcat").getVersion("4.1"));
+				.getRuntimeComponentType("org.eclipse.jst.server.tomcat").getVersion("4.1"));
 	}
 
-	public static void port() {
+	public void port() {
 		final IRuntime[] runtimes = ServerCore.getRuntimes();
 
 		for (int i = 0; i < runtimes.length; i++) {
@@ -64,11 +65,13 @@
 					
 					components.add(RuntimeManager.get().createRuntimeComponent(mapped, properties));
 					
+					/* Does not work: loadAdapter returns null 
+                      
 					IGenericRuntime gr = (IGenericRuntime) runtime.loadAdapter(IGenericRuntime.class, null);
 					IVMInstall vmInstall = gr.getVMInstall();
-					IVMInstall2 vmInstall2 = (IVMInstall2) vmInstall;
+					IVMInstall2 vmInstall2 = (IVMInstall2) vmInstall;*/
 					
-					/*final ClasspathRuntimeTargetHandler cphandler = getClasspathHandler(runtime);
+					final ClasspathRuntimeTargetHandler cphandler = getClasspathHandler(runtime);
 					
 					final IPath jrecontainer = findJreContainer(cphandler
 							.getDelegateClasspathEntries(runtime, null));
@@ -77,9 +80,9 @@
 							.getVMInstallType(jrecontainer.segment(1));
 					
 					final IVMInstall2 vminstall = (IVMInstall2) vminstalltype
-							.findVMInstallByName(jrecontainer.segment(2));*/
+							.findVMInstallByName(jrecontainer.segment(2));
 					
-					final String jvmver = vmInstall2.getJavaVersion();
+					final String jvmver = vminstall.getJavaVersion();
 					final IRuntimeComponentVersion rcv;
 					
 					if (jvmver.startsWith("1.4")) {
@@ -93,7 +96,7 @@
 					}
 
 					properties = new HashMap();
-					properties.put("name", vmInstall.getName());
+					properties.put("name", jrecontainer.segment(2));
 					components.add(RuntimeManager.get().createRuntimeComponent(rcv, properties));
 
 					RuntimeManager.get().defineRuntime(name, components, null);
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/StandardJreClasspathProvider.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/StandardJreClasspathProvider.java
new file mode 100644
index 0000000..9a2c077
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/StandardJreClasspathProvider.java
@@ -0,0 +1,90 @@
+/******************************************************************************
+ * Copyright (c) 2005 BEA Systems, Inc.
+ * 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:
+ *    Konstantin Komissarchik - initial API and implementation
+ ******************************************************************************/
+
+package org.eclipse.jst.server.core.internal;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent;
+import org.eclipse.wst.common.project.facet.core.runtime.classpath.IClasspathProvider;
+
+/**
+ * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
+ */
+
+public final class StandardJreClasspathProvider
+
+    implements IClasspathProvider
+    
+{
+    private static final IProjectFacet JAVA_FEATURE
+        = ProjectFacetsManager.getProjectFacet( "java" );
+    
+    private static final String STANDARD_VM_TYPE
+        = "org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType";
+
+    
+    private final IRuntimeComponent rc;
+    
+    public StandardJreClasspathProvider( final IRuntimeComponent rc )
+    {
+        this.rc = rc;
+    }
+
+    public List getClasspathEntries( final IProjectFacetVersion fv )
+    {
+        if( fv.getProjectFacet() == JAVA_FEATURE )
+        {
+            IPath path = new Path( JavaRuntime.JRE_CONTAINER );
+            path = path.append( STANDARD_VM_TYPE );
+            path = path.append( rc.getProperty( "name" ) );
+            
+            final IClasspathEntry cpentry = JavaCore.newContainerEntry( path );
+            
+            return Collections.singletonList( cpentry );
+        }
+        
+        return null;
+    }
+    
+    public static final class Factory
+
+        implements IAdapterFactory
+        
+    {
+        private static final Class[] ADAPTER_TYPES
+            = { IClasspathProvider.class };
+                        
+        public Object getAdapter( final Object adaptable, 
+                                  final Class adapterType )
+        {
+            final IRuntimeComponent rc = (IRuntimeComponent) adaptable;
+            return new StandardJreClasspathProvider( rc );
+        }
+    
+        public Class[] getAdapterList()
+        {
+            return ADAPTER_TYPES;
+        }
+    }
+    
+
+}
diff --git a/plugins/org.eclipse.jst.server.ui/plugin.xml b/plugins/org.eclipse.jst.server.ui/plugin.xml
index f9b2cb4..bdbc39f 100644
--- a/plugins/org.eclipse.jst.server.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.server.ui/plugin.xml
@@ -59,16 +59,20 @@
         name="%cactusServletTestCase"/>
   </extension>
 
-<!--
   <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
     <adapter>
       <runtime-component
          id="org.eclipse.jst.server.tomcat"/>
       <factory
-         class="org.eclipse.wst.common.project.facet.base.TomcatLabelProvider$Factory"/>
+         class="org.eclipse.jst.server.ui.internal.TomcatLabelProvider$Factory"/>
       <type
          class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
     </adapter>
+    <adapter>
+      <runtime-component id="standard.jre"/>
+      <factory class="org.eclipse.jst.server.ui.internal.StandardJreLabelProvider$Factory"/>
+      <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
+    </adapter>
   </extension>
--->
+
 </plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/StandardJreLabelProvider.java b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/StandardJreLabelProvider.java
new file mode 100644
index 0000000..a51bce4
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.ui/sjavaui/org/eclipse/jst/server/ui/internal/StandardJreLabelProvider.java
@@ -0,0 +1,79 @@
+/******************************************************************************
+ * Copyright (c) 2005 BEA Systems, Inc.
+ * 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:
+ *    Konstantin Komissarchik - initial API and implementation
+ ******************************************************************************/
+
+package org.eclipse.jst.server.ui.internal;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent;
+import org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider;
+
+/**
+ * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
+ */
+
+public final class StandardJreLabelProvider
+
+    implements IRuntimeComponentLabelProvider
+    
+{
+    private static final String TYPE
+        = "org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType";
+    
+    private final IRuntimeComponent rc;
+    
+    public StandardJreLabelProvider( final IRuntimeComponent rc )
+    {
+        this.rc = rc;
+    }
+    
+    public String getLabel()
+    {
+        final String name = this.rc.getProperty( "name" );
+        
+        final IVMInstall install 
+            = JavaRuntime.getVMInstallType( TYPE ).findVMInstallByName( name );
+    
+        final StringBuffer buf = new StringBuffer();
+        
+        buf.append( "Standard JRE " );
+        buf.append( this.rc.getRuntimeComponentVersion().getVersionString() );
+        buf.append( " [" );
+        buf.append( install.getInstallLocation().toString() );
+        buf.append( "]" );
+        
+        return buf.toString();
+    }
+    
+    public static final class Factory
+
+        implements IAdapterFactory
+        
+    {
+        private static final Class[] ADAPTER_TYPES
+            = { IRuntimeComponentLabelProvider.class };
+                        
+        public Object getAdapter( final Object adaptable, 
+                                  final Class adapterType )
+        {
+            final IRuntimeComponent rc = (IRuntimeComponent) adaptable;
+            return new StandardJreLabelProvider( rc );
+        }
+    
+        public Class[] getAdapterList()
+        {
+            return ADAPTER_TYPES;
+        }
+    }
+    
+
+}