You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/07/03 08:39:39 UTC
svn commit: r960165 - 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/
Author: djencks
Date: Sat Jul 3 06:39:39 2010
New Revision: 960165
URL: http://svn.apache.org/viewvc?rev=960165&view=rev
Log:
GERONIMO-5025 include the app and global contexts in the app client jndi tree. This causes big problems if one of these is a resource-ref or similarly references something only configured on the server
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/AppClientModule.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=960165&r1=960164&r2=960165&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 Sat Jul 3 06:39:39 2010
@@ -355,8 +355,22 @@ public class AppClientModuleBuilder impl
} else {
name = FileUtils.removeExtension(targetPath, ".jar");
}
+ Map<JndiKey, Map<String, Object>> jndiContext = Module.share(Module.APP, parentModule == null? null: parentModule.getJndiContext());
- AppClientModule module = new AppClientModule(standAlone, moduleName, name, clientBaseName, serverEnvironment, clientEnvironment, moduleFile, targetPath, appClient, mainClass, gerAppClient, specDD, parentModule);
+ AppClientModule module = new AppClientModule(standAlone,
+ moduleName,
+ name,
+ clientBaseName,
+ serverEnvironment,
+ clientEnvironment,
+ moduleFile,
+ targetPath,
+ appClient,
+ mainClass,
+ gerAppClient,
+ specDD,
+ jndiContext,
+ parentModule);
//start installing the resource adapters in the client.
GerResourceType[] resources = gerAppClient.getResourceArray();
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java?rev=960165&r1=960164&r2=960165&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java Sat Jul 3 06:39:39 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.ApplicationClient;
@@ -47,9 +49,10 @@ public class AppClientModule extends Mod
String mainClassName,
XmlObject vendorDD,
String originalSpecDD,
+ Map<JndiKey, Map<String, Object>> jndiContext,
Module<?, ?> parentModule) {
super(standAlone, moduleName, name, clientEnvironment, moduleFile, targetPath,
- specDD, vendorDD, originalSpecDD, null, null, parentModule);
+ specDD, vendorDD, originalSpecDD, null, jndiContext, parentModule);
this.serverEnvironment = serverEnvironment;
this.appClientName = appClientName;
this.mainClassName = mainClassName;