geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r454097 - /geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Date Sun, 08 Oct 2006 07:36:39 GMT
Author: djencks
Date: Sun Oct  8 00:36:39 2006
New Revision: 454097

URL: http://svn.apache.org/viewvc?view=rev&rev=454097
Log:
GERONIMO-2476 make the server side app client module name name component match the app client
artifactId

Modified:
    geronimo/server/trunk/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.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=454097&r1=454096&r2=454097
==============================================================================
--- 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
Sun Oct  8 00:36:39 2006
@@ -251,13 +251,12 @@
 
         namingBuilders.buildEnvironment(appClient, gerAppClient, clientEnvironment);
 
-        AbstractName moduleName;
         if (earName == null) {
             earName = naming.createRootName(earEnvironment.getConfigId(), NameFactory.NULL,
NameFactory.J2EE_APPLICATION);
-            moduleName = naming.createChildName(earName, earEnvironment.getConfigId().toString(),
NameFactory.APP_CLIENT_MODULE);
-        } else {
-            moduleName = naming.createChildName(earName, targetPath, NameFactory.APP_CLIENT_MODULE);
         }
+
+        //always use the artifactId of the app client as the name component of the module
name (on the server).
+        AbstractName  moduleName = naming.createChildName(earName, clientEnvironment.getConfigId().toString(),
NameFactory.APP_CLIENT_MODULE);
         AbstractName clientBaseName = naming.createRootName(clientEnvironment.getConfigId(),
clientEnvironment.getConfigId().toString(), NameFactory.J2EE_APPLICATION);
 
         //start installing the resource adapters in the client.



Mime
View raw message