You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/11/09 02:34:03 UTC
svn commit: r1032804 - in /geronimo/server/trunk/framework:
configs/jsr88-cli/src/main/plan/
configs/rmi-naming/src/main/resources/OSGI-INF/blueprint/
modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/
modules/...
Author: xuhaihong
Date: Tue Nov 9 01:34:02 2010
New Revision: 1032804
URL: http://svn.apache.org/viewvc?rev=1032804&view=rev
Log:
GERONIMO-5579 a. Wrap the default rmi urlContextFactory b. Enable multiple RemoteDeploymentManager in the same vm of the server runtime
Added:
geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/rmi/
geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/rmi/rmiURLContextFactory.java (with props)
Modified:
geronimo/server/trunk/framework/configs/jsr88-cli/src/main/plan/plan.xml
geronimo/server/trunk/framework/configs/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java
geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java
geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java
geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OnlineServerConnection.java
geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/AbstractURLContextFactory.java
geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java
Modified: geronimo/server/trunk/framework/configs/jsr88-cli/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/plan/plan.xml?rev=1032804&r1=1032803&r2=1032804&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/src/main/plan/plan.xml Tue Nov 9 01:34:02 2010
@@ -20,29 +20,8 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
- <gbean name="DeployTool" class="org.apache.geronimo.deployment.cli.DeployTool" >
- <reference name="DeploymentFactory">
- <name>DeploymentFactory</name>
- </reference>
- </gbean>
+ <gbean name="DeployTool" class="org.apache.geronimo.deployment.cli.DeployTool" />
<gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" />
- <gbean name="ModuleConfigurerRegistry" class="org.apache.geronimo.deployment.plugin.jmx.RemoteDeploymentManager">
- <references name="ModuleConfigurers">
- <pattern>
- <name>ClientConfigurer</name>
- </pattern>
- <pattern>
- <name>EARConfigurer</name>
- </pattern>
- <pattern>
- <name>RARConfigurer</name>
- </pattern>
- <pattern>
- <name>WARConfigurer</name>
- </pattern>
- </references>
- </gbean>
-
</module>
Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml?rev=1032804&r1=1032803&r2=1032804&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/resources/OSGI-INF/blueprint/naming-providers.xml Tue Nov 9 01:34:02 2010
@@ -71,8 +71,10 @@ limitations under the License.
<service-properties>
<entry key="osgi.jndi.url.scheme" value="rmi"/>
</service-properties>
- <bean class="com.sun.jndi.url.rmi.rmiURLContextFactory"/>
+ <bean class="org.apache.geronimo.naming.rmi.rmiURLContextFactory">
+ <argument ref="blueprintBundle"/>
+ <argument value="com.sun.jndi.url.rmi.rmiURLContextFactory"/>
+ </bean>
</service>
-
</blueprint>
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java?rev=1032804&r1=1032803&r2=1032804&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java Tue Nov 9 01:34:02 2010
@@ -21,16 +21,12 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
-import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
-import javax.enterprise.deploy.spi.factories.DeploymentFactory;
import javax.enterprise.deploy.shared.factories.DeploymentFactoryManager;
+import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
import org.apache.geronimo.deployment.spi.ModuleConfigurer;
-import org.apache.geronimo.deployment.plugin.jmx.RemoteDeploymentManager;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.annotation.GBean;
import org.apache.geronimo.gbean.annotation.ParamSpecial;
import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
@@ -43,22 +39,17 @@ import org.apache.geronimo.kernel.Kernel
*/
@GBean(j2eeType = "DeploymentFactory")
public class DeploymentFactoryWithKernel extends BaseDeploymentFactory {
+
private final Kernel kernel;
- private final RemoteDeploymentManager remoteDeploymentManager;
-
- public DeploymentFactoryWithKernel(@ParamSpecial(type = SpecialAttributeType.kernel)Kernel kernel) {
- this(kernel, null);
- }
- public DeploymentFactoryWithKernel(Kernel kernel, RemoteDeploymentManager remoteDeploymentManager) {
+ public DeploymentFactoryWithKernel(@ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel) {
if (null == kernel) {
throw new IllegalArgumentException("kernel is required");
}
this.kernel = kernel;
- this.remoteDeploymentManager = remoteDeploymentManager;
DeploymentFactoryManager.getInstance().registerDeploymentFactory(this);
}
-
+
protected Collection<ModuleConfigurer> getModuleConfigurers() throws DeploymentManagerCreationException {
Collection<ModuleConfigurer> moduleConfigurers = new ArrayList<ModuleConfigurer>();
Set<AbstractName> configurerNames = kernel.listGBeans(new AbstractNameQuery(ModuleConfigurer.class.getName()));
@@ -67,21 +58,10 @@ public class DeploymentFactoryWithKernel
ModuleConfigurer configurer = (ModuleConfigurer) kernel.getGBean(configurerName);
moduleConfigurers.add(configurer);
} catch (GBeanNotFoundException e) {
- throw (AssertionError)new AssertionError("No gbean found for name returned in query : " + configurerName).initCause(e);
+ throw (AssertionError) new AssertionError("No gbean found for name returned in query : " + configurerName).initCause(e);
}
}
return moduleConfigurers;
}
-
- protected RemoteDeploymentManager getRemoteDeploymentManager() throws DeploymentManagerCreationException {
- if (remoteDeploymentManager != null) {
- return remoteDeploymentManager;
- }
- try {
- return kernel.getGBean(RemoteDeploymentManager.class);
- } catch (Exception e) {
- throw (DeploymentManagerCreationException) new DeploymentManagerCreationException("See nested").initCause(e);
- }
- }
}
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java?rev=1032804&r1=1032803&r2=1032804&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java Tue Nov 9 01:34:02 2010
@@ -35,23 +35,22 @@ import org.apache.geronimo.kernel.Kernel
* @version $Rev$ $Date$
*/
public class LocalDeploymentManager extends ExtendedDeploymentManager {
-
+
private static final Logger log = LoggerFactory.getLogger(LocalDeploymentManager.class);
-
+
private static final AbstractNameQuery CONFIGURER_QUERY = new AbstractNameQuery(ModuleConfigurer.class.getName());
public LocalDeploymentManager(Kernel kernel) throws IOException {
super(loadModuleConfigurers(kernel));
initialize(kernel);
}
-
+
private static Collection<ModuleConfigurer> loadModuleConfigurers(Kernel kernel) {
Collection<ModuleConfigurer> moduleConfigurers = new ArrayList<ModuleConfigurer>();
- Set configurerNames = kernel.listGBeans(CONFIGURER_QUERY);
- for (Object configurerName : configurerNames) {
- AbstractName name = (AbstractName) configurerName;
+ Set<AbstractName> configurerNames = kernel.listGBeans(CONFIGURER_QUERY);
+ for (AbstractName configurerName : configurerNames) {
try {
- Object o = kernel.getGBean(name);
+ Object o = kernel.getGBean(configurerName);
if (!(o instanceof ModuleConfigurer)) {
log.error("Gbean classloader: " + o.getClass().getClassLoader());
log.error("ModuleConfigurer classloader: " + ModuleConfigurer.class.getClassLoader());
@@ -59,10 +58,10 @@ public class LocalDeploymentManager exte
ModuleConfigurer configurer = (ModuleConfigurer) o;
moduleConfigurers.add(configurer);
} catch (GBeanNotFoundException e) {
- log.warn("No gbean found for name returned in query : " + name);
+ log.warn("No gbean found for name returned in query : " + configurerName);
}
}
return moduleConfigurers;
}
-
+
}
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java?rev=1032804&r1=1032803&r2=1032804&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java Tue Nov 9 01:34:02 2010
@@ -72,7 +72,7 @@ public class RemoteDeploymentManager ext
public JMXConnector getJMXConnector() {
return this.jmxConnector;
}
-
+
public boolean isSameMachine() {
return isSameMachine;
}
@@ -85,12 +85,12 @@ public class RemoteDeploymentManager ext
}
try {
InetAddress dest = InetAddress.getByName(hostname);
- Enumeration en = NetworkInterface.getNetworkInterfaces();
+ Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces();
while (en.hasMoreElements()) {
- NetworkInterface iface = (NetworkInterface) en.nextElement();
- Enumeration ine = iface.getInetAddresses();
+ NetworkInterface iface = en.nextElement();
+ Enumeration<InetAddress> ine = iface.getInetAddresses();
while (ine.hasMoreElements()) {
- InetAddress address = (InetAddress) ine.nextElement();
+ InetAddress address = ine.nextElement();
if (address.equals(dest)) {
isSameMachine = true;
}
@@ -112,7 +112,7 @@ public class RemoteDeploymentManager ext
throw (IllegalStateException) new IllegalStateException("Unable to close connection").initCause(e);
}
}
-
+
@Override
protected <T> T getImplementation(AbstractName name, Class<T> clazz) {
return kernel.getProxyManager().createProxy(name, clazz);
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java?rev=1032804&r1=1032803&r2=1032804&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/DeployTool.java Tue Nov 9 01:34:02 2010
@@ -27,8 +27,6 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import javax.enterprise.deploy.spi.factories.DeploymentFactory;
-
import org.apache.geronimo.cli.deployer.CommandArgs;
import org.apache.geronimo.cli.deployer.CommandFileCommandMetaData;
import org.apache.geronimo.cli.deployer.CommandMetaData;
@@ -97,16 +95,12 @@ public class DeployTool implements Main
ServerConnection con = null;
private boolean multipleCommands = false;
private final Kernel kernel;
- private final DeploymentFactory deploymentFactory;
- public DeployTool(Kernel kernel, DeploymentFactory deploymentFactory) {
+ public DeployTool(Kernel kernel) {
if (null == kernel) {
throw new IllegalArgumentException("kernel is required");
- } else if (null == deploymentFactory) {
- throw new IllegalArgumentException("deploymentFactory is required");
}
this.kernel = kernel;
- this.deploymentFactory = deploymentFactory;
}
public int execute(Object opaque) {
@@ -166,7 +160,7 @@ public class DeployTool implements Main
if (parser.isOffline()) {
con = new OfflineServerConnection(kernel, true);
} else {
- con = new OnlineServerConnection(parser, consoleReader, deploymentFactory);
+ con = new OnlineServerConnection(parser, consoleReader);
}
}
try {
@@ -227,10 +221,9 @@ public class DeployTool implements Main
static {
GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic("DeployTool", DeployTool.class, "DeployTool");
- infoBuilder.addReference(GBEAN_REF_DEPLOYMENT_FACTORY, DeploymentFactory.class);
infoBuilder.addInterface(Main.class);
- infoBuilder.setConstructor(new String[] {"kernel", GBEAN_REF_DEPLOYMENT_FACTORY});
+ infoBuilder.setConstructor(new String[] {"kernel"});
GBEAN_INFO = infoBuilder.getBeanInfo();
}
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OnlineServerConnection.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OnlineServerConnection.java?rev=1032804&r1=1032803&r2=1032804&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OnlineServerConnection.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OnlineServerConnection.java Tue Nov 9 01:34:02 2010
@@ -40,20 +40,17 @@ import org.apache.geronimo.kernel.util.J
*/
public class OnlineServerConnection extends ServerConnection {
- private final DeploymentFactory geronimoDeploymentFactory;
-
private final ServerConnection.UsernamePasswordHandler handler;
-
+
private boolean logToSysErr;
private boolean verboseMessages;
- public OnlineServerConnection(ConnectionParams params, ConsoleReader consoleReader, DeploymentFactory geronimoDeploymentFactory) throws DeploymentException {
- this(params, new DefaultUserPasswordHandler(consoleReader), geronimoDeploymentFactory);
+ public OnlineServerConnection(ConnectionParams params, ConsoleReader consoleReader) throws DeploymentException {
+ this(params, new DefaultUserPasswordHandler(consoleReader));
}
- public OnlineServerConnection(ConnectionParams params, ServerConnection.UsernamePasswordHandler handler, DeploymentFactory geronimoDeploymentFactory) throws DeploymentException {
- this.geronimoDeploymentFactory = geronimoDeploymentFactory;
+ public OnlineServerConnection(ConnectionParams params, ServerConnection.UsernamePasswordHandler handler) throws DeploymentException {
this.handler = handler;
String uri = params.getURI();
String driver = params.getDriver();
@@ -64,7 +61,7 @@ public class OnlineServerConnection exte
verboseMessages = params.isVerbose();
logToSysErr = params.isSyserr();
boolean secure = params.isSecure();
-
+
if ((driver != null) && uri == null) {
throw new DeploymentSyntaxException("A custom driver requires a custom URI");
}
@@ -74,7 +71,7 @@ public class OnlineServerConnection exte
if (host != null || port != null) {
uri = DeployUtils.getConnectionURI(host, port, secure);
}
-
+
ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(DeployUtils.class.getClassLoader());
try {
@@ -91,8 +88,6 @@ public class OnlineServerConnection exte
DeploymentFactoryManager mgr = DeploymentFactoryManager.getInstance();
if (driver != null) {
loadDriver(driver, mgr);
- } else {
- mgr.registerDeploymentFactory(geronimoDeploymentFactory);
}
String useURI = argURI == null ? DeployUtils.getConnectionURI(null, null, secure) : argURI;
if (user == null && password == null) {
Modified: geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/AbstractURLContextFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/AbstractURLContextFactory.java?rev=1032804&r1=1032803&r2=1032804&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/AbstractURLContextFactory.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/AbstractURLContextFactory.java Tue Nov 9 01:34:02 2010
@@ -48,7 +48,8 @@ public abstract class AbstractURLContext
}
}
}
- throw new NamingException("Could not locate a way to look up " + o + " in url context for " + urlScheme);
+ return null;
+ //throw new NamingException("Could not locate a way to look up " + o + " in url context for " + urlScheme);
}
protected abstract Context getContext() throws NamingException;
Added: geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/rmi/rmiURLContextFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/rmi/rmiURLContextFactory.java?rev=1032804&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/rmi/rmiURLContextFactory.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/rmi/rmiURLContextFactory.java Tue Nov 9 01:34:02 2010
@@ -0,0 +1,55 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.naming.rmi;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.spi.ObjectFactory;
+
+import org.osgi.framework.Bundle;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class rmiURLContextFactory implements ObjectFactory {
+
+ private ObjectFactory rmiObjectFactory;
+
+ public rmiURLContextFactory(Bundle bundle, String rmiClassName) {
+ try {
+ rmiObjectFactory = (ObjectFactory) bundle.loadClass(rmiClassName).newInstance();
+ } catch (InstantiationException e) {
+ throw new IllegalArgumentException("Fail to load the wrap rmi context factory " + rmiClassName);
+ } catch (IllegalAccessException e) {
+ throw new IllegalArgumentException("Fail to load the wrap rmi context factory " + rmiClassName);
+ } catch (ClassNotFoundException e) {
+ throw new IllegalArgumentException("Fail to load the wrap rmi context factory " + rmiClassName);
+ }
+ }
+
+ @Override
+ public Object getObjectInstance(Object object, Name name, Context context, Hashtable<?, ?> environment) throws Exception {
+ if (object == null || object instanceof String || object instanceof String[]) {
+ return rmiObjectFactory.getObjectInstance(object, name, context, environment);
+ }
+ return null;
+ }
+
+}
Propchange: geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/rmi/rmiURLContextFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/rmi/rmiURLContextFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/modules/geronimo-naming/src/main/java/org/apache/geronimo/naming/rmi/rmiURLContextFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java?rev=1032804&r1=1032803&r2=1032804&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java Tue Nov 9 01:34:02 2010
@@ -144,9 +144,8 @@ public class ConnectCommand extends Base
println("Connecting to Geronimo server: " + hostname + ":" + port);
}
- BaseDeploymentFactory deploymentFactory = new BaseDeploymentFactory();
ConnectionParamsImpl connectionParams = new ConnectionParamsImpl(null, hostname, port, null, username, password, false, false, false, secure);
- connection = new OnlineServerConnection(connectionParams, new ShellUserPasswordHandler(session), deploymentFactory);
+ connection = new OnlineServerConnection(connectionParams, new ShellUserPasswordHandler(session));
}
// Disconnect previous connection if any