You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by rw...@apache.org on 2011/05/11 11:39:22 UTC

svn commit: r1101801 - /geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java

Author: rwonly
Date: Wed May 11 09:39:21 2011
New Revision: 1101801

URL: http://svn.apache.org/viewvc?rev=1101801&view=rev
Log:
GERONIMO-5956 issues when deploy a standalone ejb web services

Modified:
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java?rev=1101801&r1=1101800&r2=1101801&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java Wed May 11 09:39:21 2011
@@ -55,8 +55,13 @@ public class WsdlGeneratorUtils {
 
     public static void getModuleClasspath(DeploymentContext deploymentContext, LinkedHashSet<URL> classpath) throws Exception {
         File configurationBaseDir = deploymentContext.getBaseDir();
-        for (String bundleClassPath : deploymentContext.getBundleClassPath()) {
-            classpath.add(new File(configurationBaseDir, bundleClassPath).toURI().toURL());
+        if (deploymentContext.getBundleClassPath() == null || deploymentContext.getBundleClassPath().isEmpty()){
+            // the default bundle class path is the root of the bundle if no bundle-classpath specified.
+            classpath.add(configurationBaseDir.toURI().toURL());
+        } else {
+            for (String bundleClassPath : deploymentContext.getBundleClassPath()) {
+                classpath.add(new File(configurationBaseDir, bundleClassPath).toURI().toURL());
+            }
         }
     }