[jbossws-commits] JBossWS SVN: r10968 - stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-10-20 12:16:25 -0400 (Tue, 20 Oct 2009)
New Revision: 10968

Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
Log:
[JBWS-2718] fixing issue

Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java	2009-10-20 14:52:40 UTC (rev 10967)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java	2009-10-20 16:16:25 UTC (rev 10968)
@@ -241,7 +241,7 @@
                   //check for sub-directories
                   resourcePath = resourcePath.substring(0, resourcePath.lastIndexOf("/") + 1);
 
-                  resourcePath = expLocation + resourcePath + schemaLocation;
+                  resourcePath = resourcePath + schemaLocation;
                   while (resourcePath.indexOf("//") != -1)
                   {
                      resourcePath = resourcePath.replace("//", "/");
@@ -355,19 +355,21 @@
       File wsdlFile;
       if (wsdlLocation.indexOf(expLocation) >= 0)
       {
-         wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(expLocation) + expLocation.length());
+         wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(expLocation));
          wsdlFile = new File(locationFile + "/" + wsdlLocation);
       }
-      else if (wsdlLocation.startsWith("vfsfile:") || wsdlLocation.startsWith("file:") || wsdlLocation.startsWith("jar:"))
+      else if (wsdlLocation.startsWith("vfsfile:") || wsdlLocation.startsWith("file:") 
+            || wsdlLocation.startsWith("jar:") || wsdlLocation.startsWith("vfszip:"))
       {
-         wsdlLocation = wsdlLocation.substring(wsdlLocation.lastIndexOf("/") + 1);
+         wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(archiveName) + archiveName.length());
          wsdlFile = new File(locationFile + "/" + wsdlLocation);
       }
       else
       {
-         throw new WSException("Invalid wsdlFile '" + wsdlLocation + "', expected in: " + expLocation);
+         throw new WSException("Invalid wsdlFile '" + wsdlLocation + "' location, expected in: " + expLocation);
       }
 
       return wsdlFile;
    }
+   
 }