You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2007/03/16 03:02:38 UTC

svn commit: r518835 - /webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java

Author: dims
Date: Thu Mar 15 19:02:37 2007
New Revision: 518835

URL: http://svn.apache.org/viewvc?view=rev&rev=518835
Log:
Fix for AXIS2-2303 - java2wsdl-maven-plugin throws ClassNotFoundException on execution of java2wsdl goal

Modified:
    webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java

Modified: webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java?view=diff&rev=518835&r1=518834&r2=518835
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java Thu Mar 15 19:02:37 2007
@@ -18,8 +18,11 @@
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -34,7 +37,7 @@
  * WSDL file.
  * 
  * @goal java2wsdl
- * @phase generate-resources
+ * @phase process-classes
  * @requiresDependencyResolution compile
  */
 public class Java2WSDLMojo extends AbstractMojo {
@@ -91,9 +94,13 @@
     private String outputFileName;
 
     private void addToOptionMap(Map map, String option, String value) {
+        addToOptionMap(map, option, new String[]{value});
+    }
+
+    private void addToOptionMap(Map map, String option, String[] value) {
         if (value != null) {
             map.put(option,
-                    new Java2WSDLCommandLineOption(option, new String[]{value}));
+                    new Java2WSDLCommandLineOption(option, value));
         }
     }
 
@@ -136,6 +143,18 @@
         addToOptionMap( optionMap,
                         Java2WSDLConstants.OUTPUT_FILENAME_OPTION,
                         f.getName() );
+
+        Set artifacts = project.getArtifacts();
+        String[] artifactFileNames = new String[artifacts.size() + 1];
+        int j = 0;
+        for(Iterator i = artifacts.iterator(); i.hasNext(); j++) {
+            artifactFileNames[j] = ((Artifact) i.next()).getFile().getAbsolutePath();
+        }
+        artifactFileNames[j] = project.getArtifact().getFile().getAbsolutePath();
+
+        addToOptionMap( optionMap,
+                        Java2WSDLConstants.CLASSPATH_OPTION,
+                        artifactFileNames);
 
         return optionMap;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org