[jbossws-commits] JBossWS SVN: r16530 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2012-07-25 06:48:18 -0400 (Wed, 25 Jul 2012)
New Revision: 16530

Modified:
   stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
Log:
[JBWS-3519] Remove generated sources when -k (keep/generateSource) option is not used + fix wrong impl of JBWS-3193


Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java	2012-07-25 08:24:48 UTC (rev 16529)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java	2012-07-25 10:48:18 UTC (rev 16530)
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.ResourceBundle;
 
+import org.apache.cxf.helpers.FileUtils;
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.wsdlto.WSDLToJava;
 import org.jboss.ws.api.tools.WSContractConsumer;
@@ -185,27 +186,31 @@
       
       args.add("-exsh");
       args.add(additionalHeaders ? "true" : "false");
-
-      if (generateSource && sourceDir == null)
+      
+      if (targetPackage != null)
       {
-         sourceDir = outputDir;
+         args.add("-p");
+         args.add(targetPackage);
       }
       
-      if (sourceDir != null && generateSource)
-      {
+      File sourceTempDir = null;
+      if (generateSource) {
+         if (sourceDir == null)
+         {
+            sourceDir = outputDir;
+         }
          if (!sourceDir.exists() && !sourceDir.mkdirs())
             throw new IllegalStateException(BundleUtils.getMessage(bundle, "COULD_NOT_MAKE_DIRECTORY",  sourceDir.getName()));
 
          args.add("-d");
          args.add(sourceDir.getAbsolutePath());
+      } else {
+         sourceTempDir = new File(outputDir, "tmp" + Math.round(Math.random() * 10000000));
+         FileUtils.mkDir(sourceTempDir);
+         args.add("-d");
+         args.add(sourceTempDir.getAbsolutePath());
       }
 
-      if (targetPackage != null)
-      {
-         args.add("-p");
-         args.add(targetPackage);
-      }
-
       if (wsdlLocation != null)
       {
          args.add("-wsdlLocation");
@@ -230,11 +235,6 @@
          args.add("-classdir");
          args.add(outputDir.getAbsolutePath());
       }
-      if (nocompile && !generateSource)
-      {
-         args.add("-d");
-         args.add(outputDir.getAbsolutePath());
-      }
      
       //Always generate wrapped style for reference element:CXF-1079
       args.add("-allowElementReferences");
@@ -271,5 +271,12 @@
             t.printStackTrace();
          }
       }
+      finally
+      {
+         if (sourceTempDir != null)
+         {
+            FileUtils.removeDir(sourceTempDir);
+         }
+      }
    }
 }