geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r494701 - in /geronimo/server/branches/1.2: assemblies/geronimo-boilerplate-minimal/ modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ modules/geronimo-connector-builder/src/main/java/org/apache/geronim...
Date Wed, 10 Jan 2007 04:11:54 GMT
Author: djencks
Date: Tue Jan  9 20:11:53 2007
New Revision: 494701

URL: http://svn.apache.org/viewvc?view=rev&rev=494701
Log:
GERONIMO-2686 Don't try to run jsr88 remotely since it won't work anyway

Modified:
    geronimo/server/branches/1.2/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/branches/1.2/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java
    geronimo/server/branches/1.2/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/RARConfigurer.java
    geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
    geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java
    geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java
    geronimo/server/branches/1.2/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/WARConfigurer.java

Modified: geronimo/server/branches/1.2/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/assemblies/geronimo-boilerplate-minimal/pom.xml?view=diff&rev=494701&r1=494700&r2=494701
==============================================================================
--- geronimo/server/branches/1.2/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/branches/1.2/assemblies/geronimo-boilerplate-minimal/pom.xml Tue Jan 
9 20:11:53 2007
@@ -126,11 +126,6 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-deploy-config</artifactId>
-                                    <version>${version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
                                     <artifactId>geronimo-kernel</artifactId>
                                     <version>${version}</version>
                                 </artifactItem>

Modified: geronimo/server/branches/1.2/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java?view=diff&rev=494701&r1=494700&r2=494701
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java
(original)
+++ geronimo/server/branches/1.2/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/jsr88/ClientConfigurer.java
Tue Jan  9 20:11:53 2007
@@ -20,8 +20,6 @@
 
 package org.apache.geronimo.client.builder.jsr88;
 
-import java.io.Serializable;
-
 import javax.enterprise.deploy.spi.DeploymentConfiguration;
 import javax.enterprise.deploy.model.DeployableObject;
 import javax.enterprise.deploy.shared.ModuleType;
@@ -38,7 +36,7 @@
  *
  * @version $Rev$ $Date$
  */
-public class ClientConfigurer implements ModuleConfigurer, Serializable {
+public class ClientConfigurer implements ModuleConfigurer {
     public DeploymentConfiguration createConfiguration(DeployableObject deployable) {
         if (ModuleType.EAR.equals(deployable.getType())) {
             return new EARConfiguration(deployable);

Modified: geronimo/server/branches/1.2/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/RARConfigurer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/RARConfigurer.java?view=diff&rev=494701&r1=494700&r2=494701
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/RARConfigurer.java
(original)
+++ geronimo/server/branches/1.2/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/RARConfigurer.java
Tue Jan  9 20:11:53 2007
@@ -17,8 +17,6 @@
 
 package org.apache.geronimo.connector.deployment;
 
-import java.io.Serializable;
-
 import javax.enterprise.deploy.model.DeployableObject;
 import javax.enterprise.deploy.shared.ModuleType;
 import javax.enterprise.deploy.spi.DeploymentConfiguration;
@@ -36,7 +34,7 @@
  *
  * @version $Rev$ $Date$
  */
-public class RARConfigurer implements ModuleConfigurer, Serializable {
+public class RARConfigurer implements ModuleConfigurer {
 
     public DeploymentConfiguration createConfiguration(DeployableObject deployable) {
         if (ModuleType.RAR.equals(deployable.getType())) {

Modified: geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java?view=diff&rev=494701&r1=494700&r2=494701
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
(original)
+++ geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
Tue Jan  9 20:11:53 2007
@@ -65,27 +65,16 @@
  */
 public abstract class JMXDeploymentManager implements DeploymentManager {
     private static final Log log = LogFactory.getLog(JMXDeploymentManager.class);
-    private static final AbstractNameQuery CONFIGURER_QUERY = new AbstractNameQuery(ModuleConfigurer.class.getName());
 
     protected Kernel kernel;
     private ConfigurationManager configurationManager;
     private CommandContext commandContext;
-    private Map moduleConfigurers = new HashMap();
+    protected Map moduleConfigurers = new HashMap();
 
     protected void initialize(Kernel kernel) {
         this.kernel = kernel;
         configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
         commandContext = new CommandContext(true, true, null, null, false);
-        Set configurerNames = kernel.listGBeans(CONFIGURER_QUERY);
-        for (Iterator iterator = configurerNames.iterator(); iterator.hasNext(); ) {
-            AbstractName name = (AbstractName) iterator.next();
-            try {
-                ModuleConfigurer configurer = (ModuleConfigurer) kernel.getGBean(name);
-                moduleConfigurers.put(configurer.getModuleType(), configurer);
-            } catch (GBeanNotFoundException e) {
-                log.warn("No gbean found for name returned in query : " + name);
-            }
-        }
     }
 
     public void setAuthentication(String username, String password) {

Modified: geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java?view=diff&rev=494701&r1=494700&r2=494701
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java
(original)
+++ geronimo/server/branches/1.2/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java
Tue Jan  9 20:11:53 2007
@@ -16,7 +16,16 @@
  */
 package org.apache.geronimo.deployment.plugin.jmx;
 
+import java.util.Iterator;
+import java.util.Set;
+
 import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.deployment.ModuleConfigurer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Connects to a kernel in the same VM.
@@ -24,7 +33,20 @@
  * @version $Rev$ $Date$
  */
 public class LocalDeploymentManager extends JMXDeploymentManager {
+    private static final Log log = LogFactory.getLog(LocalDeploymentManager.class);
+    private static final AbstractNameQuery CONFIGURER_QUERY = new AbstractNameQuery(ModuleConfigurer.class.getName());
+
     public LocalDeploymentManager(Kernel kernel) {
         initialize(kernel);
+        Set configurerNames = kernel.listGBeans(CONFIGURER_QUERY);
+        for (Iterator i = configurerNames.iterator(); i.hasNext(); ) {
+            AbstractName name = (AbstractName) i.next();
+            try {
+                ModuleConfigurer configurer = (ModuleConfigurer) kernel.getGBean(name);
+                moduleConfigurers.put(configurer.getModuleType(), configurer);
+            } catch (GBeanNotFoundException e) {
+                log.warn("No gbean found for name returned in query : " + name);
+            }
+        }
     }
 }

Modified: geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java?view=diff&rev=494701&r1=494700&r2=494701
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java
(original)
+++ geronimo/server/branches/1.2/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/jsr88/EARConfigurer.java
Tue Jan  9 20:11:53 2007
@@ -17,8 +17,6 @@
 
 package org.apache.geronimo.j2ee.jsr88;
 
-import java.io.Serializable;
-
 import javax.enterprise.deploy.model.DeployableObject;
 import javax.enterprise.deploy.shared.ModuleType;
 import javax.enterprise.deploy.spi.DeploymentConfiguration;
@@ -34,7 +32,7 @@
  *
  * @version $Rev$ $Date$
  */
-public class EARConfigurer implements ModuleConfigurer, Serializable {
+public class EARConfigurer implements ModuleConfigurer {
     public DeploymentConfiguration createConfiguration(DeployableObject deployable) {
         if (ModuleType.EAR.equals(deployable.getType())) {
             return new EARConfiguration(deployable);

Modified: geronimo/server/branches/1.2/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/WARConfigurer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/WARConfigurer.java?view=diff&rev=494701&r1=494700&r2=494701
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/WARConfigurer.java
(original)
+++ geronimo/server/branches/1.2/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/WARConfigurer.java
Tue Jan  9 20:11:53 2007
@@ -17,8 +17,6 @@
 
 package org.apache.geronimo.web.deployment;
 
-import java.io.Serializable;
-
 import javax.enterprise.deploy.model.DeployableObject;
 import javax.enterprise.deploy.shared.ModuleType;
 import javax.enterprise.deploy.spi.DeploymentConfiguration;
@@ -31,7 +29,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class WARConfigurer implements ModuleConfigurer, Serializable {
+public class WARConfigurer implements ModuleConfigurer {
     public DeploymentConfiguration createConfiguration(DeployableObject deployable) {
         if (ModuleType.WAR.equals(deployable.getType())) {
             return new WARConfiguration(deployable);



Mime
View raw message