[jbossws-commits] JBossWS SVN: r7491 - in stack/metro/branches/jbossws-metro-3.0.2/modules: testsuite and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2008-06-11 14:07:56 -0400 (Wed, 11 Jun 2008)
New Revision: 7491

Modified:
   stack/metro/branches/jbossws-metro-3.0.2/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java
   stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss422.txt
   stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss423.txt
   stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss500.txt
Log:
Include classloader hierarchy when passing classpath string to wsgen

Modified: stack/metro/branches/jbossws-metro-3.0.2/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java
===================================================================
--- stack/metro/branches/jbossws-metro-3.0.2/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java	2008-06-11 18:06:45 UTC (rev 7490)
+++ stack/metro/branches/jbossws-metro-3.0.2/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/MetroProviderImpl.java	2008-06-11 18:07:56 UTC (rev 7491)
@@ -22,6 +22,7 @@
 package org.jboss.wsf.stack.metro.tools;
 
 import org.jboss.wsf.spi.tools.WSContractProvider;
+import org.apache.tools.ant.taskdefs.Classloader;
 
 import java.io.File;
 import java.io.PrintStream;
@@ -163,18 +164,11 @@
          }
 
          // --classpath
-         if(loader instanceof URLClassLoader)
+         String cp = buildClasspathString(loader);
+         if(cp!=null)
          {
-            StringBuilder builder = new StringBuilder();
-            URLClassLoader urlLoader = (URLClassLoader)loader;
-            for(URL url : urlLoader.getURLs())
-            {
-               builder.append(url.toExternalForm());
-               builder.append(File.pathSeparator);
-            }
-
             args.add("-classpath");
-            args.add(builder.toString());
+            args.add(cp);
          }
 
          // the SEI
@@ -189,5 +183,30 @@
       }
    }
 
+   private String buildClasspathString(ClassLoader cl)
+   {
+      String cp = null;
 
+      if(cl instanceof URLClassLoader)
+      {
+         StringBuilder builder = new StringBuilder();
+         URLClassLoader urlLoader = (URLClassLoader)cl;
+         for(URL url : urlLoader.getURLs())
+         {
+            builder.append(url.getPath());
+            builder.append(File.pathSeparator);
+         }
+
+         if(cl.getParent()!=null)
+         {
+            String parentPath = buildClasspathString(cl.getParent());
+            if(parentPath!=null) builder.append(parentPath);
+         }
+
+         cp = builder.toString();
+      }
+
+      return cp;
+   }
+
 }

Modified: stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss422.txt	2008-06-11 18:06:45 UTC (rev 7490)
+++ stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss422.txt	2008-06-11 18:07:56 UTC (rev 7491)
@@ -68,8 +68,5 @@
 # [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl
 org/jboss/test/ws/jaxws/namespace/**
 
-# [JBWS-2162] wsprovide for maven build
-org/jboss/test/ws/jaxws/smoke/tools/**
-
 # [JBWS-2165] Fix xop tests with maven build
 org/jboss/test/ws/jaxws/samples/xop/**

Modified: stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss423.txt	2008-06-11 18:06:45 UTC (rev 7490)
+++ stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss423.txt	2008-06-11 18:07:56 UTC (rev 7491)
@@ -68,8 +68,5 @@
 # [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl
 org/jboss/test/ws/jaxws/namespace/**
 
-# [JBWS-2162] wsprovide for maven build
-org/jboss/test/ws/jaxws/smoke/tools/**
-
 # [JBWS-2165] Fix xop tests with maven build
 org/jboss/test/ws/jaxws/samples/xop/**

Modified: stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss500.txt	2008-06-11 18:06:45 UTC (rev 7490)
+++ stack/metro/branches/jbossws-metro-3.0.2/modules/testsuite/test-excludes-jboss500.txt	2008-06-11 18:07:56 UTC (rev 7491)
@@ -71,9 +71,6 @@
 # [JBWS-2137] @WebWservice does not work with class isolation
 org/jboss/test/ws/jaxws/jbws1556/**
 
-# [JBWS-2162] wsprovide for maven build
-org/jboss/test/ws/jaxws/smoke/tools/**
-
 # [JBWS-2165] Fix xop tests with maven build
 org/jboss/test/ws/jaxws/samples/xop/**