cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1080374 - in /cxf/trunk/maven-plugins/codegen-plugin: pom.xml src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
Date Thu, 10 Mar 2011 22:17:43 GMT
Author: dkulp
Date: Thu Mar 10 22:17:43 2011
New Revision: 1080374

URL: http://svn.apache.org/viewvc?rev=1080374&view=rev
Log:
Yet another attempt to fix command line length issues on Windows

Modified:
    cxf/trunk/maven-plugins/codegen-plugin/pom.xml
    cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
    cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java

Modified: cxf/trunk/maven-plugins/codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/pom.xml?rev=1080374&r1=1080373&r2=1080374&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/codegen-plugin/pom.xml (original)
+++ cxf/trunk/maven-plugins/codegen-plugin/pom.xml Thu Mar 10 22:17:43 2011
@@ -70,6 +70,11 @@
             <artifactId>plexus-utils</artifactId>
             <version>2.0.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-archiver</artifactId>
+            <version>1.2</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java?rev=1080374&r1=1080373&r2=1080374&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
(original)
+++ cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
Thu Mar 10 22:17:43 2011
@@ -21,6 +21,7 @@ package org.apache.cxf.maven_plugin;
 
 import java.io.File;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
@@ -57,12 +58,12 @@ public class ClassLoaderSwitcher {
      * @param useCompileClasspath
      * @param classesDir
      */
-    public Set<String> switchClassLoader(MavenProject project,
+    public Set<URI> switchClassLoader(MavenProject project,
                                          boolean useCompileClasspath,
                                          File classesDir) {
         List<URL> urlList = new ArrayList<URL>();
         StringBuilder buf = new StringBuilder();
-        Set<String> ret = new LinkedHashSet<String>();
+        Set<URI> ret = new LinkedHashSet<URI>();
         
         try {
             urlList.add(classesDir.toURI().toURL());
@@ -74,11 +75,11 @@ public class ClassLoaderSwitcher {
         }
 
         buf.append(classesDir.getAbsolutePath());
-        ret.add(classesDir.getAbsolutePath());
+        ret.add(classesDir.toURI());
         buf.append(File.pathSeparatorChar);
         if (!useCompileClasspath) {
             buf.append(project.getBuild().getOutputDirectory());
-            ret.add(project.getBuild().getOutputDirectory());
+            ret.add(new File(project.getBuild().getOutputDirectory()).toURI());
             buf.append(File.pathSeparatorChar);
         }
         List<?> artifacts = useCompileClasspath ? project.getCompileArtifacts() : project.getTestArtifacts();
@@ -87,7 +88,7 @@ public class ClassLoaderSwitcher {
                 if (a.getFile() != null && a.getFile().exists()) {
                     urlList.add(a.getFile().toURI().toURL());
                     buf.append(a.getFile().getAbsolutePath());
-                    ret.add(a.getFile().getAbsolutePath());
+                    ret.add(a.getFile().toURI());
                     buf.append(File.pathSeparatorChar);
                     // System.out.println("     " +
                     // a.getFile().getAbsolutePath());

Modified: cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java?rev=1080374&r1=1080373&r2=1080374&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
(original)
+++ cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
Thu Mar 10 22:17:43 2011
@@ -51,6 +51,9 @@ import org.apache.maven.plugin.AbstractM
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectUtils;
+import org.codehaus.plexus.archiver.jar.JarArchiver;
+import org.codehaus.plexus.archiver.jar.Manifest;
+import org.codehaus.plexus.archiver.jar.Manifest.Attribute;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
@@ -400,7 +403,7 @@ public class WSDL2JavaMojo extends Abstr
 
         Bus bus = null;
         try {
-            Set<String> cp = classLoaderSwitcher.switchClassLoader(project, useCompileClasspath,
classesDir);
+            Set<URI> cp = classLoaderSwitcher.switchClassLoader(project, useCompileClasspath,
classesDir);
 
             if ("once".equals(fork) || "true".equals(fork)) {
                 forkOnce(cp, effectiveWsdlOptions);
@@ -433,7 +436,7 @@ public class WSDL2JavaMojo extends Abstr
         System.gc();
     }
     
-    private void addPluginArtifact(Set<String> artifactsPath) {
+    private void addPluginArtifact(Set<URI> artifactsPath) {
         //for Maven 2.x, the actual artifact isn't in the list....  need to try and find
it
         URL url = getClass().getResource(getClass().getSimpleName() + ".class");
         
@@ -454,7 +457,7 @@ public class WSDL2JavaMojo extends Abstr
             
             File file = new File(uri);
             if (file.exists()) {
-                artifactsPath.add(file.getPath());
+                artifactsPath.add(file.toURI());
             }
         } catch (Exception ex) {
             //ex.printStackTrace();
@@ -462,7 +465,7 @@ public class WSDL2JavaMojo extends Abstr
 
     }
 
-    private void forkOnce(Set<String> classPath, List<WsdlOption> effectiveWsdlOptions)

+    private void forkOnce(Set<URI> classPath, List<WsdlOption> effectiveWsdlOptions)

         throws MojoExecutionException {
         List<WsdlOption> toDo = new LinkedList<WsdlOption>();
         List<List<String>> wargs = new LinkedList<List<String>>();
@@ -487,7 +490,7 @@ public class WSDL2JavaMojo extends Abstr
             return;
         }
         
-        Set<String> artifactsPath = new LinkedHashSet<String>();
+        Set<URI> artifactsPath = new LinkedHashSet<URI>();
         for (Artifact a : pluginArtifacts) {
             File file = a.getFile();
             if (file == null) {
@@ -495,15 +498,13 @@ public class WSDL2JavaMojo extends Abstr
                                                  + a.getGroupId() + ":" + a.getArtifactId()
                                                  + ":" + a.getVersion());
             }
-            artifactsPath.add(file.getPath());
+            artifactsPath.add(file.toURI());
         }
         addPluginArtifact(artifactsPath);
         artifactsPath.addAll(classPath);
         
-        String cp = StringUtils.join(artifactsPath.iterator(), File.pathSeparator);
-        
         String args[] = createForkOnceArgs(wargs);
-        runForked(cp, ForkOnceWSDL2Java.class, args);
+        runForked(artifactsPath, ForkOnceWSDL2Java.class, args);
         
         for (WsdlOption wsdlOption : toDo) {
             File dirs[] = wsdlOption.getDeleteDirs();
@@ -544,7 +545,7 @@ public class WSDL2JavaMojo extends Abstr
 
     private Bus callWsdl2Java(WsdlOption wsdlOption, 
                               Bus bus,
-                              Set<String> classPath) throws MojoExecutionException
{
+                              Set<URI> classPath) throws MojoExecutionException {
         File outputDirFile = wsdlOption.getOutputDir();
         outputDirFile.mkdirs();
         URI basedir = project.getBasedir().toURI();
@@ -562,7 +563,7 @@ public class WSDL2JavaMojo extends Abstr
         getLog().debug("Calling wsdl2java with args: " + Arrays.toString(args));
         
         if (!"false".equals(fork)) {
-            Set<String> artifactsPath = new LinkedHashSet<String>();
+            Set<URI> artifactsPath = new LinkedHashSet<URI>();
             for (Artifact a : pluginArtifacts) {
                 File file = a.getFile();
                 if (file == null) {
@@ -570,13 +571,12 @@ public class WSDL2JavaMojo extends Abstr
                                                      + a.getGroupId() + ":" + a.getArtifactId()
                                                      + ":" + a.getVersion());
                 }
-                artifactsPath.add(file.getPath());
+                artifactsPath.add(file.toURI());
             }
             addPluginArtifact(artifactsPath);
             artifactsPath.addAll(classPath);
-            String cp = StringUtils.join(artifactsPath.iterator(), File.pathSeparator);
             
-            runForked(cp, WSDLToJava.class, args);
+            runForked(artifactsPath, WSDLToJava.class, args);
 
         } else {
             if (bus == null) {
@@ -612,7 +612,7 @@ public class WSDL2JavaMojo extends Abstr
         return javaExe;
     }
 
-    private void runForked(String classPath, Class cls, String[] args) throws MojoExecutionException
{
+    private void runForked(Set<URI> classPath, Class cls, String[] args) throws MojoExecutionException
{
         getLog().info("Running wsdl2java in fork mode...");
 
         Commandline cmd = new Commandline();
@@ -624,11 +624,38 @@ public class WSDL2JavaMojo extends Abstr
             getLog().debug(e);
             throw new MojoExecutionException(e.getMessage(), e);
         }
-        cmd.createArg().setValue("-cp");
-        cmd.createArg().setValue(classPath);
+
         cmd.createArg().setLine(additionalJvmArgs);
-        cmd.createArg().setValue(cls.getName());
+
+        try {
+            File file = FileUtils.createTempFile("cxf-codegen", ".jar");
+
+            JarArchiver jar = new JarArchiver();
+            jar.setDestFile(file.getAbsoluteFile());
+            
+            Manifest manifest = new Manifest();
+            Attribute attr = new Attribute();
+            attr.setName("Class-Path");
+            attr.setValue(StringUtils.join(classPath.iterator(), " "));
+            manifest.getMainSection().addConfiguredAttribute(attr);
+            
+            attr = new Attribute();
+            attr.setName("Main-Class");
+            attr.setValue(cls.getName());
+            manifest.getMainSection().addConfiguredAttribute(attr);
+
+            jar.addConfiguredManifest(manifest);
+            jar.createArchive();
+            
+            cmd.createArg().setValue("-jar");
+            cmd.createArg().setValue(file.getAbsolutePath());
+
+            
+        } catch (Exception e1) {
+            throw new MojoExecutionException("Could not create runtime jar", e1);
+        }
         cmd.addArguments(args);
+        
 
         CommandLineUtils.StringStreamConsumer err = new CommandLineUtils.StringStreamConsumer();
         CommandLineUtils.StringStreamConsumer out = new CommandLineUtils.StringStreamConsumer();



Mime
View raw message