geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: rev 47416 - in geronimo/trunk/modules: client-builder/src/java/org/apache/geronimo/client/builder connector/src/java/org/apache/geronimo/connector/deployment deployment/src/java/org/apache/geronimo/deployment j2ee/src/java/org/apache/geronimo/j2ee/deployment jetty/src/java/org/apache/geronimo/jetty/deployment
Date Tue, 28 Sep 2004 20:32:54 GMT
Author: dain
Date: Tue Sep 28 13:32:53 2004
New Revision: 47416

Modified:
   geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
   geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
   geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
   geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
   geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Log:
Changed module builders to return the name of any child configurations deployed... this is
null for all module types except application client
Changed config builders to return a list of all child configurations deployed


Modified: geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
==============================================================================
--- geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
(original)
+++ geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Tue Sep 28 13:32:53 2004
@@ -416,11 +416,10 @@
         }
 
         try {
-            store.install(appClientConfiguration.toURL());
+            return store.install(appClientConfiguration.toURL()).toString();
         } catch (Exception e) {
             throw new DeploymentException(e);
         }
-        return appClientModuleName.getCanonicalName();
     }
 
     private ReadOnlyContext buildComponentContext(EARContext earContext, AppClientModule
appClientModule, ApplicationClientType appClient, GerApplicationClientType geronimoAppClient,
ClassLoader cl) throws DeploymentException {

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Tue Sep 28 13:32:53 2004
@@ -245,7 +245,7 @@
             GBeanHelper.addGbean(new RARGBeanAdapter(gbeans[i]), cl, earContext);
         }
 
-        return resourceAdapterModuleName.getCanonicalName();
+        return null;
     }
 
     private ObjectName addResourceAdapterModuleGBean(EARContext earContext, Module module,
ClassLoader cl) throws DeploymentException {

Modified: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
==============================================================================
--- geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
(original)
+++ geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
Tue Sep 28 13:32:53 2004
@@ -24,6 +24,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Collections;
+import java.util.ArrayList;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
@@ -140,12 +141,16 @@
 
 
         try {
-            List objectNames = builder.buildConfiguration(carfile, manifest, plan, module);
+            // this is a bit weird and should be rethougth but it works
+            List childURIs = builder.buildConfiguration(carfile, manifest, plan, module);
 
             try {
                 if (install) {
-                    store.install(carfile.toURL());
-                    return objectNames;
+                    URI uri = store.install(carfile.toURL());
+                    List deployedURIs = new ArrayList(childURIs.size() + 1);
+                    deployedURIs.add(uri);
+                    deployedURIs.addAll(childURIs);
+                    return childURIs;
                 }
                 return Collections.EMPTY_LIST;
             } catch (InvalidConfigException e) {

Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Tue Sep 28 13:32:53 2004
@@ -323,14 +323,17 @@
                 gbean.setReferencePatterns("j2eeServer", Collections.singleton(j2eeServer));
                 ObjectName applicationName = earContext.getApplicationObjectName();
                 earContext.addGBean(applicationName, gbean);
-                moduleIDs.add(applicationName.getCanonicalName());
             }
 
             // each module can now add it's GBeans
             for (Iterator iterator = modules.iterator(); iterator.hasNext();) {
                 Module module = (Module) iterator.next();
                 String moduleID = getBuilder(module).addGBeans(earContext, module, cl);
-                moduleIDs.add(moduleID);
+
+                // this is a bit weird and should be rethougth but it works
+                if (moduleID != null) {
+                    moduleIDs.add(moduleID);
+                }
             }
 
             earContext.close();

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Tue Sep 28 13:32:53 2004
@@ -316,7 +316,7 @@
             throw new DeploymentException("Unable to initialize webapp GBean", e);
         }
         earContext.addGBean(webModuleName, gbean);
-        return webModuleName.getCanonicalName();
+        return null;
     }
 
     private ReadOnlyContext buildComponentContext(EARContext earContext, WebModule webModule,
WebAppType webApp, JettyWebAppType jettyWebApp, UserTransaction userTransaction, ClassLoader
cl) throws DeploymentException {

Mime
View raw message