geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r966977 - in /geronimo/server/trunk/plugins: client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/ j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/
Date Fri, 23 Jul 2010 06:00:48 GMT
Author: gawor
Date: Fri Jul 23 06:00:47 2010
New Revision: 966977

URL: http://svn.apache.org/viewvc?rev=966977&view=rev
Log:
regression - make sure app jndi namespace is properly shared for standalone modules

Modified:
    geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ApplicationInfo.java
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java

Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=966977&r1=966976&r2=966977&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Fri Jul 23 06:00:47 2010
@@ -422,6 +422,8 @@ public class AppClientModuleBuilder impl
             mbe.createModule(module, plan, moduleFile, targetPath, specDDUrl, clientEnvironment,
null, earName, naming, idBuilder);
         }
         if (standAlone) {
+            Map<JndiKey, Map<String, Object>> appJndiContext = Module.share(Module.APP,
module.getJndiContext());
+            
             ApplicationInfo appInfo = new ApplicationInfo(ConfigurationModuleType.CAR,
                     serverEnvironment,
                     earName,
@@ -429,7 +431,8 @@ public class AppClientModuleBuilder impl
                     null,
                     null,
                     null,
-                    null);
+                    null,
+                    appJndiContext);
             appInfo.getModules().add(module);
             return appInfo;
         } else {

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ApplicationInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ApplicationInfo.java?rev=966977&r1=966976&r2=966977&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ApplicationInfo.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ApplicationInfo.java
Fri Jul 23 06:00:47 2010
@@ -16,9 +16,11 @@
  */
 package org.apache.geronimo.j2ee.deployment;
 
+import java.util.Map;
 import java.util.jar.JarFile;
 
 import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.j2ee.jndi.JndiKey;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.openejb.jee.Application;
@@ -38,9 +40,20 @@ public class ApplicationInfo extends Mod
                            JarFile earFile,
                            Application specDD,
                            XmlObject vendorDD,
-                           String originalSpecDD
-    ) {
-        super(true, baseName, name, environment, earFile, "", specDD, vendorDD, originalSpecDD,
null, null, null);
+                           String originalSpecDD) {
+        this(type, environment, baseName, name, earFile, specDD, vendorDD, originalSpecDD,
null);        
+    }
+    
+    public ApplicationInfo(ConfigurationModuleType type,
+                           Environment environment,
+                           AbstractName baseName,
+                           String name,
+                           JarFile earFile,
+                           Application specDD,
+                           XmlObject vendorDD,
+                           String originalSpecDD,
+                           Map<JndiKey, Map<String, Object>> jndiContext) {
+        super(true, baseName, name, environment, earFile, "", specDD, vendorDD, originalSpecDD,
null, jndiContext, null);
         assert type != null;
         assert environment != null;
         assert modules != null;

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=966977&r1=966976&r2=966977&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Fri Jul 23 06:00:47 2010
@@ -67,6 +67,7 @@ import org.apache.geronimo.gbean.annotat
 import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.jndi.ApplicationJndi;
+import org.apache.geronimo.j2ee.jndi.JndiKey;
 import org.apache.geronimo.j2ee.jndi.JndiScope;
 import org.apache.geronimo.j2ee.management.impl.J2EEApplicationImpl;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
@@ -346,6 +347,8 @@ public class EARConfigBuilder implements
             return module;
         }
 
+        Map<JndiKey, Map<String, Object>> jndiContext = Module.share(Module.APP,
module.getJndiContext());
+
         ApplicationInfo applicationInfo = new ApplicationInfo(module.getType(),
                 module.getEnvironment(),
                 module.getModuleName(),
@@ -353,7 +356,8 @@ public class EARConfigBuilder implements
                 jarFile,
                 null,
                 null,
-                null
+                null,
+                jndiContext
         );
         applicationInfo.getModules().add(module);
         return applicationInfo;



Mime
View raw message