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/05/01 16:34:46 UTC
svn commit: r398604 - in /geronimo/devtools/eclipse-plugin/trunk:
config-store-service/
plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/
plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/
plugins/org.apache.g...
Author: sppatel
Date: Mon May 1 07:34:44 2006
New Revision: 398604
URL: http://svn.apache.org/viewcvs?rev=398604&view=rev
Log:
add isTestEnvironment to interface
Modified:
geronimo/devtools/eclipse-plugin/trunk/config-store-service/pom.xml
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/GeronimoConnectionFactory.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.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServer.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServer.java
Modified: geronimo/devtools/eclipse-plugin/trunk/config-store-service/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/config-store-service/pom.xml?rev=398604&r1=398603&r2=398604&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/config-store-service/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/config-store-service/pom.xml Mon May 1 07:34:44 2006
@@ -3,7 +3,7 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>config-store-service</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<name>Eclipse Aware Configuration Store Service</name>
<dependencies>
<dependency>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerBehaviour.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerBehaviour.java?rev=398604&r1=398603&r2=398604&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerBehaviour.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerBehaviour.java Mon May 1 07:34:44 2006
@@ -208,7 +208,7 @@
protected IStatus distribute(IModule module) throws Exception {
IDeploymentCommand cmd = DeploymentCommandFactory
- .createDistributeCommand(module, getServer(), true);
+ .createDistributeCommand(module, getServer(), getGeronimoServer().isTestEnvironment());
return cmd.execute(_monitor);
}
@@ -234,7 +234,7 @@
protected IStatus reDeploy(IModule module) throws Exception {
IDeploymentCommand cmd = DeploymentCommandFactory
- .createRedeployCommand(module, getServer(), true);
+ .createRedeployCommand(module, getServer(), getGeronimoServer().isTestEnvironment());
return cmd.execute(_monitor);
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoConnectionFactory.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoConnectionFactory.java?rev=398604&r1=398603&r2=398604&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoConnectionFactory.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoConnectionFactory.java Mon May 1 07:34:44 2006
@@ -44,9 +44,11 @@
String user = getGeronimoServer(server).getAdminID();
String pw = getGeronimoServer(server).getAdminPassword();
dm = mgr.getDeploymentManager(deployerURL, user, pw);
- getGeronimoServer(server).configureDeploymentManager(dm);
connections.put(server.getId(), dm);
}
+
+ getGeronimoServer(server).configureDeploymentManager(dm);
+
return dm;
}
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/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoServer.java?rev=398604&r1=398603&r2=398604&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 Mon May 1 07:34:44 2006
@@ -39,5 +39,7 @@
public void configureDeploymentManager(DeploymentManager dm);
public IGeronimoVersionHandler getVersionHandler();
+
+ public boolean isTestEnvironment();
}
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/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoServer.java?rev=398604&r1=398603&r2=398604&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 Mon May 1 07:34:44 2006
@@ -120,5 +120,9 @@
versionHandler = new GeronimoV1VersionHandler();
return versionHandler;
}
+
+ public boolean isTestEnvironment() {
+ return false;
+ }
}
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/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoServer.java?rev=398604&r1=398603&r2=398604&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 Mon May 1 07:34:44 2006
@@ -16,16 +16,15 @@
package org.apache.geronimo.st.v11.core;
import javax.enterprise.deploy.spi.DeploymentManager;
-import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
import javax.enterprise.deploy.spi.factories.DeploymentFactory;
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.GeronimoConnectionFactory;
import org.apache.geronimo.st.core.IGeronimoVersionHandler;
import org.eclipse.core.runtime.IPath;
import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.util.SocketUtil;
public class GeronimoServer extends GenericGeronimoServer {
@@ -73,8 +72,7 @@
* @see org.apache.geronimo.st.core.IGeronimoServer#getDeployerURL()
*/
public String getDeployerURL() {
- return "deployer:geronimo:jmx://" + getServer().getHost() + ":"
- + getRMINamingPort();
+ return "deployer:geronimo:jmx://" + getServer().getHost() + ":" + getRMINamingPort();
}
/*
@@ -84,8 +82,7 @@
*/
public String getJMXServiceURL() {
String host = getServer().getHost();
- return "service:jmx:rmi://" + host + "/jndi/rmi://" + host + ":"
- + getRMINamingPort() + "/JMXConnector";
+ return "service:jmx:rmi://" + host + "/jndi/rmi://" + host + ":" + getRMINamingPort() + "/JMXConnector";
}
/*
@@ -94,8 +91,7 @@
* @see org.apache.geronimo.st.core.IGeronimoServer#getJSR88DeployerJar()
*/
public IPath getJSR88DeployerJar() {
- return getServer().getRuntime().getLocation().append(
- "/lib/geronimo-deploy-jsr88-1.1-SNAPSHOT.jar");
+ return getServer().getRuntime().getLocation().append("/lib/geronimo-deploy-jsr88-1.1-SNAPSHOT.jar");
}
/*
@@ -114,6 +110,8 @@
*/
public void configureDeploymentManager(DeploymentManager dm) {
((JMXDeploymentManager) dm).setLogConfiguration(true, true);
+ boolean enableInPlace = SocketUtil.isLocalhost(getServer().getHost());
+ setInPlaceDeployment(dm, enableInPlace);
}
/*
@@ -127,14 +125,12 @@
return versionHandler;
}
- public void setInPlaceDeployment(boolean enable) {
- try {
- JMXDeploymentManager mgr = (JMXDeploymentManager) GeronimoConnectionFactory
- .getInstance().getDeploymentManager(getServer());
- mgr.setInPlace(enable);
- } catch (DeploymentManagerCreationException e) {
- e.printStackTrace();
- }
+ public void setInPlaceDeployment(DeploymentManager dm, boolean enable) {
+ ((JMXDeploymentManager) dm).setInPlace(enable);
+ }
+
+ public boolean isTestEnvironment() {
+ return true;
}
}