geronimo-scm mailing list archives

Author: genspring
Date: Fri Jun  3 08:33:52 2011
New Revision: 1130938

URL: http://svn.apache.org/viewvc?rev=1130938&view=rev
Log:
When the module is standalone (without parent module),  The jar was not added to appClientDeploymentContext
bundle classpath.

Modified:
    geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.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=1130938&r1=1130937&r2=1130938&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 Jun  3 08:33:52 2011
@@ -599,6 +599,8 @@ public class AppClientModuleBuilder impl
                 }
             }
             
+      }
+            
             Collection<String> appClientModuleClasspaths = module.getClassPath();
             
             try {
@@ -614,7 +616,9 @@ public class AppClientModuleBuilder impl
             } catch (URISyntaxException e) {
                 throw new DeploymentException("Unable to get app client module base URI "
+ module.getTargetPath(), e);
             }
-                        
+            
+          if (module.getParentModule() != null) {      
+              
             appClientModuleClasspaths.add(module.getTargetPath());
             EARContext moduleContext = module.getEarContext();
             Collection<String> moduleLocations = module.getParentModule().getModuleLocations();
@@ -633,7 +637,8 @@ public class AppClientModuleBuilder impl
                     
                 }                 
             }
-            }
+            
+          }
             
         } catch (DeploymentException e) {
             throw e;