[jbossws-commits] JBossWS SVN: r8406 - stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2008-10-08 21:41:31 -0400 (Wed, 08 Oct 2008)
New Revision: 8406

Modified:
   stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java
Log:
[JBWS-2129] Further fixes...


Modified: stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java
===================================================================
--- stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java	2008-10-09 01:07:44 UTC (rev 8405)
+++ stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java	2008-10-09 01:41:31 UTC (rev 8406)
@@ -73,7 +73,6 @@
       args.add("-d");
       args.add(tempDir.getAbsolutePath());
       args.add("-verbose");
-      args.add(tempDir.getAbsolutePath());
       args.add(endpoint);
       try
       {
@@ -129,7 +128,9 @@
       File tempJBossWSDir = new File(getServerConfig().getServerTempDir(), "jbossws");
       if (!tempJBossWSDir.exists())
          tempJBossWSDir.mkdir();
-      String archivePath = archiveUrl.toString();
+      String archivePath = archiveUrl.getPath();
+      if (archivePath.endsWith(File.separator))
+         archivePath = archivePath.substring(0, archivePath.length() - 1);
       String archiveName = archivePath.substring(archivePath.lastIndexOf(File.separator));
       File tempDir = new File(tempJBossWSDir, archiveName + "-" + new Date().getTime());
       if (!tempDir.exists())
@@ -162,7 +163,7 @@
             }
             urls.addAll(innerUrlList);
          }
-         else //jar
+         else if (archiveUrl.toString().endsWith(".jar"))
          {
             if (new File(archiveUrl.getPath()).exists())
             {
@@ -175,6 +176,17 @@
                urls.add(dest.toURL());
             }
          }
+         else if (archiveUrl.toString().endsWith(".war/"))
+         {
+            File webInf = new File(archiveUrl.getFile(), "WEB-INF");
+            if (webInf.exists())
+            {
+               urls.add(webInf.toURL());
+               urls.add(new File(webInf, "classes").toURL());
+            }
+         }
+         else
+            throw new WebServiceException("Unsupported deployment archive: " + archiveUrl); 
       }
       catch (Exception e)
       {