cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r607390 - in /incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin: WSDL2JavaMojo.java WsdlOptionLoader.java
Date Sat, 29 Dec 2007 07:18:47 GMT
Author: mmao
Date: Fri Dec 28 23:18:46 2007
New Revision: 607390

URL: http://svn.apache.org/viewvc?rev=607390&view=rev
Log:
CXF-1246 
  Support run wsdl2java in the style of 
     mvn org.apache.cxf:cxf-codegen-plugin:2.1-incubator-SNAPSHOT:wsdl2java 


Modified:
    incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
    incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOptionLoader.java

Modified: incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java?rev=607390&r1=607389&r2=607390&view=diff
==============================================================================
--- incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
(original)
+++ incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
Fri Dec 28 23:18:46 2007
@@ -87,6 +87,16 @@
      */
     boolean useCompileClasspath;
 
+    private List<WsdlOption> getWsdlOptionsFromDir(final File root) throws MojoExecutionException
{
+        List<WsdlOption> options = new ArrayList<WsdlOption>();
+        for (WsdlOption o : new WsdlOptionLoader().load(root)) {
+            if (!options.contains(o)) {
+                options.add(o);
+            }
+        }
+        return options;
+    }
+
     public void execute() throws MojoExecutionException {
         String outputDir = testSourceRoot == null ? sourceRoot : testSourceRoot;
         File outputDirFile = new File(outputDir);
@@ -95,22 +105,25 @@
         File classesDir = new File(classesDirectory);
         classesDir.mkdirs();
 
-
-        if (wsdlRoot != null) {
-            List<WsdlOption> options = new ArrayList<WsdlOption>();
-            if (wsdlOptions != null) {
-                options.addAll(Arrays.asList(wsdlOptions));
+        List<WsdlOption> options = new ArrayList<WsdlOption>();
+        if (wsdlRoot == null) {
+            File sourceWsdlRoot = new File(project.getBasedir(), "/src/main/resources/wsdl");
+            if (sourceWsdlRoot.exists()) {
+                options.addAll(getWsdlOptionsFromDir(sourceWsdlRoot));
             }
-            
-            for (WsdlOption o : new WsdlOptionLoader().load(wsdlRoot)) {
-                if (!options.contains(o)) {
-                    options.add(o);
-                }
+
+            File testWsdlRoot = new File(project.getBasedir(), "/src/test/resources/wsdl");
+            if (testWsdlRoot.exists()) {
+                options.addAll(getWsdlOptionsFromDir(testWsdlRoot));
             }
-            wsdlOptions = options.toArray(new WsdlOption[options.size()]);
         }
 
-        if (wsdlOptions == null) {
+        if (wsdlOptions != null) {
+            options.addAll(Arrays.asList(wsdlOptions));
+        }
+        wsdlOptions = options.toArray(new WsdlOption[options.size()]);
+
+        if (wsdlOptions.length == 0) {
             getLog().info("Nothing to generate");
             return;
         }

Modified: incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOptionLoader.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOptionLoader.java?rev=607390&r1=607389&r2=607390&view=diff
==============================================================================
--- incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOptionLoader.java
(original)
+++ incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOptionLoader.java
Fri Dec 28 23:18:46 2007
@@ -38,14 +38,16 @@
     private static final String WSDL_BINDINGS = "-binding-?\\d*.xml$";
 
     public List<WsdlOption> load(String wsdlRoot) throws MojoExecutionException {
-        File wsdlBasedir;
-        if (wsdlRoot == null) {
+        return load(new File(wsdlRoot));
+    }
+
+    public List<WsdlOption> load(File wsdlBasedir) throws MojoExecutionException {
+        if (wsdlBasedir == null) {
             return new ArrayList<WsdlOption>();
         }
-        wsdlBasedir = new File(wsdlRoot);
 
         if (!wsdlBasedir.exists()) {
-            throw new MojoExecutionException(wsdlRoot + " not exists");
+            throw new MojoExecutionException(wsdlBasedir + " not exists");
         }
 
         return findJobs(wsdlBasedir, getWsdlFiles(wsdlBasedir));



Mime
View raw message