cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r602797 - in /incubator/cxf/trunk: common/common/src/main/java/org/apache/cxf/helpers/ maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ systests/ systests/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/ systest...
Date Mon, 10 Dec 2007 07:39:18 GMT
Author: mmao
Date: Sun Dec  9 23:38:38 2007
New Revision: 602797

URL: http://svn.apache.org/viewvc?rev=602797&view=rev
Log:
CXF-1246
 CodeGen plugin support loading multiple wsdls/options/bindings from the wsdlRoot
  Only changed the systests for review


Added:
    incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOptionLoader.java
    incubator/cxf/trunk/systests/src/test/resources/wsdl/add_numbers-fromjava-options
Modified:
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java
    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/WsdlOption.java
    incubator/cxf/trunk/systests/pom.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java
    incubator/cxf/trunk/tools/wsdlto/frontend/javascript/   (props changed)

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java?rev=602797&r1=602796&r2=602797&view=diff
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java
(original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java
Sun Dec  9 23:38:38 2007
@@ -22,9 +22,13 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 
 public final class FileUtils {
@@ -231,5 +235,42 @@
         }
         return rtn;
     }
-    
+
+    public static List<File> getFiles(File dir, final String pattern) {
+        return getFiles(dir, pattern, null);
+    }
+
+    public static List<File> getFiles(File dir, final String pattern, File exclude)
{
+        File[] files =  dir.listFiles(new FilenameFilter() {
+                public boolean accept(File dir, String name) {
+                    return name.matches(pattern);
+                }
+            });
+        if (files == null) {
+            return new ArrayList<File>();
+        }
+
+        List<File> fileList = new ArrayList<File>();
+        for (File file : files) {
+            if (file.equals(exclude)) {
+                continue;
+            }
+            fileList.add(file);
+        }
+        return fileList;
+    }
+
+    public static List<String> readLines(File file) throws Exception {
+        if (!file.exists()) {
+            return new ArrayList<String>();
+        }
+        BufferedReader reader = new BufferedReader(new FileReader(file));
+        List<String> results = new ArrayList<String>();
+        String line = reader.readLine();
+        while (line != null) {
+            results.add(line);
+            line = reader.readLine();
+        }
+        return results;
+    }
 }

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=602797&r1=602796&r2=602797&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
Sun Dec  9 23:38:38 2007
@@ -37,6 +37,7 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.tools.ant.ExitException;
 import org.apache.tools.ant.util.optional.NoExitSecurityManager;
+
 /**
  * @goal wsdl2java
  * @description CXF WSDL To Java Tool
@@ -73,6 +74,12 @@
     WsdlOption wsdlOptions[];
 
     /**
+     * @parameter
+     */
+    String wsdlRoot;
+
+
+    /**
      * Use the compile classpath rather than the test classpath for execution
      * useful if the test dependencies clash with those of wsdl2java
      * @parameter
@@ -89,7 +96,12 @@
 
 
         if (wsdlOptions == null) {
-            throw new MojoExecutionException("Must specify wsdlOptions");
+            List<WsdlOption> options = new WsdlOptionLoader().load(wsdlRoot);
+            wsdlOptions = options.toArray(new WsdlOption[options.size()]);
+            if (wsdlOptions == null) {
+                getLog().info("Nothing to generate");
+                return;
+            }
         }
 
         List<URL> urlList = new ArrayList<URL>();
@@ -188,8 +200,6 @@
                 }
             }
         }
-
-
 
         if (doWork) {
             doneFile.delete();

Modified: incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java?rev=602797&r1=602796&r2=602797&view=diff
==============================================================================
--- incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
(original)
+++ incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOption.java
Sun Dec  9 23:38:38 2007
@@ -20,12 +20,13 @@
 package org.apache.cxf.maven_plugin;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 
 public class WsdlOption {
     String wsdl;
     List packagenames;
-    List extraargs;
+    List extraargs = new ArrayList();
     File dependencies[];
     File redundantDirs[];
 

Added: 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=602797&view=auto
==============================================================================
--- incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOptionLoader.java
(added)
+++ incubator/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlOptionLoader.java
Sun Dec  9 23:38:38 2007
@@ -0,0 +1,114 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.maven_plugin;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.cxf.helpers.FileUtils;
+import org.apache.maven.plugin.MojoExecutionException;
+
+/**
+   This class was ported from fAnt wsdl2java task
+   http://code.google.com/p/fant/
+ */
+
+public final class WsdlOptionLoader {
+    private static final String WSDL_SUFFIX = ".+\\.wsdl$";
+    private static final String WSDL_OPTIONS = "-options$";
+    private static final String WSDL_BINDINGS = "-binding-?\\d*.xml$";
+
+    public List<WsdlOption> load(String wsdlRoot) throws MojoExecutionException {
+        File wsdlBasedir;
+        if (wsdlRoot == null) {
+            return new ArrayList<WsdlOption>();
+        }
+        wsdlBasedir = new File(wsdlRoot);
+
+        if (!wsdlBasedir.exists()) {
+            throw new MojoExecutionException(wsdlRoot + " not exists");
+        }
+
+        return findJobs(wsdlBasedir, getWsdlFiles(wsdlBasedir));
+    }
+
+    private List<File> getWsdlFiles(File dir) {
+        return FileUtils.getFiles(dir, WSDL_SUFFIX);
+    }
+
+    private File getOptions(File dir, String pattern) {
+        List<File> files = FileUtils.getFiles(dir, pattern);
+        if (files.size() > 0) {
+            return files.iterator().next();
+        }
+        return null;
+    }
+
+    private List<File> getBindingFiles(File dir, String pattern) {
+        return FileUtils.getFiles(dir, pattern);
+    }
+
+    protected List<WsdlOption> findJobs(File dir, List<File> wsdlFiles) {
+        List<WsdlOption> jobs = new ArrayList<WsdlOption>();
+
+        for (File wsdl : wsdlFiles) {
+            if (wsdl == null || !wsdl.exists()) {
+                continue;
+            }
+
+            String wsdlName = wsdl.getName();
+            wsdlName = wsdlName.substring(0, wsdlName.indexOf(".wsdl"));
+            File options = getOptions(dir, wsdlName + WSDL_OPTIONS);
+            List<File> bindings = getBindingFiles(dir, wsdlName + WSDL_BINDINGS);
+
+            jobs.add(generateWsdlOption(wsdl, bindings, options));
+        }
+        return jobs;
+    }
+
+    protected WsdlOption generateWsdlOption(final File wsdl, 
+                                            final List<File> bindingFiles, 
+                                            final File options) {
+        WsdlOption wsdlOption = new WsdlOption();
+
+        if (bindingFiles != null) {
+            for (File binding : bindingFiles) {
+                wsdlOption.getExtraargs().add("-b");
+                wsdlOption.getExtraargs().add(binding.toString());
+            }
+        }
+
+        if (options != null && options.exists()) {
+            try {
+                List<String> lines = FileUtils.readLines(options);
+                if (lines.size() > 0) {
+                    wsdlOption.getExtraargs().addAll(Arrays.asList(lines.iterator().next().split("
")));
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        wsdlOption.setWsdl(wsdl.toString());
+        
+        return wsdlOption;
+    }
+}
\ No newline at end of file

Modified: incubator/cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?rev=602797&r1=602796&r2=602797&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/pom.xml (original)
+++ incubator/cxf/trunk/systests/pom.xml Sun Dec  9 23:38:38 2007
@@ -66,36 +66,7 @@
                         <phase>generate-test-sources</phase>
                         <configuration>
                             <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/wsdl/pizza_service.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-exsh</extraarg>
-                                        <extraarg>true</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/wsdl/cxf-993.wsdl</wsdl>
-                                </wsdlOption>
-
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/wsdl/mtom.wsdl</wsdl>
-                                </wsdlOption>
-
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/wsdl/add_numbers.wsdl</wsdl>
-                                </wsdlOption>
-
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/wsdl/add_numbers-fromjava.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-p</extraarg>
-                                        <extraarg>org.apache.cxf.systest.ws.addr_fromjava.client</extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-
-                            </wsdlOptions>
+			    <wsdlRoot>${basedir}/src/test/resources/wsdl</wsdlRoot>
                         </configuration>
                         <goals>
                             <goal>wsdl2java</goal>

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java?rev=602797&r1=602796&r2=602797&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java
Sun Dec  9 23:38:38 2007
@@ -50,7 +50,7 @@
 
     @BeforeClass
     public static void startServers() throws Exception {
-        assertTrue("server did not launch correctly", launchServer(Server.class));
+        //assertTrue("server did not launch correctly", launchServer(Server.class));
     }
 
     private ByteArrayOutputStream setupInLogging() {

Added: incubator/cxf/trunk/systests/src/test/resources/wsdl/add_numbers-fromjava-options
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/resources/wsdl/add_numbers-fromjava-options?rev=602797&view=auto
==============================================================================
--- incubator/cxf/trunk/systests/src/test/resources/wsdl/add_numbers-fromjava-options (added)
+++ incubator/cxf/trunk/systests/src/test/resources/wsdl/add_numbers-fromjava-options Sun
Dec  9 23:38:38 2007
@@ -0,0 +1 @@
+-p org.apache.cxf.systest.ws.addr_fromjava.client
\ No newline at end of file

Propchange: incubator/cxf/trunk/tools/wsdlto/frontend/javascript/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec  9 23:38:38 2007
@@ -1 +1,7 @@
 target
+.classpath
+.ruleset
+.project
+.checkstyle
+.pmd
+.settings



Mime
View raw message