geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r405500 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/ org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/ org.apache.geronimo.st.v11.core/src/org/apache/ger...
Date Tue, 09 May 2006 18:58:26 GMT
Author: sppatel
Date: Tue May  9 11:58:24 2006
New Revision: 405500

URL: http://svn.apache.org/viewcvs?rev=405500&view=rev
Log:
deploymentfactory being registered on server side, fixes provider conflicts

Modified:
    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.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/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=405500&r1=405499&r2=405500&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
Tue May  9 11:58:24 2006
@@ -3,7 +3,6 @@
 import java.util.HashMap;
 import java.util.Iterator;
 
-import javax.enterprise.deploy.shared.factories.DeploymentFactoryManager;
 import javax.enterprise.deploy.spi.DeploymentManager;
 import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
 import javax.enterprise.deploy.spi.factories.DeploymentFactory;
@@ -36,14 +35,12 @@
 		DeploymentManager dm = (DeploymentManager) connections.get(server.getId());
 
 		if (dm == null) {
-			DeploymentFactoryManager mgr = DeploymentFactoryManager.getInstance();
 			DeploymentFactory factory = getGeronimoServer(server).getDeploymentFactory();
-			mgr.registerDeploymentFactory(factory);
 			String deployerURL = getGeronimoServer(server).getDeployerURL();
 			Trace.trace(Trace.INFO, "DeployerURL: " + deployerURL);
 			String user = getGeronimoServer(server).getAdminID();
 			String pw = getGeronimoServer(server).getAdminPassword();
-			dm = mgr.getDeploymentManager(deployerURL, user, pw);
+			dm = factory.getDeploymentManager(deployerURL, user, pw);
 			connections.put(server.getId(), dm);
 		}
 		

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=405500&r1=405499&r2=405500&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
Tue May  9 11:58:24 2006
@@ -28,6 +28,13 @@
 public class GeronimoServer extends GenericGeronimoServer {
 
 	private static IGeronimoVersionHandler versionHandler = null;
+	
+	private static DeploymentFactory deploymentFactory;
+	
+	static {
+		deploymentFactory = new DeploymentFactoryImpl();
+	}
+	
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -107,7 +114,7 @@
 	 * @see org.apache.geronimo.st.core.IGeronimoServer#getDeploymentFactory()
 	 */
 	public DeploymentFactory getDeploymentFactory() {
-		return new DeploymentFactoryImpl();
+		return deploymentFactory;
 	}
 
 	/*

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=405500&r1=405499&r2=405500&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
Tue May  9 11:58:24 2006
@@ -29,6 +29,12 @@
 public class GeronimoServer extends GenericGeronimoServer {
 
 	private static IGeronimoVersionHandler versionHandler = null;
+	
+	private static DeploymentFactory deploymentFactory;
+	
+	static {
+		deploymentFactory = new DeploymentFactoryImpl();
+	}
 
 	/*
 	 * (non-Javadoc)
@@ -100,7 +106,7 @@
 	 * @see org.apache.geronimo.st.core.IGeronimoServer#getDeploymentFactory()
 	 */
 	public DeploymentFactory getDeploymentFactory() {
-		return new DeploymentFactoryImpl();
+		return deploymentFactory;
 	}
 
 	/*



Mime
View raw message