[jbossws-commits] JBossWS SVN: r8404 - 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 20:55:29 -0400 (Wed, 08 Oct 2008)
New Revision: 8404

Modified:
   stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java
Log:
[JBWS-2129] Some fix to the generator


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 00:52:37 UTC (rev 8403)
+++ stack/metro/branches/asoldano/modules/server/src/main/java/org/jboss/wsf/stack/metro/WsgenWrapperGenerator.java	2008-10-09 00:55:29 UTC (rev 8404)
@@ -22,9 +22,6 @@
 package org.jboss.wsf.stack.metro;
 
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -33,9 +30,6 @@
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
 
 import javax.xml.ws.WebServiceException;
 
@@ -78,9 +72,7 @@
       args.add(getClasspath(classLoader, archiveUrl));
       args.add("-d");
       args.add(tempDir.getAbsolutePath());
-      args.add("-keep"); //TODO!!! sources should not be needed
       args.add("-verbose");
-      args.add("-s"); //TODO!!! sources should not be needed
       args.add(tempDir.getAbsolutePath());
       args.add(endpoint);
       try
@@ -113,13 +105,13 @@
    {
       StringBuffer sb = new StringBuffer();
       ServerConfig cfg = getServerConfig();
-      File clientDir = new File(cfg.getServerTempDir(), "/../../../client/"); //TODO!!!!
-      String[] libs = clientDir.list();
+      File clientDir = new File(cfg.getHomeDir(), "client");
+      File[] libs = clientDir.listFiles();
       if (libs != null && libs.length > 0)
       {
-         for (String lib : libs)
+         for (File lib : libs)
          {
-            sb.append(lib).append(File.pathSeparator);
+            sb.append(lib.getAbsolutePath()).append(File.pathSeparator);
          }
          sb.delete(sb.length() - 1, sb.length());
       }
@@ -127,7 +119,7 @@
       for (URL url : urls)
       {
          sb.append(File.pathSeparator);
-         sb.append(url.toString());
+         sb.append(url.getPath());
       }
       return sb.toString();
    }
@@ -148,17 +140,6 @@
    private URL[] getURLs(ClassLoader classLoader, URL archiveUrl)
    {
       List<URL> urls = new LinkedList<URL>();
-
-//      //This does not work when deploying through the jbossws testsuite (i.e. not dropping the archive to the deploy dir)
-//      if (classLoader instanceof URLClassLoader)
-//      {
-//         urls.addAll(Arrays.asList(((URLClassLoader)classLoader).getURLs()));
-//      }
-//      else
-//      {
-//         urls.add(archiveFile.toURL());
-//      }
-
       try
       {
          if (archiveUrl.toString().endsWith(".war"))