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 00:49:52 UTC
svn commit: r430174 - in /geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.st.core/ org.apache.geronimo.st.core/META-INF/
org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/
org.apache.geronimo.st.core/src/org/apache/geronim...
Author: sppatel
Date: Wed Aug 9 15:49:50 2006
New Revision: 430174
URL: http://svn.apache.org/viewvc?rev=430174&view=rev
Log:
GERONIMODEVTOOLS-52 first drop of migrating away from wtp generic server framework
Added:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchConfigurationDelegate.java (with props)
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchableAdapterDelegate.java (with props)
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java
- copied, changed from r428759, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerRuntime.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java (with props)
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java
- copied, changed from r429789, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServer.java
Removed:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServer.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerBehaviour.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerRuntime.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviour.java
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.properties
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/IGeronimoRuntime.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoServer.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/PingThread.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/UpdateServerStateTask.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.properties
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/actions/LaunchGeronimoConsoleAction.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetConsoleLogLevelCommand.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetHTTPPortCommand.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetPasswordCommand.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetRMIPortCommand.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetUsernameCommand.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoServerRuntimeWizardFragment.java
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.ui/src/org/apache/geronimo/st/ui/sections/ServerEditorLogLevelSection.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/ServerEditorPortsSection.java
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.core/src/org/apache/geronimo/st/v1/core/GeronimoRuntime.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServer.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java
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/GeronimoRuntime.java
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.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF Wed Aug 9 15:49:50 2006
@@ -23,7 +23,7 @@
org.eclipse.emf.ecore.xmi,
org.eclipse.jst.server.core,
org.eclipse.wst.web,
- org.eclipse.jst.server.generic.core,
+ org.eclipse.jdt.launching,
org.eclipse.wst.common.project.facet.core,
org.eclipse.jem.util,
org.eclipse.jdt.core,
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.properties?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.properties (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.properties Wed Aug 9 15:49:50 2006
@@ -1,2 +1,3 @@
geronimo-facet-label=Geronimo Deployment
-geronimo-facet-description=Creates Geronimo specific deployment plan file(s).
\ No newline at end of file
+geronimo-facet-description=Creates Geronimo specific deployment plan file(s).
+geronimoLaunchConfigurationType=Apache Geronimo
\ No newline at end of file
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=430174&r1=430173&r2=430174&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 Wed Aug 9 15:49:50 2006
@@ -2,6 +2,22 @@
<?eclipse version="3.0"?>
<plugin>
+ <extension point="org.eclipse.debug.core.launchConfigurationTypes">
+ <launchConfigurationType
+ id="org.apache.geronimo.st.core.launchConfigurationType"
+ name="%geronimoLaunchConfigurationType"
+ delegate="org.apache.geronimo.st.core.GeronimoLaunchConfigurationDelegate"
+ modes="run, debug, profile"
+ sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
+ sourcePathComputerId="org.eclipse.jst.server.generic.core.sourcePathComputer"/>
+ </extension>
+
+ <extension point="org.eclipse.wst.server.core.launchableAdapters">
+ <launchableAdapter
+ class="org.apache.geronimo.st.core.GeronimoLaunchableAdapterDelegate"
+ id="org.eclipse.jst.server.generic.web"/>
+ </extension>
+
<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
<runtime-component-type id="org.apache.geronimo.runtime"/>
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchConfigurationDelegate.java?rev=430174&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchConfigurationDelegate.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchConfigurationDelegate.java Wed Aug 9 15:49:50 2006
@@ -0,0 +1,37 @@
+/**
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.core;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate;
+
+public class GeronimoLaunchConfigurationDelegate extends AbstractJavaLaunchConfigurationDelegate {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration,
+ * java.lang.String, org.eclipse.debug.core.ILaunch,
+ * org.eclipse.core.runtime.IProgressMonitor)
+ */
+ public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
+
+ }
+
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchConfigurationDelegate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchConfigurationDelegate.java
------------------------------------------------------------------------------
svn:keywords = Date Rev
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchConfigurationDelegate.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchableAdapterDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchableAdapterDelegate.java?rev=430174&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchableAdapterDelegate.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchableAdapterDelegate.java Wed Aug 9 15:49:50 2006
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.core;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.server.core.IModuleArtifact;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.model.LaunchableAdapterDelegate;
+
+public class GeronimoLaunchableAdapterDelegate extends LaunchableAdapterDelegate {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.core.model.LaunchableAdapterDelegate#getLaunchable(org.eclipse.wst.server.core.IServer,
+ * org.eclipse.wst.server.core.IModuleArtifact)
+ */
+ public Object getLaunchable(IServer server, IModuleArtifact moduleArtifact) throws CoreException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchableAdapterDelegate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchableAdapterDelegate.java
------------------------------------------------------------------------------
svn:keywords = Date Rev
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoLaunchableAdapterDelegate.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java (from r428759, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerRuntime.java)
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java?p2=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java&p1=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerRuntime.java&r1=428759&r2=430174&rev=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerRuntime.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java Wed Aug 9 15:49:50 2006
@@ -20,15 +20,27 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.geronimo.st.core.internal.Messages;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.IVMInstallType;
+import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.server.core.model.RuntimeDelegate;
-abstract public class GenericGeronimoServerRuntime extends GenericServerRuntime implements IGeronimoRuntime {
+abstract public class GeronimoRuntimeDelegate extends RuntimeDelegate implements IGeronimoRuntime {
+
+ private static final String PROP_VM_INSTALL_TYPE_ID = "vm-install-type-id";
+
+ private static final String PROP_VM_INSTALL_ID = "vm-install-id";
+
+ public static final String SERVER_INSTANCE_PROPERTIES = "geronimo_server_instance_properties";
public static final int NO_IMAGE = 0;
@@ -39,6 +51,29 @@
/*
* (non-Javadoc)
*
+ * @see org.eclipse.jst.server.core.IJavaRuntime#getVMInstall()
+ */
+ public IVMInstall getVMInstall() {
+ if (getVMInstallTypeId() == null)
+ return JavaRuntime.getDefaultVMInstall();
+ try {
+ IVMInstallType vmInstallType = JavaRuntime.getVMInstallType(getVMInstallTypeId());
+ IVMInstall[] vmInstalls = vmInstallType.getVMInstalls();
+ int size = vmInstalls.length;
+ String id = getVMInstallId();
+ for (int i = 0; i < size; i++) {
+ if (id.equals(vmInstalls[i].getId()))
+ return vmInstalls[i];
+ }
+ } catch (Exception e) {
+ // ignore
+ }
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.wst.server.core.model.RuntimeDelegate#validate()
*/
public IStatus validate() {
@@ -48,14 +83,20 @@
return status;
}
+ if (getVMInstall() == null)
+ return new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, Messages.errorJRE, null);
+
IPath runtimeLoc = getRuntime().getLocation();
// check for server file structure
int count = 0;
- count = runtimeLoc.append("bin/server.jar").toFile().exists() ? ++count : count;
- count = runtimeLoc.append("bin/deployer.jar").toFile().exists() ? ++count : count;
+ count = runtimeLoc.append("bin/server.jar").toFile().exists() ? ++count
+ : count;
+ count = runtimeLoc.append("bin/deployer.jar").toFile().exists() ? ++count
+ : count;
count = runtimeLoc.append("lib").toFile().exists() ? ++count : ++count;
- count = runtimeLoc.append("repository").toFile().exists() ? ++count : count;
+ count = runtimeLoc.append("repository").toFile().exists() ? ++count
+ : count;
if (count == 0)
return new Status(IStatus.ERROR, Activator.PLUGIN_ID, NO_IMAGE, null, null);
@@ -71,16 +112,28 @@
if (!detectedVersion.startsWith(getRuntime().getRuntimeType().getVersion())) {
String message = NLS.bind(Messages.incorrectVersion, new String[] {
- getRuntime().getRuntimeType().getVersion(),
- detectedVersion });
+ getRuntime().getRuntimeType().getVersion(), detectedVersion });
return new Status(IStatus.ERROR, Activator.PLUGIN_ID, INCORRECT_VERSION, message, null);
}
return Status.OK_STATUS;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.core.model.RuntimeDelegate#setDefaults(org.eclipse.core.runtime.IProgressMonitor)
+ */
+ public void setDefaults(IProgressMonitor monitor) {
+ IVMInstall vmInstall = JavaRuntime.getDefaultVMInstall();
+ setVMInstall(vmInstall.getVMInstallType().getId(), vmInstall.getId());
+ }
+
+ /**
+ * @return
+ */
public String detectVersion() {
-
+
File libDir = getRuntime().getLocation().append("lib").toFile();
if (libDir.exists()) {
File[] libs = libDir.listFiles();
@@ -108,24 +161,91 @@
}
return null;
}
-
+
+ /**
+ * @return
+ */
public String getInstallableTomcatRuntimeId() {
String version = getRuntime().getRuntimeType().getVersion();
- if("1.0".equals(version)) {
+ if ("1.0".equals(version)) {
return "org.apache.geronimo.runtime.tomcat.10";
- } else if("1.1".equals(version)) {
+ } else if ("1.1".equals(version)) {
return "org.apache.geronimo.runtime.tomcat.11";
}
return null;
}
-
+
+ /**
+ * @return
+ */
public String getInstallableJettyRuntimeId() {
String version = getRuntime().getRuntimeType().getVersion();
- if("1.0".equals(version)) {
+ if ("1.0".equals(version)) {
return "org.apache.geronimo.runtime.jetty.10";
- } else if("1.1".equals(version)) {
+ } else if ("1.1".equals(version)) {
return "org.apache.geronimo.runtime.jetty.11";
}
return null;
+ }
+
+ /**
+ * @return
+ */
+ public Map getServerInstanceProperties() {
+ return getAttribute(SERVER_INSTANCE_PROPERTIES, new HashMap());
+ }
+
+ /**
+ * @param map
+ */
+ public void setServerInstanceProperties(Map map) {
+ setAttribute(SERVER_INSTANCE_PROPERTIES, map);
+ }
+
+ /**
+ * @param vmInstall
+ */
+ public void setVMInstall(IVMInstall vmInstall) {
+ if (vmInstall == null) {
+ setVMInstall(null, null);
+ } else
+ setVMInstall(vmInstall.getVMInstallType().getId(), vmInstall.getId());
+ }
+
+ /**
+ * @param typeId
+ * @param id
+ */
+ public void setVMInstall(String typeId, String id) {
+ if (typeId == null)
+ setAttribute(PROP_VM_INSTALL_TYPE_ID, (String) null);
+ else
+ setAttribute(PROP_VM_INSTALL_TYPE_ID, typeId);
+
+ if (id == null)
+ setAttribute(PROP_VM_INSTALL_ID, (String) null);
+ else
+ setAttribute(PROP_VM_INSTALL_ID, id);
+ }
+
+ /**
+ * @return
+ */
+ public String getVMInstallTypeId() {
+ return getAttribute(PROP_VM_INSTALL_TYPE_ID, (String) null);
+ }
+
+ /**
+ * @return
+ */
+ public String getVMInstallId() {
+ return getAttribute(PROP_VM_INSTALL_ID, (String) null);
+ }
+
+ /**
+ * @return
+ */
+ public boolean isUsingDefaultJRE() {
+ return getVMInstallTypeId() == null;
}
}
Added: 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=430174&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java Wed Aug 9 15:49:50 2006
@@ -0,0 +1,515 @@
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.core;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Timer;
+
+import javax.enterprise.deploy.spi.DeploymentManager;
+import javax.enterprise.deploy.spi.TargetModuleID;
+
+import org.apache.geronimo.st.core.commands.DeploymentCmdStatus;
+import org.apache.geronimo.st.core.commands.DeploymentCommandFactory;
+import org.apache.geronimo.st.core.commands.IDeploymentCommand;
+import org.apache.geronimo.st.core.commands.TargetModuleIdNotFoundException;
+import org.apache.geronimo.st.core.internal.Messages;
+import org.apache.geronimo.st.core.internal.Trace;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.DebugEvent;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.debug.core.IDebugEventSetListener;
+import org.eclipse.debug.core.ILaunch;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerListener;
+import org.eclipse.wst.server.core.ServerEvent;
+import org.eclipse.wst.server.core.ServerPort;
+import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
+import org.eclipse.wst.server.core.util.SocketUtil;
+
+abstract public class GeronimoServerBehaviourDelegate extends ServerBehaviourDelegate implements IGeronimoServerBehavior {
+
+ public static final int TIMER_TASK_INTERVAL = 10;
+
+ protected IProgressMonitor _monitor;
+
+ protected Timer timer = null;
+
+ protected PingThread pingThread;
+
+ protected transient IProcess process;
+
+ protected transient IDebugEventSetListener processListener;
+
+ abstract public String getConfigId(IModule module);
+
+ abstract protected ClassLoader getContextClassLoader();
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#setupLaunchConfiguration(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy,
+ * org.eclipse.core.runtime.IProgressMonitor)
+ */
+ public void setupLaunchConfiguration(ILaunchConfigurationWorkingCopy wc, IProgressMonitor monitor) throws CoreException {
+ if (isRemote())// No launch for remote servers.
+ return;
+
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.apache.geronimo.system.main.Daemon");
+
+ GeronimoRuntimeDelegate runtime = getRuntimeDelegate();
+
+ IVMInstall vmInstall = runtime.getVMInstall();
+ if (vmInstall != null)
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, JavaRuntime.newJREContainerPath(vmInstall).toPortableString());
+
+ setupLaunchClasspath(wc, vmInstall);
+
+ String existingProgArgs = wc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String) null);
+ GeronimoServerDelegate gs = (GeronimoServerDelegate) getServer().getAdapter(GeronimoServerDelegate.class);
+
+ String serverProgArgs = existingProgArgs.concat(" ").concat(gs.getConsoleLogLevel());
+ if (existingProgArgs == null
+ || existingProgArgs.indexOf(serverProgArgs) < 0) {
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, serverProgArgs);
+ }
+ }
+
+ /*
+ * (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)
+ */
+ protected void setupLaunch(ILaunch launch, String launchMode, IProgressMonitor monitor) throws CoreException {
+ Trace.trace(Trace.INFO, "--> GeronimoServerBehavior.setupLaunch()");
+
+ if (!SocketUtil.isLocalhost(getServer().getHost()))
+ return;
+
+ ServerPort[] ports = getServer().getServerPorts(null);
+ for (int i = 0; i < ports.length; i++) {
+ ServerPort sp = ports[i];
+ if (SocketUtil.isPortInUse(ports[i].getPort(), 5))
+ throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, Messages.bind(Messages.errorPortInUse, Integer.toString(sp.getPort()), sp.getName()), null));
+ }
+
+ stopUpdateServerStateTask();
+ setServerState(IServer.STATE_STARTING);
+ setMode(launchMode);
+
+ IServerListener listener = new IServerListener() {
+ public void serverChanged(ServerEvent event) {
+ int eventKind = event.getKind();
+ if ((eventKind & ServerEvent.STATE_CHANGE) != 0) {
+ int state = event.getServer().getServerState();
+ if (state == IServer.STATE_STARTED
+ || state == IServer.STATE_STOPPED) {
+ GeronimoServerBehaviourDelegate.this.getServer().removeServerListener(this);
+ startUpdateServerStateTask();
+ }
+ }
+ }
+ };
+
+ getServer().addServerListener(listener);
+ Trace.trace(Trace.INFO, "<-- GeronimoServerBehavior.setupLaunch()");
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#stop(boolean)
+ */
+ public void stop(boolean force) {
+ if (force) {
+ terminate();
+ return;
+ }
+ int state = getServer().getServerState();
+ if (state == IServer.STATE_STOPPED)
+ return;
+ if (state == IServer.STATE_STARTING || state == IServer.STATE_STOPPING)
+ terminate();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#publishModule(int,
+ * int, org.eclipse.wst.server.core.IModule[],
+ * org.eclipse.core.runtime.IProgressMonitor)
+ */
+ public void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException {
+
+ Trace.trace(Trace.INFO, ">> publishModule(), deltaKind = " + deltaKind);
+ Trace.trace(Trace.INFO, Arrays.asList(module).toString());
+ _monitor = monitor;
+
+ if (module.length == 1 && (deltaKind == ADDED || deltaKind == REMOVED)) {
+ invokeCommand(deltaKind, module[0]);
+ } else if (deltaKind == CHANGED) {
+ // TODO This case is flawed due to WTP Bugzilla 123676
+ invokeCommand(deltaKind, module[0]);
+ }
+
+ setModulePublishState(module, IServer.PUBLISH_STATE_NONE);
+
+ Trace.trace(Trace.INFO, "<< publishModule()");
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#publishFinish(org.eclipse.core.runtime.IProgressMonitor)
+ */
+ public void publishFinish(IProgressMonitor monitor) throws CoreException {
+ IModule[] modules = this.getServer().getModules();
+ boolean allpublished = true;
+ for (int i = 0; i < modules.length; i++) {
+ if (this.getServer().getModulePublishState(new IModule[] { modules[i] }) != IServer.PUBLISH_STATE_NONE)
+ allpublished = false;
+ }
+ if (allpublished)
+ setServerPublishState(IServer.PUBLISH_STATE_NONE);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#initialize(org.eclipse.core.runtime.IProgressMonitor)
+ */
+ protected void initialize(IProgressMonitor monitor) {
+ Trace.trace(Trace.INFO, "GeronimoServerBehavior.initialize()");
+ startUpdateServerStateTask();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#dispose()
+ */
+ public void dispose() {
+ stopUpdateServerStateTask();
+ }
+
+ public void setServerStarted() {
+ setServerState(IServer.STATE_STARTED);
+ }
+
+ public void setServerStopped() {
+ setServerState(IServer.STATE_STOPPED);
+ }
+
+ public IGeronimoServer getGeronimoServer() {
+ return (IGeronimoServer) getServer().loadAdapter(IGeronimoServer.class, null);
+ }
+
+ protected void terminate() {
+ if (getServer().getServerState() == IServer.STATE_STOPPED)
+ return;
+
+ try {
+ setServerState(IServer.STATE_STOPPING);
+ Trace.trace(Trace.INFO, "Killing the geronimo server process"); //$NON-NLS-1$
+ if (process != null && !process.isTerminated()) {
+ process.terminate();
+
+ }
+ stopImpl();
+ } catch (Exception e) {
+ Trace.trace(Trace.SEVERE, "Error killing the geronimo server process", e); //$NON-NLS-1$
+ }
+ }
+
+ protected void stopImpl() {
+ if (pingThread != null) {
+ pingThread.interrupt();
+ pingThread = null;
+ }
+ if (process != null) {
+ process = null;
+ DebugPlugin.getDefault().removeDebugEventListener(processListener);
+ processListener = null;
+ }
+ setServerState(IServer.STATE_STOPPED);
+ }
+
+ protected void invokeCommand(int deltaKind, IModule module) throws CoreException {
+ ClassLoader old = Thread.currentThread().getContextClassLoader();
+ try {
+ ClassLoader cl = getContextClassLoader();
+ if (cl != null)
+ Thread.currentThread().setContextClassLoader(cl);
+ switch (deltaKind) {
+ case ADDED: {
+ doDeploy(module);
+ break;
+ }
+ case CHANGED: {
+ doRedeploy(module);
+ break;
+ }
+ case REMOVED: {
+ doUndeploy(module);
+ break;
+ }
+ default:
+ throw new IllegalArgumentException();
+ }
+ } catch (CoreException e) {
+ throw e;
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ Thread.currentThread().setContextClassLoader(old);
+ }
+ }
+
+ protected void doDeploy(IModule module) throws Exception {
+ Trace.trace(Trace.INFO, ">> doDeploy() " + module.toString());
+
+ DeploymentManager dm = DeploymentCommandFactory.getDeploymentManager(getServer());
+
+ if (!DeploymentUtils.configurationExists(module, dm)) {
+ IStatus status = distribute(module);
+ if (!status.isOK()) {
+ doFail(status, Messages.DISTRIBUTE_FAIL);
+ }
+
+ TargetModuleID[] ids = ((DeploymentCmdStatus) status).getResultTargetModuleIDs();
+ ModuleArtifactMapper mapper = ModuleArtifactMapper.getInstance();
+ mapper.addEntry(getServer(), module.getProject(), ids[0].getModuleID());
+
+ status = start(module);
+ if (!status.isOK()) {
+ doFail(status, Messages.START_FAIL);
+ }
+ } else {
+ String id = getConfigId(module);
+ String message = id
+ + "already exists. Existing configuration will be overwritten.";
+ Activator.log(Status.ERROR, message, null);
+ doRedeploy(module);
+ }
+
+ Trace.trace(Trace.INFO, "<< doDeploy() " + module.toString());
+ }
+
+ protected void doRedeploy(IModule module) throws Exception {
+ Trace.trace(Trace.INFO, ">> doRedeploy() " + module.toString());
+
+ try {
+ IStatus status = reDeploy(module);
+ if (!status.isOK()) {
+ doFail(status, Messages.REDEPLOY_FAIL);
+ }
+ } catch (TargetModuleIdNotFoundException e) {
+ Activator.log(Status.WARNING, "Module may have been uninstalled outside the workspace.", e);
+ doDeploy(module);
+ }
+
+ Trace.trace(Trace.INFO, "<< doRedeploy() " + module.toString());
+ }
+
+ protected void doUndeploy(IModule module) throws Exception {
+ Trace.trace(Trace.INFO, ">> doUndeploy() " + module.toString());
+
+ IStatus status = stop(module);
+ if (!status.isOK()) {
+ doFail(status, Messages.STOP_FAIL);
+ }
+
+ status = unDeploy(module);
+ if (!status.isOK()) {
+ doFail(status, Messages.UNDEPLOY_FAIL);
+ }
+
+ Trace.trace(Trace.INFO, "<< doUndeploy()" + module.toString());
+ }
+
+ protected void doRestart(IModule module) throws Exception {
+ Trace.trace(Trace.INFO, ">> doRestart() " + module.toString());
+
+ IStatus status = stop(module);
+ if (!status.isOK()) {
+ doFail(status, Messages.STOP_FAIL);
+ }
+
+ status = start(module);
+ if (!status.isOK()) {
+ doFail(status, Messages.START_FAIL);
+ }
+
+ Trace.trace(Trace.INFO, ">> doRestart() " + module.toString());
+ }
+
+ protected void doFail(IStatus status, String message) throws CoreException {
+ throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, message, new Exception(status.getMessage())));
+ }
+
+ protected IStatus distribute(IModule module) throws Exception {
+ IDeploymentCommand cmd = DeploymentCommandFactory.createDistributeCommand(module, getServer());
+ return cmd.execute(_monitor);
+ }
+
+ protected IStatus start(IModule module) throws Exception {
+ TargetModuleID id = DeploymentUtils.getTargetModuleID(module, DeploymentCommandFactory.getDeploymentManager(getServer()));
+ IDeploymentCommand cmd = DeploymentCommandFactory.createStartCommand(new TargetModuleID[] { id }, module, getServer());
+ return cmd.execute(_monitor);
+ }
+
+ protected IStatus stop(IModule module) throws Exception {
+ IDeploymentCommand cmd = DeploymentCommandFactory.createStopCommand(module, getServer());
+ return cmd.execute(_monitor);
+ }
+
+ protected IStatus unDeploy(IModule module) throws Exception {
+ IDeploymentCommand cmd = DeploymentCommandFactory.createUndeployCommand(module, getServer());
+ return cmd.execute(_monitor);
+ }
+
+ protected IStatus reDeploy(IModule module) throws Exception {
+ IDeploymentCommand cmd = DeploymentCommandFactory.createRedeployCommand(module, getServer());
+ return cmd.execute(_monitor);
+ }
+
+ public Map getServerInstanceProperties() {
+ return getRuntimeDelegate().getServerInstanceProperties();
+ }
+
+ protected GeronimoRuntimeDelegate getRuntimeDelegate() {
+ return (GeronimoRuntimeDelegate) getServer().getRuntime().loadAdapter(GeronimoRuntimeDelegate.class, null);
+ }
+
+ protected boolean isRemote() {
+ return getServer().getServerType().supportsRemoteHosts()
+ && !SocketUtil.isLocalhost(getServer().getHost());
+ }
+
+ protected void setupLaunchClasspath(ILaunchConfigurationWorkingCopy wc, IVMInstall vmInstall) throws CoreException {
+ List cp = new ArrayList();
+ IPath serverJar = getServer().getRuntime().getLocation().append("/bin/server.jar");
+ cp.add(JavaRuntime.newArchiveRuntimeClasspathEntry(serverJar));
+ // merge existing classpath with server classpath
+ IRuntimeClasspathEntry[] existingCps = JavaRuntime.computeUnresolvedRuntimeClasspath(wc);
+ for (int i = 0; i < existingCps.length; i++) {
+ if (cp.contains(existingCps[i]) == false) {
+ cp.add(existingCps[i]);
+ }
+ }
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, convertCPEntryToMemento(cp));
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
+ }
+
+ private List convertCPEntryToMemento(List cpEntryList) {
+ List list = new ArrayList(cpEntryList.size());
+ Iterator iterator = cpEntryList.iterator();
+ while (iterator.hasNext()) {
+ IRuntimeClasspathEntry entry = (IRuntimeClasspathEntry) iterator.next();
+ try {
+ list.add(entry.getMemento());
+ } catch (CoreException e) {
+ Trace.trace(Trace.SEVERE, "Could not resolve classpath entry: "
+ + entry, e);
+ }
+ }
+ return list;
+ }
+
+ public void setProcess(final IProcess newProcess) {
+ if (process != null)
+ return;
+
+ process = newProcess;
+ if (processListener != null)
+ DebugPlugin.getDefault().removeDebugEventListener(processListener);
+ if (newProcess == null)
+ return;
+
+ processListener = new IDebugEventSetListener() {
+ public void handleDebugEvents(DebugEvent[] events) {
+ if (events != null) {
+ int size = events.length;
+ for (int i = 0; i < size; i++) {
+ if (process != null
+ && process.equals(events[i].getSource())
+ && events[i].getKind() == DebugEvent.TERMINATE) {
+ DebugPlugin.getDefault().removeDebugEventListener(this);
+ stopImpl();
+ }
+ }
+ }
+ }
+ };
+ DebugPlugin.getDefault().addDebugEventListener(processListener);
+ }
+
+ protected void startPingThread() {
+ pingThread = new PingThread(this, getServer());
+ pingThread.start();
+ }
+
+ protected void startUpdateServerStateTask() {
+ Trace.trace(Trace.INFO, "startUpdateServerStateTask() "
+ + getServer().getName());
+ timer = new Timer(true);
+ timer.schedule(new UpdateServerStateTask(this, getServer()), 10000, TIMER_TASK_INTERVAL * 1000);
+ }
+
+ protected void stopUpdateServerStateTask() {
+ Trace.trace(Trace.INFO, "stopUpdateServerStateTask() "
+ + getServer().getName());
+ if (timer != null)
+ timer.cancel();
+ }
+
+ protected IPath getModulePath(IModule[] module, URL baseURL) {
+ IPath modulePath = new Path(baseURL.getFile());
+
+ if (module.length == 2) {
+ IModule workingModule = module[module.length - 1];
+ modulePath = modulePath.append(workingModule.getName());
+ if (GeronimoUtils.isWebModule(workingModule)) {
+ modulePath = modulePath.addFileExtension("war");
+ } else if (GeronimoUtils.isEjbJarModule(workingModule)) {
+ modulePath = modulePath.addFileExtension("jar");
+ } else if (GeronimoUtils.isRARModule(workingModule)) {
+ modulePath = modulePath.addFileExtension("rar");
+ } else if (GeronimoUtils.isEarModule(workingModule)) {
+ modulePath = modulePath.addFileExtension("ear");
+ }
+ }
+
+ return modulePath;
+ }
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
------------------------------------------------------------------------------
svn:keywords = Date Rev
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java (from r429789, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServer.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?p2=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java&p1=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServer.java&r1=429789&r2=430174&rev=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServer.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerDelegate.java Wed Aug 9 15:49:50 2006
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.jar.Attributes;
@@ -25,15 +26,24 @@
import java.util.jar.Manifest;
import org.apache.geronimo.st.core.internal.Trace;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.server.core.FacetUtil;
+import org.eclipse.jst.server.core.IEnterpriseApplication;
import org.eclipse.jst.server.core.IWebModule;
-import org.eclipse.jst.server.generic.core.internal.GenericServer;
+import org.eclipse.jst.server.core.internal.J2EEUtil;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IModuleType;
import org.eclipse.wst.server.core.ServerPort;
+import org.eclipse.wst.server.core.ServerUtil;
import org.eclipse.wst.server.core.internal.ServerMonitorManager;
+import org.eclipse.wst.server.core.model.ServerDelegate;
-public abstract class GenericGeronimoServer extends GenericServer implements IGeronimoServer {
+abstract public class GeronimoServerDelegate extends ServerDelegate implements IGeronimoServer {
public static final String PROPERTY_ADMIN_ID = "adminID";
@@ -51,13 +61,130 @@
public abstract String getContextRoot(IModule module);
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.core.model.ServerDelegate#canModifyModules(org.eclipse.wst.server.core.IModule[],
+ * org.eclipse.wst.server.core.IModule[])
+ */
+ public IStatus canModifyModules(IModule[] add, IModule[] remove) {
+ for (int i = 0; i < add.length; i++) {
+ IModule module = add[i];
+ if (module.getProject() != null) {
+ IStatus status = FacetUtil.verifyFacets(module.getProject(), getServer());
+ if (status != null && !status.isOK())
+ return status;
+ }
+ }
+ return Status.OK_STATUS;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.core.model.ServerDelegate#modifyModules(org.eclipse.wst.server.core.IModule[],
+ * org.eclipse.wst.server.core.IModule[],
+ * org.eclipse.core.runtime.IProgressMonitor)
+ */
+ public void modifyModules(IModule[] add, IModule[] remove, IProgressMonitor monitor) throws CoreException {
+ // TODO servermodule.info should be pushed to here and set as instance
+ // property
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.core.model.ServerDelegate#getRootModules(org.eclipse.wst.server.core.IModule)
+ */
+ public IModule[] getRootModules(IModule module) throws CoreException {
+ IStatus status = canModifyModules(new IModule[] { module }, null);
+ if (status != null && !status.isOK())
+ throw new CoreException(status);
+ IModule[] childs = doGetParentModules(module);
+ if (childs.length > 0)
+ return childs;
+ return new IModule[] { module };
+ }
+
+ private IModule[] doGetParentModules(IModule module) {
+ ArrayList parents = new ArrayList();
+ parents.addAll(getApplicationModules(module));
+
+ // also check to see if the module is a utility module for a stand-alone
+ // web module
+ IModule[] wars = J2EEUtil.getWebModules(module, null);
+ for (int i = 0; i < wars.length; i++) {
+ if (getApplicationModules(wars[i]).isEmpty()) {
+ parents.add(wars[i]);
+ }
+ }
+ return (IModule[]) parents.toArray(new IModule[parents.size()]);
+ }
+
+ private List getApplicationModules(IModule module) {
+ IModule[] ears = ServerUtil.getModules(IModuleConstants.JST_EAR_MODULE);
+ ArrayList list = new ArrayList();
+ for (int i = 0; i < ears.length; i++) {
+ IEnterpriseApplication ear = (IEnterpriseApplication) ears[i].loadAdapter(IEnterpriseApplication.class, null);
+ IModule[] childs = ear.getModules();
+ for (int j = 0; j < childs.length; j++) {
+ if (childs[j].equals(module))
+ list.add(ears[i]);
+ }
+ }
+ return list;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.core.model.ServerDelegate#getChildModules(org.eclipse.wst.server.core.IModule[])
+ */
+ public IModule[] getChildModules(IModule[] module) {
+ if (module == null)
+ return null;
+
+ if (module.length == 1 && module[0] != null) {
+ IModuleType moduleType = module[0].getModuleType();
+ if (moduleType != null) {
+ if (IModuleConstants.JST_EAR_MODULE.equals(moduleType.getId())) {
+ IEnterpriseApplication enterpriseApplication = (IEnterpriseApplication) module[0].loadAdapter(IEnterpriseApplication.class, null);
+ if (enterpriseApplication != null) {
+ IModule[] modules = enterpriseApplication.getModules();
+ if (modules != null)
+ return modules;
+ }
+ } else if (IModuleConstants.JST_WEB_MODULE.equals(moduleType.getId())) {
+ IWebModule webModule = (IWebModule) module[0].loadAdapter(IWebModule.class, null);
+ if (webModule != null) {
+ IModule[] modules = webModule.getModules();
+ if (modules != null)
+ return modules;
+ }
+ }
+ }
+ }
+
+ return new IModule[] {};
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.core.model.ServerDelegate#getServerPorts()
+ */
public ServerPort[] getServerPorts() {
List ports = new ArrayList();
- ports.add(new ServerPort(PROPERTY_HTTP_PORT, "Web Connector", Integer.parseInt(getHTTPPort()), "http"));
+ ports.add(new ServerPort(PROPERTY_HTTP_PORT, "Web Connector", Integer.parseInt(getHTTPPort()), "http"));
ports.add(new ServerPort(PROPERTY_RMI_PORT, "RMI Naming", Integer.parseInt(getRMINamingPort()), "rmi"));
return (ServerPort[]) ports.toArray(new ServerPort[ports.size()]);
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.core.model.IURLProvider#getModuleRootURL(org.eclipse.wst.server.core.IModule)
+ */
public URL getModuleRootURL(IModule module) {
try {
if (module == null
@@ -68,7 +195,7 @@
String url = "http://" + host;
int port = 0;
- port = getHttpPort();
+ port = Integer.parseInt(getHTTPPort());
port = ServerMonitorManager.getInstance().getMonitoredPort(getServer(), port, "web");
if (port != 80)
url += ":" + port;
@@ -164,4 +291,11 @@
setServerInstanceProperties(map);
}
+ public Map getServerInstanceProperties() {
+ return getAttribute(GeronimoRuntimeDelegate.SERVER_INSTANCE_PROPERTIES, new HashMap());
+ }
+
+ public void setServerInstanceProperties(Map map) {
+ setAttribute(GeronimoRuntimeDelegate.SERVER_INSTANCE_PROPERTIES, map);
+ }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoRuntime.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoRuntime.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoRuntime.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoRuntime.java Wed Aug 9 15:49:50 2006
@@ -18,8 +18,9 @@
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.eclipse.core.resources.IFile;
+import org.eclipse.jst.server.core.IJavaRuntime;
-public interface IGeronimoRuntime {
+public interface IGeronimoRuntime extends IJavaRuntime {
public XmlObject fixGeronimoEarSchema(IFile plan) throws XmlException;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoServer.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoServer.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoServer.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoServer.java Wed Aug 9 15:49:50 2006
@@ -19,8 +19,9 @@
import javax.enterprise.deploy.spi.factories.DeploymentFactory;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.wst.server.core.model.IURLProvider;
-public interface IGeronimoServer {
+public interface IGeronimoServer extends IURLProvider {
public String getAdminID();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/PingThread.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/PingThread.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/PingThread.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/PingThread.java Wed Aug 9 15:49:50 2006
@@ -62,7 +62,7 @@
ClassLoader old = Thread.currentThread().getContextClassLoader();
try {
- ClassLoader cl = ((GenericGeronimoServerBehaviour) geronimoServer).getContextClassLoader();
+ ClassLoader cl = ((GeronimoServerBehaviourDelegate) geronimoServer).getContextClassLoader();
Thread.currentThread().setContextClassLoader(cl);
if (geronimoServer.isFullyStarted()) {
Trace.trace(Trace.INFO, "Ping: success");
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/UpdateServerStateTask.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/UpdateServerStateTask.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/UpdateServerStateTask.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/UpdateServerStateTask.java Wed Aug 9 15:49:50 2006
@@ -128,7 +128,7 @@
ClassLoader old = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(
- ((GenericGeronimoServerBehaviour) delegate)
+ ((GeronimoServerBehaviourDelegate) delegate)
.getContextClassLoader());
return delegate.isFullyStarted();
} finally {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.java Wed Aug 9 15:49:50 2006
@@ -33,11 +33,14 @@
public static String REDEPLOY_FAIL;
public static String DM_CONNECTION_FAIL;
+ public static String errorJRE;
+
public static String target10runtime;
public static String target11runtime;
public static String incorrectVersion;
public static String noVersion;
public static String missingContent;
+ public static String errorPortInUse;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.properties?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.properties (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Messages.properties Wed Aug 9 15:49:50 2006
@@ -10,4 +10,7 @@
incorrectVersion=An incorrect version of Geronimo was detected. Version {0} was expected, but version {1} was found.
noVersion=A geronimo installation was detected, however the version could not be verified.
-missingContent=A geronimo installation was detected, however parts of the server seem to be missing.
\ No newline at end of file
+missingContent=A geronimo installation was detected, however parts of the server seem to be missing.
+errorJRE=The JRE could not be found. Edit the server and change the JRE location.
+errorPortInUse=Port {0} required by {1} is already in use. The server may already be running in another process, or a system process may be using the port. \
+To start this server you will need to stop the other process or change the port number(s).
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/actions/LaunchGeronimoConsoleAction.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/actions/LaunchGeronimoConsoleAction.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/actions/LaunchGeronimoConsoleAction.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/actions/LaunchGeronimoConsoleAction.java Wed Aug 9 15:49:50 2006
@@ -18,7 +18,7 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.geronimo.st.core.GenericGeronimoServer;
+import org.apache.geronimo.st.core.GeronimoServerDelegate;
import org.apache.geronimo.st.ui.internal.Messages;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
@@ -42,7 +42,7 @@
public URL getConsoleUrl() throws MalformedURLException {
if (server != null) {
- GenericGeronimoServer gs = (GenericGeronimoServer) server.getAdapter(GenericGeronimoServer.class);
+ GeronimoServerDelegate gs = (GeronimoServerDelegate) server.getAdapter(GeronimoServerDelegate.class);
return new URL("http://" + server.getHost() + ":"
+ gs.getHTTPPort() + "/console/");
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetConsoleLogLevelCommand.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetConsoleLogLevelCommand.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetConsoleLogLevelCommand.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetConsoleLogLevelCommand.java Wed Aug 9 15:49:50 2006
@@ -15,7 +15,7 @@
*/
package org.apache.geronimo.st.ui.commands;
-import org.apache.geronimo.st.core.GenericGeronimoServer;
+import org.apache.geronimo.st.core.GeronimoServerDelegate;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.wst.server.core.IServerWorkingCopy;
@@ -40,7 +40,7 @@
* @see org.eclipse.wst.server.ui.internal.command.ServerCommand#execute()
*/
public void execute() {
- GenericGeronimoServer gs = getGeronimoServer();
+ GeronimoServerDelegate gs = getGeronimoServer();
oldValue = gs.getConsoleLogLevel();
gs.setConsoleLogLevel(value);
}
@@ -54,10 +54,10 @@
getGeronimoServer().setConsoleLogLevel(oldValue);
}
- private GenericGeronimoServer getGeronimoServer() {
- GenericGeronimoServer gs = (GenericGeronimoServer) server.getAdapter(GenericGeronimoServer.class);
+ private GeronimoServerDelegate getGeronimoServer() {
+ GeronimoServerDelegate gs = (GeronimoServerDelegate) server.getAdapter(GeronimoServerDelegate.class);
if (gs == null) {
- gs = (GenericGeronimoServer) server.loadAdapter(GenericGeronimoServer.class, new NullProgressMonitor());
+ gs = (GeronimoServerDelegate) server.loadAdapter(GeronimoServerDelegate.class, new NullProgressMonitor());
}
return gs;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetHTTPPortCommand.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetHTTPPortCommand.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetHTTPPortCommand.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetHTTPPortCommand.java Wed Aug 9 15:49:50 2006
@@ -15,7 +15,7 @@
*/
package org.apache.geronimo.st.ui.commands;
-import org.apache.geronimo.st.core.GenericGeronimoServer;
+import org.apache.geronimo.st.core.GeronimoServerDelegate;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.wst.server.core.IServerWorkingCopy;
@@ -25,7 +25,7 @@
protected String oldName;
- GenericGeronimoServer gs;
+ GeronimoServerDelegate gs;
/**
* @param server
@@ -42,9 +42,9 @@
* @see org.eclipse.wst.server.ui.internal.command.ServerCommand#execute()
*/
public void execute() {
- gs = (GenericGeronimoServer) server.getAdapter(GenericGeronimoServer.class);
+ gs = (GeronimoServerDelegate) server.getAdapter(GeronimoServerDelegate.class);
if (gs == null) {
- gs = (GenericGeronimoServer) server.loadAdapter(GenericGeronimoServer.class, new NullProgressMonitor());
+ gs = (GeronimoServerDelegate) server.loadAdapter(GeronimoServerDelegate.class, new NullProgressMonitor());
}
oldName = gs.getHTTPPort();
gs.setHTTPPort(name);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetPasswordCommand.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetPasswordCommand.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetPasswordCommand.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetPasswordCommand.java Wed Aug 9 15:49:50 2006
@@ -15,7 +15,7 @@
*/
package org.apache.geronimo.st.ui.commands;
-import org.apache.geronimo.st.core.GenericGeronimoServer;
+import org.apache.geronimo.st.core.GeronimoServerDelegate;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.wst.server.core.IServerWorkingCopy;
@@ -25,7 +25,7 @@
protected String oldName;
- GenericGeronimoServer gs;
+ GeronimoServerDelegate gs;
/**
* @param server
@@ -42,9 +42,9 @@
* @see org.eclipse.wst.server.ui.internal.command.ServerCommand#execute()
*/
public void execute() {
- gs = (GenericGeronimoServer) server.getAdapter(GenericGeronimoServer.class);
+ gs = (GeronimoServerDelegate) server.getAdapter(GeronimoServerDelegate.class);
if (gs == null) {
- gs = (GenericGeronimoServer) server.loadAdapter(GenericGeronimoServer.class, new NullProgressMonitor());
+ gs = (GeronimoServerDelegate) server.loadAdapter(GeronimoServerDelegate.class, new NullProgressMonitor());
}
oldName = gs.getAdminPassword();
gs.setAdminPassword(name);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetRMIPortCommand.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetRMIPortCommand.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetRMIPortCommand.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetRMIPortCommand.java Wed Aug 9 15:49:50 2006
@@ -15,7 +15,7 @@
*/
package org.apache.geronimo.st.ui.commands;
-import org.apache.geronimo.st.core.GenericGeronimoServer;
+import org.apache.geronimo.st.core.GeronimoServerDelegate;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.wst.server.core.IServerWorkingCopy;
@@ -25,7 +25,7 @@
protected String oldName;
- GenericGeronimoServer gs;
+ GeronimoServerDelegate gs;
/**
* @param server
@@ -42,9 +42,9 @@
* @see org.eclipse.wst.server.ui.internal.command.ServerCommand#execute()
*/
public void execute() {
- gs = (GenericGeronimoServer) server.getAdapter(GenericGeronimoServer.class);
+ gs = (GeronimoServerDelegate) server.getAdapter(GeronimoServerDelegate.class);
if (gs == null) {
- gs = (GenericGeronimoServer) server.loadAdapter(GenericGeronimoServer.class, new NullProgressMonitor());
+ gs = (GeronimoServerDelegate) server.loadAdapter(GeronimoServerDelegate.class, new NullProgressMonitor());
}
oldName = gs.getRMINamingPort();
gs.setRMINamingPort(name);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetUsernameCommand.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetUsernameCommand.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetUsernameCommand.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/commands/SetUsernameCommand.java Wed Aug 9 15:49:50 2006
@@ -15,7 +15,7 @@
*/
package org.apache.geronimo.st.ui.commands;
-import org.apache.geronimo.st.core.GenericGeronimoServer;
+import org.apache.geronimo.st.core.GeronimoServerDelegate;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.wst.server.core.IServerWorkingCopy;
@@ -29,7 +29,7 @@
protected String oldName;
- GenericGeronimoServer gs;
+ GeronimoServerDelegate gs;
/**
* @param server
@@ -46,9 +46,9 @@
* @see org.eclipse.wst.server.ui.internal.command.ServerCommand#execute()
*/
public void execute() {
- gs = (GenericGeronimoServer) server.getAdapter(GenericGeronimoServer.class);
+ gs = (GeronimoServerDelegate) server.getAdapter(GeronimoServerDelegate.class);
if (gs == null) {
- gs = (GenericGeronimoServer) server.loadAdapter(GenericGeronimoServer.class, new NullProgressMonitor());
+ gs = (GeronimoServerDelegate) server.loadAdapter(GeronimoServerDelegate.class, new NullProgressMonitor());
}
oldName = gs.getAdminID();
gs.setAdminID(name);
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoServerRuntimeWizardFragment.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/GeronimoServerRuntimeWizardFragment.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoServerRuntimeWizardFragment.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoServerRuntimeWizardFragment.java Wed Aug 9 15:49:50 2006
@@ -21,7 +21,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.geronimo.st.core.GenericGeronimoServerRuntime;
+import org.apache.geronimo.st.core.GeronimoRuntimeDelegate;
import org.apache.geronimo.st.ui.Activator;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -157,7 +157,7 @@
data = new GridData(GridData.FILL_BOTH);
data.horizontalSpan = 3;
- GenericGeronimoServerRuntime gRuntime = (GenericGeronimoServerRuntime) getRuntimeDelegate().getRuntime().loadAdapter(GenericGeronimoServerRuntime.class, null);
+ GeronimoRuntimeDelegate gRuntime = (GeronimoRuntimeDelegate) getRuntimeDelegate().getRuntime().loadAdapter(GeronimoRuntimeDelegate.class, null);
final IInstallableRuntime gWithTomcat = ServerPlugin.findInstallableRuntime(gRuntime.getInstallableTomcatRuntimeId());
final IInstallableRuntime gWithJetty = ServerPlugin.findInstallableRuntime(gRuntime.getInstallableJettyRuntimeId());
@@ -284,14 +284,14 @@
//a valid install found
wizard.setMessage(null, IMessageProvider.NONE);
group.setEnabled(false);
- } else if(status.getCode() == GenericGeronimoServerRuntime.INCORRECT_VERSION) {
+ } else if(status.getCode() == GeronimoRuntimeDelegate.INCORRECT_VERSION) {
group.setEnabled(false);
if(status.getSeverity() == IStatus.ERROR) {
wizard.setMessage(status.getMessage(), IMessageProvider.ERROR);
return;
}
wizard.setMessage(status.getMessage(), IMessageProvider.WARNING);
- } else if(status.getCode() == GenericGeronimoServerRuntime.PARTIAL_IMAGE) {
+ } else if(status.getCode() == GeronimoRuntimeDelegate.PARTIAL_IMAGE) {
wizard.setMessage(status.getMessage(), IMessageProvider.ERROR);
return;
} else {
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=430174&r1=430173&r2=430174&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 Wed Aug 9 15:49:50 2006
@@ -15,10 +15,8 @@
*/
package org.apache.geronimo.st.ui.internal;
-import org.apache.geronimo.st.core.GenericGeronimoServer;
+import org.apache.geronimo.st.core.GeronimoServerDelegate;
import org.apache.geronimo.st.ui.Activator;
-import org.apache.geronimo.st.ui.commands.SetUsernameCommand;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ColumnWeightData;
import org.eclipse.jface.viewers.ICellModifier;
@@ -178,7 +176,7 @@
public void modify(Object element, String property, Object value) {
Item item = (Item) element;
ServerPort sp = (ServerPort) item.getData();
- GenericGeronimoServer gs = getGeronimoServer();
+ GeronimoServerDelegate gs = getGeronimoServer();
gs.setInstanceProperty(sp.getId(), (String) value);
changePortNumber(sp.getId(), Integer.parseInt((String) value));
}
@@ -231,15 +229,14 @@
* @see org.eclipse.wst.server.ui.wizard.WizardFragment#isComplete()
*/
public boolean isComplete() {
- GenericGeronimoServer gs = getGeronimoServer();
- IStatus status = gs.validate();
- return (status != null && status.isOK());
+ //TODO
+ return true;
}
- private GenericGeronimoServer getGeronimoServer() {
- GenericGeronimoServer gs = (GenericGeronimoServer) getServer().getAdapter(GenericGeronimoServer.class);
+ private GeronimoServerDelegate getGeronimoServer() {
+ GeronimoServerDelegate gs = (GeronimoServerDelegate) getServer().getAdapter(GeronimoServerDelegate.class);
if (gs == null)
- gs = (GenericGeronimoServer) getServer().loadAdapter(GenericGeronimoServer.class, null);
+ gs = (GeronimoServerDelegate) getServer().loadAdapter(GeronimoServerDelegate.class, null);
return gs;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/ServerEditorLogLevelSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/ServerEditorLogLevelSection.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/ServerEditorLogLevelSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/ServerEditorLogLevelSection.java Wed Aug 9 15:49:50 2006
@@ -15,7 +15,7 @@
*/
package org.apache.geronimo.st.ui.sections;
-import org.apache.geronimo.st.core.GenericGeronimoServer;
+import org.apache.geronimo.st.core.GeronimoServerDelegate;
import org.apache.geronimo.st.ui.commands.SetConsoleLogLevelCommand;
import org.apache.geronimo.st.ui.internal.Messages;
import org.eclipse.swt.SWT;
@@ -68,8 +68,8 @@
info = toolkit.createButton(composite, Messages.info, SWT.RADIO);
debug = toolkit.createButton(composite, Messages.debug, SWT.RADIO);
- String currentValue = ((GenericGeronimoServer)server.getAdapter(GenericGeronimoServer.class)).getConsoleLogLevel();
- if(GenericGeronimoServer.CONSOLE_DEBUG.equals(currentValue)) {
+ String currentValue = ((GeronimoServerDelegate)server.getAdapter(GeronimoServerDelegate.class)).getConsoleLogLevel();
+ if(GeronimoServerDelegate.CONSOLE_DEBUG.equals(currentValue)) {
debug.setSelection(true);
} else {
info.setSelection(true);
@@ -79,7 +79,7 @@
public void widgetSelected(SelectionEvent e) {
if (info.getSelection()) {
- execute(new SetConsoleLogLevelCommand(server, GenericGeronimoServer.CONSOLE_INFO));
+ execute(new SetConsoleLogLevelCommand(server, GeronimoServerDelegate.CONSOLE_INFO));
}
}
@@ -92,7 +92,7 @@
public void widgetSelected(SelectionEvent e) {
if (debug.getSelection()) {
- execute(new SetConsoleLogLevelCommand(server, GenericGeronimoServer.CONSOLE_DEBUG));
+ execute(new SetConsoleLogLevelCommand(server, GeronimoServerDelegate.CONSOLE_DEBUG));
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/ServerEditorPortsSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/ServerEditorPortsSection.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/ServerEditorPortsSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/sections/ServerEditorPortsSection.java Wed Aug 9 15:49:50 2006
@@ -15,7 +15,7 @@
*/
package org.apache.geronimo.st.ui.sections;
-import org.apache.geronimo.st.core.GenericGeronimoServer;
+import org.apache.geronimo.st.core.GeronimoServerDelegate;
import org.apache.geronimo.st.ui.commands.SetHTTPPortCommand;
import org.apache.geronimo.st.ui.commands.SetRMIPortCommand;
import org.apache.geronimo.st.ui.internal.Messages;
@@ -46,7 +46,7 @@
Text rmiPort;
- GenericGeronimoServer gs;
+ GeronimoServerDelegate gs;
public ServerEditorPortsSection() {
super();
@@ -116,9 +116,9 @@
*/
public void init(IEditorSite site, IEditorInput input) {
super.init(site, input);
- gs = (GenericGeronimoServer) server.getAdapter(GenericGeronimoServer.class);
+ gs = (GeronimoServerDelegate) server.getAdapter(GeronimoServerDelegate.class);
if (gs == null) {
- gs = (GenericGeronimoServer) server.loadAdapter(GenericGeronimoServer.class,
+ gs = (GeronimoServerDelegate) server.loadAdapter(GeronimoServerDelegate.class,
new NullProgressMonitor());
}
}
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=430174&r1=430173&r2=430174&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 Wed Aug 9 15:49:50 2006
@@ -22,7 +22,7 @@
initialState="stopped" supportsRemoteHosts="true"
startTimeout="240000" stopTimeout="30000" startBeforePublish="true"
runtimeTypeId="org.apache.geronimo.generic.runtime.10"
- launchConfigId="org.eclipse.jst.server.generic.core.launchConfigurationType"
+ launchConfigId="org.apache.geronimo.st.core.launchConfigurationType"
behaviourClass="org.apache.geronimo.st.v1.core.GeronimoServerBehaviour"
hasConfiguration="false" launchModes="run,debug">
</serverType>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoRuntime.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoRuntime.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoRuntime.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoRuntime.java Wed Aug 9 15:49:50 2006
@@ -20,7 +20,7 @@
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.schema.SchemaConversionUtils;
-import org.apache.geronimo.st.core.GenericGeronimoServerRuntime;
+import org.apache.geronimo.st.core.GeronimoRuntimeDelegate;
import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
import org.apache.geronimo.xbeans.geronimo.GerConnectorType;
import org.apache.geronimo.xbeans.geronimo.j2ee.GerApplicationDocument;
@@ -33,7 +33,7 @@
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
-public class GeronimoRuntime extends GenericGeronimoServerRuntime {
+public class GeronimoRuntime extends GeronimoRuntimeDelegate {
/*
* (non-Javadoc)
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServer.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServer.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServer.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServer.java Wed Aug 9 15:49:50 2006
@@ -20,12 +20,12 @@
import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
import org.apache.geronimo.deployment.plugin.jmx.JMXDeploymentManager;
-import org.apache.geronimo.st.core.GenericGeronimoServer;
+import org.apache.geronimo.st.core.GeronimoServerDelegate;
import org.apache.geronimo.st.core.IGeronimoVersionHandler;
import org.eclipse.core.runtime.IPath;
import org.eclipse.wst.server.core.IModule;
-public class GeronimoServer extends GenericGeronimoServer {
+public class GeronimoServer extends GeronimoServerDelegate {
private static IGeronimoVersionHandler versionHandler = null;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServerBehaviour.java Wed Aug 9 15:49:50 2006
@@ -39,7 +39,7 @@
import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.config.PersistentConfigurationList;
import org.apache.geronimo.kernel.jmx.KernelDelegate;
-import org.apache.geronimo.st.core.GenericGeronimoServerBehaviour;
+import org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate;
import org.apache.geronimo.st.core.GeronimoConnectionFactory;
import org.apache.geronimo.st.core.GeronimoUtils;
import org.apache.geronimo.st.v1.core.internal.Trace;
@@ -50,7 +50,7 @@
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.internal.IModulePublishHelper;
-public class GeronimoServerBehaviour extends GenericGeronimoServerBehaviour implements IModulePublishHelper {
+public class GeronimoServerBehaviour extends GeronimoServerBehaviourDelegate implements IModulePublishHelper {
private Kernel kernel = null;
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=430174&r1=430173&r2=430174&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 Wed Aug 9 15:49:50 2006
@@ -22,7 +22,7 @@
initialState="stopped" supportsRemoteHosts="true"
startTimeout="240000" stopTimeout="30000" startBeforePublish="true"
runtimeTypeId="org.apache.geronimo.generic.runtime.11"
- launchConfigId="org.eclipse.jst.server.generic.core.launchConfigurationType"
+ launchConfigId="org.apache.geronimo.st.core.launchConfigurationType"
behaviourClass="org.apache.geronimo.st.v11.core.GeronimoServerBehaviour"
hasConfiguration="false" launchModes="run,debug">
</serverType>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.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/GeronimoRuntime.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java Wed Aug 9 15:49:50 2006
@@ -20,7 +20,7 @@
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.schema.SchemaConversionUtils;
-import org.apache.geronimo.st.core.GenericGeronimoServerRuntime;
+import org.apache.geronimo.st.core.GeronimoRuntimeDelegate;
import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
import org.apache.geronimo.xbeans.geronimo.GerConnectorType;
import org.apache.geronimo.xbeans.geronimo.j2ee.GerApplicationDocument;
@@ -33,7 +33,7 @@
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
-public class GeronimoRuntime extends GenericGeronimoServerRuntime {
+public class GeronimoRuntime extends GeronimoRuntimeDelegate {
/*
* (non-Javadoc)
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=430174&r1=430173&r2=430174&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 Wed Aug 9 15:49:50 2006
@@ -20,14 +20,14 @@
import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
import org.apache.geronimo.deployment.plugin.jmx.JMXDeploymentManager;
-import org.apache.geronimo.st.core.GenericGeronimoServer;
+import org.apache.geronimo.st.core.GeronimoServerDelegate;
import org.apache.geronimo.st.core.IGeronimoVersionHandler;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.util.SocketUtil;
-public class GeronimoServer extends GenericGeronimoServer {
+public class GeronimoServer extends GeronimoServerDelegate {
public static final String PROPERTY_PERSISTENT = "persistent";
public static final String PROPERTY_IN_PLACE = "inPlace";
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.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/GeronimoServerBehaviour.java?rev=430174&r1=430173&r2=430174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java Wed Aug 9 15:49:50 2006
@@ -40,7 +40,7 @@
import org.apache.geronimo.kernel.config.InvalidConfigException;
import org.apache.geronimo.kernel.config.PersistentConfigurationList;
import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.st.core.GenericGeronimoServerBehaviour;
+import org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate;
import org.apache.geronimo.st.core.GeronimoConnectionFactory;
import org.apache.geronimo.st.jmxagent.Activator;
import org.apache.geronimo.st.jmxagent.JMXAgent;
@@ -56,7 +56,7 @@
import org.eclipse.wst.server.core.internal.IModulePublishHelper;
import org.eclipse.wst.server.core.util.SocketUtil;
-public class GeronimoServerBehaviour extends GenericGeronimoServerBehaviour implements IModulePublishHelper {
+public class GeronimoServerBehaviour extends GeronimoServerBehaviourDelegate implements IModulePublishHelper {
static {
try {