cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r603819 - in /incubator/cxf/trunk: maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ rt/javascript/src/test/resources/ rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/ systests/src/test/java/org/apache/cxf...
Date Thu, 13 Dec 2007 05:14:43 GMT
Author: mmao
Date: Wed Dec 12 21:14:39 2007
New Revision: 603819

URL: http://svn.apache.org/viewvc?rev=603819&view=rev
Log:
CXF-1246
 * CodeGen plugin update, wsdlOption and wsdlRoot co-exists
 * Update Tools/JavaTo and TestUtils to load wsdls from the wsdlRoot
 * Remove the useless wsdls from TestUtils
 * Move the non-codegen wsdls to testutils/others
 * Update the systests
 

Added:
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/greeter_control-binding.xml
      - copied unchanged from r603437, incubator/cxf/trunk/testutils/src/main/resources/wsdl/greeter_control.xjb
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world-binding.xml
      - copied unchanged from r603437, incubator/cxf/trunk/testutils/src/main/resources/wsdl/async_binding.xml
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_async-binding.xml
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_bindings.wsdl.xml
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_messages.wsdl.xml
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_wsdl_import.wsdl.xml
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/dynamic_client_base64.wsdl
      - copied unchanged from r603522, incubator/cxf/trunk/testutils/src/main/resources/wsdl/dynamic_client_base64.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello.wsdl
      - copied unchanged from r603811, incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_bindings_catalog.wsdl
      - copied, changed from r603522, incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_bindings_catalog.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_messages_catalog.wsdl
      - copied unchanged from r603522, incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_messages_catalog.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_services_catalog.wsdl
      - copied, changed from r603522, incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_services_catalog.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_wsdl_import_catalog.wsdl
      - copied, changed from r603522, incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_wsdl_import_catalog.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/jms_test_no_addr.wsdl
      - copied unchanged from r603811, incubator/cxf/trunk/testutils/src/main/resources/wsdl/jms_test_no_addr.wsdl
Removed:
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/InvoiceServer.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/async_binding.xml
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/dynamic_client_base64.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/greeter_control.xjb
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_bindings.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_bindings_catalog.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_collision.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_messages.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_messages_catalog.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_schema_import.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_services_catalog.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_wsdl_import.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_wsdl_import_catalog.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/jms_test_no_addr.wsdl
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/mapping-doc-literal.wsdl
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/WsdlOption.java
    incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties
    incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
    incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
    incubator/cxf/trunk/testutils/pom.xml
    incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world/GreeterImpl.java
    incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_services.wsdl
    incubator/cxf/trunk/tools/javato/ws/pom.xml

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=603819&r1=603818&r2=603819&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 Wed Dec 12 21:14:39 2007
@@ -24,6 +24,7 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
@@ -95,13 +96,23 @@
         classesDir.mkdirs();
 
 
-        if (wsdlOptions == null) {
-            List<WsdlOption> options = new WsdlOptionLoader().load(wsdlRoot);
-            wsdlOptions = options.toArray(new WsdlOption[options.size()]);
-            if (wsdlOptions == null) {
-                getLog().info("Nothing to generate");
-                return;
+        if (wsdlRoot != null) {
+            List<WsdlOption> options = new ArrayList<WsdlOption>();
+            if (wsdlOptions != null) {
+                options.addAll(Arrays.asList(wsdlOptions));
+            }
+            
+            for (WsdlOption o : new WsdlOptionLoader().load(wsdlRoot)) {
+                if (!options.contains(o)) {
+                    options.add(o);
+                }
             }
+            wsdlOptions = options.toArray(new WsdlOption[options.size()]);
+        }
+
+        if (wsdlOptions == null) {
+            getLog().info("Nothing to generate");
+            return;
         }
 
         List<URL> urlList = new ArrayList<URL>();

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=603819&r1=603818&r2=603819&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 Wed Dec 12 21:14:39 2007
@@ -65,4 +65,20 @@
     public File[] getDeleteDirs() {
         return redundantDirs;
     }
+    
+    public int hashCode() {
+        if (wsdl != null) {
+            return wsdl.hashCode();
+        }
+        return -1;
+    }
+
+    public boolean equals(Object obj) {
+        if (!(obj instanceof WsdlOption)) {
+            return false;
+        }
+        
+        WsdlOption t = (WsdlOption) obj;
+        return t.getWsdl().equals(getWsdl());
+    }
 }

Modified: incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties?rev=603819&r1=603818&r2=603819&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties (original)
+++ incubator/cxf/trunk/rt/javascript/src/test/resources/logging.properties Wed Dec 12 21:14:39 2007
@@ -20,8 +20,8 @@
 #
 # logging for the javascript tests
 handlers= java.util.logging.ConsoleHandler
-.level= INFO
-java.util.logging.ConsoleHandler.level = FINEST
+.level= SEVERE
+java.util.logging.ConsoleHandler.level = SEVERE
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 #org.apache.cxf.javascript.JavascriptTestUtilities.level=FINEST
 

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java?rev=603819&r1=603818&r2=603819&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java Wed Dec 12 21:14:39 2007
@@ -51,7 +51,7 @@
         bus = bf.createBus("/jms_test_config.xml");
         BusFactory.setDefaultBus(bus);
         setupServiceInfo("http://cxf.apache.org/jms_conf_test",
-                         "/wsdl/jms_test_no_addr.wsdl",
+                         "/wsdl/others/jms_test_no_addr.wsdl",
                          "HelloWorldQueueBinMsgService",
                          "HelloWorldQueueBinMsgPort");
         JMSConduit conduit = setupJMSConduit(false, false);

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java?rev=603819&r1=603818&r2=603819&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java Wed Dec 12 21:14:39 2007
@@ -98,7 +98,7 @@
         bus = bf.createBus("/jms_test_config.xml");
         BusFactory.setDefaultBus(bus);
         setupServiceInfo("http://cxf.apache.org/jms_conf_test",
-                         "/wsdl/jms_test_no_addr.wsdl",
+                         "/wsdl/others/jms_test_no_addr.wsdl",
                          "HelloWorldQueueBinMsgService",
                          "HelloWorldQueueBinMsgPort");
         JMSDestination destination = setupJMSDestination(false);

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java?rev=603819&r1=603818&r2=603819&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java Wed Dec 12 21:14:39 2007
@@ -58,7 +58,8 @@
     @Test
     public void testBasicConnection() throws Exception {
         QName serviceName = new QName("http://cxf.apache.org/systest/jaxws/", "HelloService");
-        HelloService service = new HelloService(getClass().getResource("/wsdl/hello.wsdl"), serviceName);
+        HelloService service = new HelloService(getClass().getResource("/wsdl/others/hello.wsdl"), 
+                                                serviceName);
         assertNotNull(service);
         Hello hello = service.getHelloPort();
         assertEquals("getSayHi", hello.sayHi("SayHi"));

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java?rev=603819&r1=603818&r2=603819&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java Wed Dec 12 21:14:39 2007
@@ -105,7 +105,7 @@
 
     @Test
     public void testBase64() throws URISyntaxException  {
-        URL wsdl = getClass().getResource("/wsdl/dynamic_client_base64.wsdl");
+        URL wsdl = getClass().getResource("/wsdl/others/dynamic_client_base64.wsdl");
         assertNotNull(wsdl);
         String wsdlUrl = null;
         wsdlUrl = wsdl.toURI().toString();

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java?rev=603819&r1=603818&r2=603819&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java Wed Dec 12 21:14:39 2007
@@ -67,7 +67,7 @@
             assertTrue(result.contains("xsd=testutils/hello_world_schema2.xsd"));
 
             url = new URL("http://localhost:9000/SoapContext/SoapPort"
-                          + "?wsdl=testutils/hello_world_messages_catalog.wsdl");
+                          + "?wsdl=testutils/others/hello_world_messages_catalog.wsdl");
             result = IOUtils.toString((InputStream)url.getContent());
             assertTrue(result.contains("xsd=testutils/hello_world_schema.xsd"));
 

Modified: incubator/cxf/trunk/testutils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom.xml?rev=603819&r1=603818&r2=603819&view=diff
==============================================================================
--- incubator/cxf/trunk/testutils/pom.xml (original)
+++ incubator/cxf/trunk/testutils/pom.xml Wed Dec 12 21:14:39 2007
@@ -168,115 +168,112 @@
                         <phase>generate-sources</phase>
                         <configuration>
                             <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
+			    <wsdlRoot>${basedir}/src/main/resources/wsdl</wsdlRoot>
                             <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-b</extraarg>
-                                        <extraarg>
-                                            ${basedir}/src/main/resources/wsdl/async_binding.xml
-                                        </extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/hello_world_soap12.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/greeter_control.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-b</extraarg>
-                                        <extraarg>
-                                            ${basedir}/src/main/resources/wsdl/greeter_control.xjb
-                                        </extraarg>
-                                    </extraargs>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/mtom_xop.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/swa-mime.wsdl</wsdl>
-                                    <extraargs>
-                                        <extraarg>-b</extraarg>
-                                        <extraarg>
-                                            ${basedir}/src/main/resources/wsdl/swa-mime-binding.xml
-                                        </extraarg>
-                                    </extraargs>
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl> -->
+<!--                                     <extraargs> -->
+<!--                                         <extraarg>-b</extraarg> -->
+<!--                                         <extraarg> -->
+<!--                                             ${basedir}/src/main/resources/wsdl/hello_world-binding.xml -->
+<!--                                         </extraarg> -->
+<!--                                     </extraargs> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/hello_world_soap12.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/hello_world_secure.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/greeter_control.wsdl</wsdl> -->
+<!--                                     <extraargs> -->
+<!--                                         <extraarg>-b</extraarg> -->
+<!--                                         <extraarg> -->
+<!--                                             ${basedir}/src/main/resources/wsdl/greeter_control-binding.xml -->
+<!--                                         </extraarg> -->
+<!--                                     </extraargs> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/mtom_xop.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/swa-mime.wsdl</wsdl> -->
+<!--                                     <extraargs> -->
+<!--                                         <extraarg>-b</extraarg> -->
+<!--                                         <extraarg> -->
+<!--                                             ${basedir}/src/main/resources/wsdl/swa-mime-binding.xml -->
+<!--                                         </extraarg> -->
+<!--                                     </extraargs> -->
 
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/hello_world_xml_mixed.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/hello_world_xml_bare.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>
-                                        ${basedir}/src/main/resources/wsdl/hello_world_xml_wrapped.wsdl
-                                    </wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/hello_world_mixedstyle.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/hello_world_soap_action.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/doc_lit_bare.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/jms_test.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/handler_test.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/soap_header.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/soapheader.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/soapheader2.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/soapheader_rpc.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/locator.wsdl</wsdl>
-                                    <!--extraargs>
-                                    <extraarg>-p</extraarg>
-                                    <extraarg>org.apache.cxf.testutils.locator</extraarg>
-                                    </extraargs-->
-                                </wsdlOption>
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/hello_world_xml_mixed.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/hello_world_xml_bare.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl> -->
+<!--                                         ${basedir}/src/main/resources/wsdl/hello_world_xml_wrapped.wsdl -->
+<!--                                     </wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/hello_world_rpc_lit.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/hello_world_mixedstyle.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/hello_world_doc_lit.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/hello_world_soap_action.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/doc_lit_bare.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/jms_test.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/handler_test.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/soap_header.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/soapheader.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/soapheader2.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/soapheader_rpc.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/locator.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
 
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/schema_validation.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>
-                                        ${basedir}/src/main/resources/wsdl/anonymous_complex_type.wsdl
-                                    </wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/basic_callback_test.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/nested_callback.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>
-                                        ${basedir}/src/main/resources/wsdl/hello_world_underscore.wsdl
-                                    </wsdl>
-                                </wsdlOption>
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/schema_validation.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl> -->
+<!--                                         ${basedir}/src/main/resources/wsdl/anonymous_complex_type.wsdl -->
+<!--                                     </wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/basic_callback_test.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/nested_callback.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl> -->
+<!--                                         ${basedir}/src/main/resources/wsdl/hello_world_underscore.wsdl -->
+<!--                                     </wsdl> -->
+<!--                                 </wsdlOption> -->
 
                                 <wsdlOption>
                                     <wsdl>
@@ -335,49 +332,49 @@
                                         </dependency>
                                     </dependencies>
                                 </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/addNumbers.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/calculator.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/jaxb_element_test.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/ordered_param_holder.wsdl</wsdl>
-                                </wsdlOption>
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/addNumbers.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/calculator.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/jaxb_element_test.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/ordered_param_holder.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
 
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/hello_world_services.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/header_doc_lit.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/header_rpc_lit.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/any.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/factory_pattern.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/hello_world_jbi.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/test_chars.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/inherit.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/cardealer.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/main/resources/wsdl/hello_world_fault.wsdl</wsdl>
-                                </wsdlOption>                                
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/hello_world_services.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/header_doc_lit.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/header_rpc_lit.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/any.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/factory_pattern.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/hello_world_jbi.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/test_chars.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/inherit.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/cardealer.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
+<!--                                 <wsdlOption> -->
+<!--                                     <wsdl>${basedir}/src/main/resources/wsdl/hello_world_fault.wsdl</wsdl> -->
+<!--                                 </wsdlOption> -->
 
                             </wsdlOptions>
                         </configuration>

Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world/GreeterImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world/GreeterImpl.java?rev=603819&r1=603818&r2=603819&view=diff
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world/GreeterImpl.java (original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/hello_world/GreeterImpl.java Wed Dec 12 21:14:39 2007
@@ -27,7 +27,7 @@
             portName = "SoapPort", 
             endpointInterface = "org.apache.hello_world.Greeter",
             targetNamespace = "http://apache.org/hello_world/services",
-            wsdlLocation = "testutils/hello_world_services_catalog.wsdl")
+            wsdlLocation = "testutils/others/hello_world_services_catalog.wsdl")
 public class GreeterImpl implements Greeter {
 
     public String greetMe(String requestType) {

Added: incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_async-binding.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_async-binding.xml?rev=603819&view=auto
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_async-binding.xml (added)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_async-binding.xml Wed Dec 12 21:14:39 2007
@@ -0,0 +1,27 @@
+<!--
+  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.
+-->
+<bindings
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    wsdlLocation="hello_world.wsdl"
+    xmlns="http://java.sun.com/xml/ns/jaxws">
+    <bindings node="wsdl:definitions">
+        <enableAsyncMapping>true</enableAsyncMapping>
+    </bindings>
+</bindings>
\ No newline at end of file

Added: incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_bindings.wsdl.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_bindings.wsdl.xml?rev=603819&view=auto
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_bindings.wsdl.xml (added)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_bindings.wsdl.xml Wed Dec 12 21:14:39 2007
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<wsdl:definitions name="HelloWorld"
+		  xmlns="http://schemas.xmlsoap.org/wsdl/"
+		  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+		  xmlns:x2="http://apache.org/hello_world"
+		  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+		  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+		  targetNamespace="http://apache.org/hello_world/bindings">
+
+
+    <wsdl:import
+	namespace="http://apache.org/hello_world"
+	location="hello_world_wsdl_import.wsdl.xml"/>
+
+    <wsdl:binding name="SOAPBinding" type="x2:Greeter">
+	<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+	<wsdl:operation name="sayHi">
+	    <soap:operation style="document"/>
+	    <wsdl:input>
+		<soap:body use="literal"/>
+	    </wsdl:input>
+	    <wsdl:output>
+		<soap:body use="literal"/>
+	    </wsdl:output>
+	</wsdl:operation>
+	<wsdl:operation name="greetMe">
+	    <soap:operation style="document"/>
+	    <wsdl:input>
+		<soap:body use="literal"/>
+	    </wsdl:input>
+	    <wsdl:output>
+		<soap:body use="literal"/>
+	    </wsdl:output>
+	</wsdl:operation>
+	<wsdl:operation name="pingMe">
+	    <soap:operation style="document"/>
+	    <wsdl:input>
+		<soap:body use="literal"/>
+	    </wsdl:input>
+	    <wsdl:output>
+		<soap:body use="literal"/>
+	    </wsdl:output>
+	    <wsdl:fault name="pingMeFault">
+		<soap:fault name="pingMeFault" use="literal"/>
+	    </wsdl:fault>
+	</wsdl:operation>
+    </wsdl:binding>
+
+</wsdl:definitions>

Added: incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_messages.wsdl.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_messages.wsdl.xml?rev=603819&view=auto
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_messages.wsdl.xml (added)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_messages.wsdl.xml Wed Dec 12 21:14:39 2007
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<wsdl:definitions name="HelloWorld"
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:tns="http://apache.org/hello_world/messages"
+    xmlns:x1="http://apache.org/hello_world/types"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://apache.org/hello_world/messages">
+    <wsdl:types>
+        <schema
+            xmlns="http://www.w3.org/2001/XMLSchema"
+            xmlns:x1="http://apache.org/hello_world/types"
+            targetNamespace="http://apache.org/hello_world/types"
+            elementFormDefault="qualified">
+            <element name="sayHi">
+                <complexType/>
+            </element>
+            <element name="sayHiResponse">
+                <complexType>
+                    <sequence>
+                        <element name="responseType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMe">
+                <complexType>
+                    <sequence>
+                        <element name="requestType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMeResponse">
+                <complexType>
+                    <sequence>
+                        <element name="responseType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="pingMe">
+                <complexType/>
+            </element>
+            <element name="pingMeResponse">
+                <complexType/>
+            </element>
+            <element name="faultDetail">
+                <complexType>
+                    <sequence>
+                        <element name="minor" type="short" form="qualified" minOccurs="0"/>
+                        <element name="major" type="short" form="qualified" minOccurs="0"/>
+                    </sequence>
+                </complexType>
+            </element>
+        </schema>
+    </wsdl:types>
+    <wsdl:message name="sayHiRequest">
+        <wsdl:part name="in" element="x1:sayHi"/>
+    </wsdl:message>
+    <wsdl:message name="sayHiResponse">
+        <wsdl:part name="out" element="x1:sayHiResponse"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeRequest">
+        <wsdl:part name="in" element="x1:greetMe"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeResponse">
+        <wsdl:part name="out" element="x1:greetMeResponse"/>
+    </wsdl:message>
+    <wsdl:message name="pingMeRequest">
+        <wsdl:part name="in" element="x1:pingMe"/>
+    </wsdl:message>
+    <wsdl:message name="pingMeResponse">
+        <wsdl:part name="out" element="x1:pingMeResponse"/>
+    </wsdl:message>
+    <wsdl:message name="pingMeFault">
+        <wsdl:part name="faultDetail" element="x1:faultDetail"/>
+    </wsdl:message>
+</wsdl:definitions>

Modified: incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_services.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_services.wsdl?rev=603819&r1=603818&r2=603819&view=diff
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_services.wsdl (original)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_services.wsdl Wed Dec 12 21:14:39 2007
@@ -29,7 +29,7 @@
 
     <wsdl:import
         namespace="http://apache.org/hello_world/bindings"
-        location="hello_world_bindings.wsdl"/>
+        location="hello_world_bindings.wsdl.xml"/>
 
     <wsdl:service name="SOAPService">
 	<wsdl:port name="SoapPort" binding="x1:SOAPBinding">

Added: incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_wsdl_import.wsdl.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_wsdl_import.wsdl.xml?rev=603819&view=auto
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_wsdl_import.wsdl.xml (added)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_wsdl_import.wsdl.xml Wed Dec 12 21:14:39 2007
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<wsdl:definitions name="HelloWorldImport"
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:tns="http://apache.org/hello_world"
+    xmlns:x1="http://apache.org/hello_world/messages"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://apache.org/hello_world">
+
+    <wsdl:import
+        namespace="http://apache.org/hello_world/messages"
+        location="hello_world_messages.wsdl.xml"/>
+
+    <wsdl:portType name="Greeter">
+        <wsdl:operation name="sayHi">
+            <wsdl:input message="x1:sayHiRequest" />
+            <wsdl:output message="x1:sayHiResponse" />
+        </wsdl:operation>
+
+        <wsdl:operation name="greetMe">
+            <wsdl:input message="x1:greetMeRequest" />
+            <wsdl:output message="x1:greetMeResponse" />
+        </wsdl:operation>
+
+        <wsdl:operation name="pingMe">
+            <wsdl:input message="x1:pingMeRequest"/>
+            <wsdl:output message="x1:pingMeResponse"/>
+            <wsdl:fault name="pingMeFault" message="x1:pingMeFault"/>
+        </wsdl:operation>
+    </wsdl:portType>
+</wsdl:definitions>

Copied: incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_bindings_catalog.wsdl (from r603522, incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_bindings_catalog.wsdl)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_bindings_catalog.wsdl?p2=incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_bindings_catalog.wsdl&p1=incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_bindings_catalog.wsdl&r1=603522&r2=603819&rev=603819&view=diff
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_bindings_catalog.wsdl (original)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_bindings_catalog.wsdl Wed Dec 12 21:14:39 2007
@@ -28,7 +28,7 @@
 
     <wsdl:import
     namespace="http://apache.org/hello_world"
-    location="testutils/hello_world_wsdl_import_catalog.wsdl"/>
+    location="testutils/others/hello_world_wsdl_import_catalog.wsdl"/>
 
     <wsdl:binding name="SOAPBinding" type="x2:Greeter">
         <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>

Copied: incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_services_catalog.wsdl (from r603522, incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_services_catalog.wsdl)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_services_catalog.wsdl?p2=incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_services_catalog.wsdl&p1=incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_services_catalog.wsdl&r1=603522&r2=603819&rev=603819&view=diff
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_services_catalog.wsdl (original)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_services_catalog.wsdl Wed Dec 12 21:14:39 2007
@@ -29,7 +29,7 @@
 
     <wsdl:import
         namespace="http://apache.org/hello_world/bindings"
-        location="testutils/hello_world_bindings_catalog.wsdl"/>
+        location="testutils/others/hello_world_bindings_catalog.wsdl"/>
 
     <wsdl:service name="SOAPService">
 	<wsdl:port name="SoapPort" binding="x1:SOAPBinding">

Copied: incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_wsdl_import_catalog.wsdl (from r603522, incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_wsdl_import_catalog.wsdl)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_wsdl_import_catalog.wsdl?p2=incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_wsdl_import_catalog.wsdl&p1=incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_wsdl_import_catalog.wsdl&r1=603522&r2=603819&rev=603819&view=diff
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_wsdl_import_catalog.wsdl (original)
+++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/others/hello_world_wsdl_import_catalog.wsdl Wed Dec 12 21:14:39 2007
@@ -28,7 +28,7 @@
 
     <wsdl:import
         namespace="http://apache.org/hello_world/messages"
-        location="testutils/hello_world_messages_catalog.wsdl"/>
+        location="testutils/others/hello_world_messages_catalog.wsdl"/>
 
     <wsdl:portType name="Greeter">
         <wsdl:operation name="sayHi">

Modified: incubator/cxf/trunk/tools/javato/ws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/pom.xml?rev=603819&r1=603818&r2=603819&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/pom.xml (original)
+++ incubator/cxf/trunk/tools/javato/ws/pom.xml Wed Dec 12 21:14:39 2007
@@ -185,36 +185,7 @@
                         <phase>generate-test-sources</phase>
                         <configuration>
                             <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
-
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_async.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/doc_wrapped_simple.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_doc_lit.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_doc_wrapped_bare.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_rpc_lit.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_soap12.wsdl</wsdl>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl</wsdl>
-                                    <extraargs>
-					<!--arg>-verbose</arg-->
-                                    </extraargs>
-                                </wsdlOption>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_fault.wsdl</wsdl>
-                                </wsdlOption>
-                            </wsdlOptions>
+			    <wsdlRoot>${basedir}/src/test/resources/java2wsdl_wsdl</wsdlRoot>
                         </configuration>
                         <goals>
                             <goal>wsdl2java</goal>



Mime
View raw message