svn commit: r535939 - in /geronimo/server/trunk/modules: geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java

[dj...@apache.org]

Author: djencks
Date: Mon May  7 11:03:52 2007
New Revision: 535939

URL: http://svn.apache.org/viewvc?view=rev&rev=535939
Log:
GERONIMO-3134 App client module needs to return client environment from getEnvironment.  Server environment is a problem, see GERONIMO-3144

Modified:
    geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java

Modified: geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?view=diff&rev=535939&r1=535938&r2=535939
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Mon May  7 11:03:52 2007
@@ -473,7 +473,7 @@
         AppClientModule appClientModule = (AppClientModule) module;
         appClientModule.setEarFile(earFile);
         //create the ear context for the app client.
-        Environment clientEnvironment = appClientModule.getClientEnvironment();
+        Environment clientEnvironment = appClientModule.getEnvironment();
 //        if (!appClientModule.isStandAlone() || clientEnvironment.getConfigId() == null) {
 //            Artifact earConfigId = earContext.getConfigID();
 //            Artifact configId = new Artifact(earConfigId.getGroupId(), earConfigId.getArtifactId() + "_" + module.getTargetPath(), earConfigId.getVersion(), "car");
@@ -538,7 +538,7 @@
     }
 
     public void initContext(EARContext earContext, Module clientModule, ClassLoader cl) throws DeploymentException {
-        namingBuilders.buildEnvironment(clientModule.getSpecDD(), clientModule.getVendorDD(), ((AppClientModule)clientModule).getClientEnvironment());
+        namingBuilders.buildEnvironment(clientModule.getSpecDD(), clientModule.getVendorDD(), ((AppClientModule)clientModule).getEnvironment());
 
         AppClientModule appClientModule = ((AppClientModule) clientModule);
         for (ConnectorModule connectorModule : appClientModule.getResourceModules()) {
@@ -592,8 +592,8 @@
 
         // Create a Module ID Builder defaulting to similar settings to use for any children we create
         ModuleIDBuilder idBuilder = new ModuleIDBuilder();
-        idBuilder.setDefaultGroup(appClientModule.getClientEnvironment().getConfigId().getGroupId());
-        idBuilder.setDefaultVersion(appClientModule.getClientEnvironment().getConfigId().getVersion());
+        idBuilder.setDefaultGroup(appClientModule.getEnvironment().getConfigId().getGroupId());
+        idBuilder.setDefaultVersion(appClientModule.getEnvironment().getConfigId().getVersion());
         try {
             try {
 

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java?view=diff&rev=535939&r1=535938&r2=535939
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java Mon May  7 11:03:52 2007
@@ -30,10 +30,12 @@
 import org.apache.xmlbeans.XmlObject;
 
 /**
+ * TODO there is almost certainly a problem with the serverEnvironment when deploying a stand alone app client outside an ear.
+ *
  * @version $Rev$ $Date$
  */
 public class AppClientModule extends Module {
-    private final Environment clientEnvironment;
+    private final Environment serverEnvironment;
     private JarFile earFile;
     private final AbstractName appClientName;
     private final String mainClassName;
@@ -41,8 +43,8 @@
 
 
     public AppClientModule(boolean standAlone, AbstractName moduleName, AbstractName appClientName, Environment serverEnvironment, Environment clientEnvironment, JarFile moduleFile, String targetPath, XmlObject specDD, String mainClassName, XmlObject vendorDD, String originalSpecDD, Collection<ConnectorModule> resourceModules, AnnotatedApplicationClient annotatedAppClient ) {
-        super(standAlone, moduleName, serverEnvironment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null, annotatedAppClient );
-        this.clientEnvironment = clientEnvironment;
+        super(standAlone, moduleName, clientEnvironment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null, annotatedAppClient );
+        this.serverEnvironment = serverEnvironment;
         this.appClientName = appClientName;
         this.mainClassName = mainClassName;
         this.resourceModules = resourceModules;
@@ -52,8 +54,8 @@
         return ConfigurationModuleType.CAR;
     }
 
-    public Environment getClientEnvironment() {
-        return clientEnvironment;
+    public Environment getServerEnvironment() {
+        return serverEnvironment;
     }
 
     public JarFile getEarFile() {