You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/08/10 16:00:51 UTC

svn commit: r430385 - in /geronimo/devtools/eclipse-plugin/trunk: features/org.apache.geronimo.feature/ plugins/org.apache.geronimo.st.core/ plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/ plugins/org.apache.geronimo.st.ui/ plugins...

Author: sppatel
Date: Thu Aug 10 07:00:48 2006
New Revision: 430385

URL: http://svn.apache.org/viewvc?rev=430385&view=rev
Log:
GERONIMODEVTOOLS-52 cleanup refs to "generic"

Modified:
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoServerWizardFragment.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServer.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml Thu Aug 10 07:00:48 2006
@@ -28,7 +28,6 @@
       <import plugin="org.eclipse.emf.edit"/>
       <import plugin="com.ibm.etools.emf.event"/>
       <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jst.server.generic.core"/>
       <import plugin="org.eclipse.wst.server.core"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.wst.common.modulecore"/>
@@ -41,7 +40,6 @@
       <import plugin="org.eclipse.core.commands"/>
       <import plugin="org.eclipse.wst.common.project.facet.core"/>
       <import plugin="org.apache.ant"/>
-      <import plugin="org.eclipse.jst.server.generic.ui"/>
       <import plugin="org.eclipse.wst.server.ui"/>
       <import plugin="org.eclipse.jst.server.core"/>
       <import plugin="org.eclipse.ui.forms"/>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml Thu Aug 10 07:00:48 2006
@@ -57,16 +57,16 @@
     
     <extension point="org.eclipse.jst.server.core.runtimeFacetMappings">
         <runtimeFacetMapping
-            runtimeTypeId="org.apache.geronimo.generic.runtime.10"
+            runtimeTypeId="org.apache.geronimo.runtime.10"
             runtime-component="org.apache.geronimo.runtime" version="1.0"/>
         <runtimeFacetMapping
-            runtimeTypeId="org.apache.geronimo.generic.runtime.11"
+            runtimeTypeId="org.apache.geronimo.runtime.11"
             runtime-component="org.apache.geronimo.runtime" version="1.1"/>
     </extension>
     
 	<extension point="org.eclipse.jst.server.core.runtimeClasspathProviders">
-		<runtimeClasspathProvider id="org.apache.geronimo.generic.runtimeClasspathProvider"
-			runtimeTypeIds="org.apache.geronimo.generic.runtime.*"
+		<runtimeClasspathProvider id="org.apache.geronimo.runtimeClasspathProvider"
+			runtimeTypeIds="org.apache.geronimo.runtime.*"
 			class="org.apache.geronimo.st.core.GeronimoServerRuntimeTargetHandler"/>
     </extension>
     

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java Thu Aug 10 07:00:48 2006
@@ -104,11 +104,11 @@
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.server.generic.core.internal.GenericServerBehaviour#setupLaunch(org.eclipse.debug.core.ILaunch,
-	 *      java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
+	/**
+	 * @param launch
+	 * @param launchMode
+	 * @param monitor
+	 * @throws CoreException
 	 */
 	protected void setupLaunch(ILaunch launch, String launchMode, IProgressMonitor monitor) throws CoreException {
 		Trace.trace(Trace.INFO, "--> GeronimoServerBehavior.setupLaunch()");

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java Thu Aug 10 07:00:48 2006
@@ -268,10 +268,8 @@
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.server.generic.core.internal.GenericServer#setDefaults(org.eclipse.core.runtime.IProgressMonitor)
+	/* (non-Javadoc)
+	 * @see org.eclipse.wst.server.core.model.ServerDelegate#setDefaults(org.eclipse.core.runtime.IProgressMonitor)
 	 */
 	public void setDefaults(IProgressMonitor monitor) {
 		setAdminID("system");

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java Thu Aug 10 07:00:48 2006
@@ -41,7 +41,7 @@
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.server.generic.core.internal.GenericServerRuntimeTargetHandler#resolveClasspathContainer(org.eclipse.wst.server.core.IRuntime)
+	 * @see org.eclipse.jst.server.core.RuntimeClasspathProviderDelegate#resolveClasspathContainer(org.eclipse.wst.server.core.IRuntime)
 	 */
 	public IClasspathEntry[] resolveClasspathContainer(IRuntime runtime) {
 		return getServerClassPathEntry(runtime);

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF Thu Aug 10 07:00:48 2006
@@ -20,7 +20,6 @@
  org.eclipse.core.resources,
  org.eclipse.ui.editors,
  org.eclipse.ui.workbench.texteditor,
- org.eclipse.jst.server.generic.core,
  org.eclipse.wst.server.ui,
  org.eclipse.core.commands,
  org.eclipse.jst.server.core,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml Thu Aug 10 07:00:48 2006
@@ -12,32 +12,32 @@
     </extension>
     
     <extension point="org.eclipse.wst.server.ui.serverImages">
-    	<image id="org.apache.geronimo.generic.runtime.image"
+    	<image id="org.apache.geronimo.runtime.image"
             icon="icons/obj16/littleG.gif"
-            typeIds="org.apache.geronimo.generic.runtime.10"/>
-        <image id="org.apache.geronimo.generic.server.image"
+            typeIds="org.apache.geronimo.runtime.10"/>
+        <image id="org.apache.geronimo.server.image"
             icon="icons/obj16/littleG.gif"
-            typeIds="org.apache.geronimo.generic.server.10"/>
-        <image id="org.apache.geronimo.generic.runtime.image"
+            typeIds="org.apache.geronimo.server.10"/>
+        <image id="org.apache.geronimo.runtime.image"
             icon="icons/obj16/littleG.gif"
-            typeIds="org.apache.geronimo.generic.runtime.11"/>
-        <image id="org.apache.geronimo.generic.server.image"
+            typeIds="org.apache.geronimo.runtime.11"/>
+        <image id="org.apache.geronimo.server.image"
             icon="icons/obj16/littleG.gif"
-            typeIds="org.apache.geronimo.generic.server.11"/>
+            typeIds="org.apache.geronimo.server.11"/>
     </extension>
 
     <extension point="org.eclipse.wst.server.ui.wizardFragments">
-        <fragment id="org.eclipse.jst.server.generic.runtime"
-            typeIds="org.apache.geronimo.generic.runtime.10"
+        <fragment id="org.apache.geronimo.runtime.10"
+            typeIds="org.apache.geronimo.runtime.10"
             class="org.apache.geronimo.st.ui.internal.GeronimoRuntimeWizardFragment"/>
-        <fragment id="org.eclipse.jst.server.generic.server"
-            typeIds="org.apache.geronimo.generic.server.10"
+        <fragment id="org.apache.geronimo.server.10"
+            typeIds="org.apache.geronimo.server.10"
             class="org.apache.geronimo.st.ui.internal.GeronimoServerWizardFragment"/>
-        <fragment id="org.eclipse.jst.server.generic.runtime"
-            typeIds="org.apache.geronimo.generic.runtime.11"
+        <fragment id="org.apache.geronimo.runtime.11"
+            typeIds="org.apache.geronimo.runtime.11"
             class="org.apache.geronimo.st.ui.internal.GeronimoRuntimeWizardFragment"/>
-        <fragment id="org.eclipse.jst.server.generic.server"
-            typeIds="org.apache.geronimo.generic.server.11"
+        <fragment id="org.apache.geronimo.server.11"
+            typeIds="org.apache.geronimo.server.11"
             class="org.apache.geronimo.st.ui.internal.GeronimoServerWizardFragment"/>
     </extension>
 
@@ -55,7 +55,7 @@
     <extension point="org.eclipse.wst.server.ui.editorPageSections">
         <section id="org.apache.server.geronimo.security" order="10"
             insertionId="org.eclipse.wst.server.editor.overview.left"
-            typeIds="org.apache.geronimo.generic.server.*"
+            typeIds="org.apache.geronimo.server.*"
             class="org.apache.geronimo.st.ui.sections.ServerEditorSecuritySection">
         </section>
     </extension>
@@ -63,7 +63,7 @@
     <extension point="org.eclipse.wst.server.ui.editorPageSections">
         <section id="org.apache.server.geronimo.port" order="10"
             insertionId="org.eclipse.wst.server.editor.overview.right"
-            typeIds="org.apache.geronimo.generic.server.*"
+            typeIds="org.apache.geronimo.server.*"
             class="org.apache.geronimo.st.ui.sections.ServerEditorPortsSection">
         </section>
     </extension>
@@ -71,7 +71,7 @@
     <extension point="org.eclipse.wst.server.ui.editorPageSections">
         <section id="org.apache.server.geronimo.loglevel" order="20"
             insertionId="org.eclipse.wst.server.editor.overview.right"
-            typeIds="org.apache.geronimo.generic.server.*"
+            typeIds="org.apache.geronimo.server.*"
             class="org.apache.geronimo.st.ui.sections.ServerEditorLogLevelSection">
         </section>
     </extension>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoServerWizardFragment.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoServerWizardFragment.java?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoServerWizardFragment.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoServerWizardFragment.java Thu Aug 10 07:00:48 2006
@@ -53,10 +53,8 @@
 
 	protected TableViewer viewer;
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.server.generic.ui.internal.ServerDefinitionTypeAwareWizardFragment#hasComposite()
+	/* (non-Javadoc)
+	 * @see org.eclipse.wst.server.ui.wizard.WizardFragment#hasComposite()
 	 */
 	public boolean hasComposite() {
 		return true;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/META-INF/MANIFEST.MF?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/META-INF/MANIFEST.MF Thu Aug 10 07:00:48 2006
@@ -10,7 +10,6 @@
  org.apache.geronimo.deployment.model,
  org.eclipse.jdt.core,
  org.eclipse.jst.server.core,
- org.eclipse.jst.server.generic.core,
  org.eclipse.wst.server.core,
  org.eclipse.emf.mapping.xsd2ecore.editor,
  org.eclipse.wst.common.modulecore,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/plugin.xml?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/plugin.xml Thu Aug 10 07:00:48 2006
@@ -3,7 +3,7 @@
 <plugin>
     
     <extension point="org.eclipse.wst.server.core.runtimeTypes">
-        <runtimeType id="org.apache.geronimo.generic.runtime.10"
+        <runtimeType id="org.apache.geronimo.runtime.10"
             name="%runtimeTypeName" description="%runtimeTypeDescription"
             vendor="%runtimeTypeVendor" version="1.0"
             class="org.apache.geronimo.st.v1.core.GeronimoRuntime">
@@ -15,13 +15,13 @@
     </extension>
     
     <extension point="org.eclipse.wst.server.core.serverTypes">
-        <serverType id="org.apache.geronimo.generic.server.10"
+        <serverType id="org.apache.geronimo.server.10"
             name="%serverTypeName" description="%serverTypeDescription"
             runtime="true"
             class="org.apache.geronimo.st.v1.core.GeronimoServer"
             initialState="stopped" supportsRemoteHosts="true"
             startTimeout="240000" stopTimeout="30000" startBeforePublish="true"
-            runtimeTypeId="org.apache.geronimo.generic.runtime.10"
+            runtimeTypeId="org.apache.geronimo.runtime.10"
             launchConfigId="org.apache.geronimo.st.core.launchConfigurationType"
             behaviourClass="org.apache.geronimo.st.v1.core.GeronimoServerBehaviour"
             hasConfiguration="false" launchModes="run,debug">

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF Thu Aug 10 07:00:48 2006
@@ -10,7 +10,6 @@
  org.eclipse.core.runtime,
  org.apache.geronimo.st.v1.core,
  org.eclipse.wst.server.ui,
- org.eclipse.jst.server.generic.core,
  org.eclipse.wst.server.core,
  org.eclipse.jst.server.core,
  org.apache.geronimo.st.ui,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF Thu Aug 10 07:00:48 2006
@@ -11,7 +11,6 @@
  org.apache.geronimo.st.core,
  org.apache.geronimo.runtime.v11,
  org.apache.geronimo.v11.deployment.model,
- org.eclipse.jst.server.generic.core,
  org.eclipse.wst.server.core,
  org.eclipse.debug.core,
  org.eclipse.wst.common.modulecore,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml Thu Aug 10 07:00:48 2006
@@ -2,7 +2,7 @@
 <?eclipse version="3.0"?>
 <plugin>
 	 <extension point="org.eclipse.wst.server.core.runtimeTypes">
-        <runtimeType id="org.apache.geronimo.generic.runtime.11"
+        <runtimeType id="org.apache.geronimo.runtime.11"
             name="%runtimeTypeName" description="%runtimeTypeDescription"
             vendor="%runtimeTypeVendor" version="1.1"
             class="org.apache.geronimo.st.v11.core.GeronimoRuntime">
@@ -15,13 +15,13 @@
     </extension>
     
     <extension point="org.eclipse.wst.server.core.serverTypes">
-        <serverType id="org.apache.geronimo.generic.server.11"
+        <serverType id="org.apache.geronimo.server.11"
             name="%serverTypeName" description="%serverTypeDescription"
             runtime="true"
             class="org.apache.geronimo.st.v11.core.GeronimoServer"
             initialState="stopped" supportsRemoteHosts="true"
             startTimeout="240000" stopTimeout="30000" startBeforePublish="true"
-            runtimeTypeId="org.apache.geronimo.generic.runtime.11"
+            runtimeTypeId="org.apache.geronimo.runtime.11"
             launchConfigId="org.apache.geronimo.st.core.launchConfigurationType"
             behaviourClass="org.apache.geronimo.st.v11.core.GeronimoServerBehaviour"
             hasConfiguration="false" launchModes="run,debug">
@@ -45,7 +45,7 @@
     
     <extension point="org.eclipse.jst.server.core.runtimeFacetMappings">
         <runtimeFacetMapping
-            runtimeTypeId="org.apache.geronimo.generic.runtime.11"
+            runtimeTypeId="org.apache.geronimo.runtime.11"
             runtime-component="org.apache.geronimo.runtime" version="1.1"/>
     </extension>
     

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServer.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServer.java?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServer.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServer.java Thu Aug 10 07:00:48 2006
@@ -145,7 +145,7 @@
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.jst.server.generic.core.internal.GenericServer#setDefaults(org.eclipse.core.runtime.IProgressMonitor)
+	 * @see org.apache.geronimo.st.core.GeronimoServerDelegate#setDefaults(org.eclipse.core.runtime.IProgressMonitor)
 	 */
 	public void setDefaults(IProgressMonitor monitor) {
 		super.setDefaults(monitor);

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF Thu Aug 10 07:00:48 2006
@@ -10,7 +10,6 @@
  org.eclipse.core.runtime,
  org.apache.geronimo.st.v11.core,
  org.eclipse.wst.server.ui,
- org.eclipse.jst.server.generic.core,
  org.eclipse.wst.server.core,
  org.eclipse.jst.server.core,
  org.apache.geronimo.st.ui,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml?rev=430385&r1=430384&r2=430385&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/plugin.xml Thu Aug 10 07:00:48 2006
@@ -4,7 +4,7 @@
     <extension point="org.eclipse.wst.server.ui.editorPageSections">
         <section id="org.apache.server.geronimo.testenv" order="20"
             insertionId="org.eclipse.wst.server.editor.overview.left"
-            typeIds="org.apache.geronimo.generic.server.11"
+            typeIds="org.apache.geronimo.server.11"
             class="org.apache.geronimo.st.v11.ui.sections.ServerEditorTestEnvSection">
         </section>
     </extension>