cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r439084 - in /incubator/cxf/trunk/tools: java2wsdl/src/test/java/org/apache/cxf/tools/common/ java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ java2wsdl/src/test/resources/java2wsdl_wsdl/ java2wsdl/src/test/resources/wsdl/ ...
Date Thu, 31 Aug 2006 22:58:54 GMT
Author: dkulp
Date: Thu Aug 31 15:58:53 2006
New Revision: 439084

URL: http://svn.apache.org/viewvc?rev=439084&view=rev
Log:
Move all the "resources/wsdl" dirs to "resources/procect_wsdl" to fix classpath issues in
eclipse


Added:
    incubator/cxf/trunk/tools/java2wsdl/src/test/resources/java2wsdl_wsdl/
      - copied from r439042, incubator/cxf/trunk/tools/java2wsdl/src/test/resources/wsdl/
    incubator/cxf/trunk/tools/misctools/src/test/resources/misctools_wsdl/
      - copied from r439042, incubator/cxf/trunk/tools/misctools/src/test/resources/wsdl/
    incubator/cxf/trunk/tools/validator/src/test/resources/validator_wsdl/
      - copied from r439042, incubator/cxf/trunk/tools/validator/src/test/resources/wsdl/
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/
      - copied from r439042, incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl/
Removed:
    incubator/cxf/trunk/tools/java2wsdl/src/test/resources/wsdl/
    incubator/cxf/trunk/tools/misctools/src/test/resources/wsdl/
    incubator/cxf/trunk/tools/validator/src/test/resources/wsdl/
    incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl/
Modified:
    incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java
    incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java
    incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
    incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
    incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java
    incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
    incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java
    incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
    incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java
    incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLTOJavaEOLStyleTest.java
    incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaClientServerTest.java
    incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaExSoapHeaderTest.java
    incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaMIMETest.java
    incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessorTest.java
    incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaXMLFormatTest.java

Modified: incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java?rev=439084&r1=439083&r2=439084&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java
(original)
+++ incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java
Thu Aug 31 15:58:53 2006
@@ -42,7 +42,7 @@
         System.setErr(new PrintStream(errOut));
         System.setOut(new PrintStream(stdOut));
         
-        wsdlLocation = ToolTestBase.class.getResource("/wsdl/hello_world.wsdl");
+        wsdlLocation = ToolTestBase.class.getResource("/java2wsdl_wsdl/hello_world.wsdl");
     }
     
     public void tearDown() { 

Modified: incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java?rev=439084&r1=439083&r2=439084&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java
(original)
+++ incubator/cxf/trunk/tools/java2wsdl/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java
Thu Aug 31 15:58:53 2006
@@ -64,7 +64,7 @@
         env.put(ToolConstants.CFG_COMPILE, "compile");
         env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
         env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes");
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world_async.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/java2wsdl_wsdl/hello_world_async.wsdl"));
         wj2Processor.setEnvironment(env);
         wj2Processor.process();
 
@@ -92,7 +92,7 @@
         env.put(ToolConstants.CFG_COMPILE, "compile");
         env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
         env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes");
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world_doc_wrapped_bare.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/java2wsdl_wsdl/hello_world_doc_wrapped_bare.wsdl"));
         wj2Processor.setEnvironment(env);
         wj2Processor.process();
 
@@ -121,7 +121,7 @@
         env.put(ToolConstants.CFG_COMPILE, "compile");
         env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
         env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes");
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world_doc_lit.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/java2wsdl_wsdl/hello_world_doc_lit.wsdl"));
         wj2Processor.setEnvironment(env);
         wj2Processor.process();
  
@@ -149,7 +149,7 @@
         env.put(ToolConstants.CFG_COMPILE, "compile");
         env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
         env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes");
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world_rpc_lit.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/java2wsdl_wsdl/hello_world_rpc_lit.wsdl"));
         wj2Processor.setEnvironment(env);
         wj2Processor.process();
    

Modified: incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java?rev=439084&r1=439083&r2=439084&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
(original)
+++ incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessorTest.java
Thu Aug 31 15:58:53 2006
@@ -44,7 +44,8 @@
         String[] args = new String[] {"-transport", "http", "-e", "serviceins", "-p", "portins",
"-n",
                                       "Greeter_SOAPBinding", "-a",
                                       "http://localhost:9000/newservice/newport", "-d",
-                                      output.getCanonicalPath(), getLocation("/wsdl/hello_world.wsdl")};
+                                      output.getCanonicalPath(),
+                                      getLocation("/misctools_wsdl/hello_world.wsdl")};
         WSDLToService.main(args);
 
         File outputFile = new File(output, "hello_world-service.wsdl");
@@ -89,7 +90,7 @@
 
         String[] args = new String[] {"-transport", "http", "-e", "serviceins", "-p", "portins",
"-n",
                                       "Greeter_SOAPBinding", "-d", output.getCanonicalPath(),
-                                      getLocation("/wsdl/hello_world.wsdl")};
+                                      getLocation("/misctools_wsdl/hello_world.wsdl")};
         WSDLToService.main(args);
 
         File outputFile = new File(output, "hello_world-service.wsdl");
@@ -137,7 +138,8 @@
                                       "ConnectionFactory", "-jdn",
                                       "dynamicQueues/test.cxf.jmstransport.queue", "-jmt",
"text", "-jmc",
                                       "false", "-jsn", "cxf_Queue_subscriber", "-d",
-                                      output.getCanonicalPath(), getLocation("/wsdl/jms_test.wsdl")};
+                                      output.getCanonicalPath(),
+                                      getLocation("/misctools_wsdl/jms_test.wsdl")};
         WSDLToService.main(args);
         File outputFile = new File(output, "jms_test-service.wsdl");
         assertTrue("New wsdl file is not generated", outputFile.exists());
@@ -203,7 +205,7 @@
 
         WSDLToServiceProcessor processor = new WSDLToServiceProcessor();
 
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/misctools_wsdl/hello_world.wsdl"));
         env.put(ToolConstants.CFG_TRANSPORT, new String("http"));
         env.put(ToolConstants.CFG_SERVICE, new String("SOAPService_Test1"));
         env.put(ToolConstants.CFG_PORT, new String("SoapPort_Test1"));
@@ -227,7 +229,7 @@
 
         WSDLToServiceProcessor processor = new WSDLToServiceProcessor();
 
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/misctools_wsdl/hello_world.wsdl"));
         env.put(ToolConstants.CFG_TRANSPORT, new String("http"));
         env.put(ToolConstants.CFG_BINDING_ATTR, new String("BindingNotExist"));
         env.put(ToolConstants.CFG_SERVICE, new String("serviceins"));

Modified: incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java?rev=439084&r1=439083&r2=439084&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
(original)
+++ incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
Thu Aug 31 15:58:53 2006
@@ -47,7 +47,7 @@
 
     public void testDocLitWithFault() throws Exception {
         String[] args = new String[] {"-i", "Greeter", "-d", output.getCanonicalPath(),
-                                      getLocation("/wsdl/hello_world_doc_lit.wsdl")};
+                                      getLocation("/misctools_wsdl/hello_world_doc_lit.wsdl")};
         WSDLToSoap.main(args);
 
         File outputFile = new File(output, "hello_world_doc_lit-soapbinding.wsdl");
@@ -121,7 +121,7 @@
                                       "Greeter_SOAPBinding_NewBinding", "-style", "rpc",
"-use", "literal",
                                       "-d", output.getCanonicalPath(), "-o",
                                       "hello_world_rpc_lit_newbinding.wsdl",
-                                      getLocation("/wsdl/hello_world_rpc_lit.wsdl")};
+                                      getLocation("/misctools_wsdl/hello_world_rpc_lit.wsdl")};
         WSDLToSoap.main(args);
 
         File outputFile = new File(output, "hello_world_rpc_lit_newbinding.wsdl");
@@ -193,7 +193,7 @@
         env.put(ToolConstants.CFG_STYLE, "rpc");
         env.put(ToolConstants.CFG_USE, "literal");
         env.put(ToolConstants.CFG_NAMESPACE, "http://com.iona.hello_world/rpc");
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/misctools_wsdl/hello_world.wsdl"));
         processor.setEnvironment(env);
         try {
             processor.process();
@@ -209,7 +209,7 @@
 
     public void testBindingExist() throws Exception {
         WSDLToSoapProcessor processor = new WSDLToSoapProcessor();
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world_rpc_lit.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/misctools_wsdl/hello_world_rpc_lit.wsdl"));
         env.put(ToolConstants.CFG_PORTTYPE, new String("GreeterRPCLit"));
         env.put(ToolConstants.CFG_BINDING, new String("Greeter_SOAPBinding_RPCLit"));
         processor.setEnvironment(env);
@@ -226,7 +226,7 @@
 
     public void testPortTypeNotExist() throws Exception {
         WSDLToSoapProcessor processor = new WSDLToSoapProcessor();
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world_rpc_lit.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/misctools_wsdl/hello_world_rpc_lit.wsdl"));
         env.put(ToolConstants.CFG_PORTTYPE, new String("NonExistPortType"));
         env.put(ToolConstants.CFG_BINDING, new String("NewBinding_RPCLit"));
         processor.setEnvironment(env);
@@ -244,7 +244,7 @@
 
     public void testNameSpaceMissing() throws Exception {
         WSDLToSoapProcessor processor = new WSDLToSoapProcessor();
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world_rpc_lit.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/misctools_wsdl/hello_world_rpc_lit.wsdl"));
         env.put(ToolConstants.CFG_PORTTYPE, new String("GreeterRPCLit"));
         env.put(ToolConstants.CFG_BINDING, new String("NewBinding_RPCLit"));
         env.put(ToolConstants.CFG_STYLE, new String("rpc"));

Modified: incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java?rev=439084&r1=439083&r2=439084&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java
(original)
+++ incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessorTest.java
Thu Aug 31 15:58:53 2006
@@ -47,7 +47,7 @@
 
     public void testAllDefault() throws Exception {
         String[] args = new String[] {"-i", "Greeter", "-d", output.getCanonicalPath(),
-                                      getLocation("/wsdl/hello_world.wsdl")};
+                                      getLocation("/misctools_wsdl/hello_world.wsdl")};
         WSDLToXML.main(args);
 
         File outputFile = new File(output, "hello_world-xmlbinding.wsdl");

Modified: incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java?rev=439084&r1=439083&r2=439084&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
(original)
+++ incubator/cxf/trunk/tools/misctools/src/test/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessorTest.java
Thu Aug 31 15:58:53 2006
@@ -36,7 +36,7 @@
     public void testNewTypes() throws Exception {
         String[] args = new String[] {"-t", "http://org.apache/invoice", "-n", "Invoice",
"-d",
                                       output.getCanonicalPath(), "-o", "Invoice_xsd.wsdl",
-                                      getLocation("/wsdl/Invoice.xsd")};
+                                      getLocation("/misctools_wsdl/Invoice.xsd")};
         XSDToWSDL.main(args);
 
         File outputFile = new File(output, "Invoice_xsd.wsdl");
@@ -64,7 +64,7 @@
 
     public void testDefaultFileName() throws Exception {
         String[] args = new String[] {"-t", "http://org.apache/invoice", "-n", "Invoice",
"-d",
-                                      output.getCanonicalPath(), getLocation("/wsdl/Invoice.xsd")};
+                                      output.getCanonicalPath(), getLocation("/misctools_wsdl/Invoice.xsd")};
         XSDToWSDL.main(args);
 
         File outputFile = new File(output, "Invoice.wsdl");

Modified: incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java?rev=439084&r1=439083&r2=439084&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java
(original)
+++ incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java
Thu Aug 31 15:58:53 2006
@@ -42,7 +42,7 @@
         System.setErr(new PrintStream(errOut));
         System.setOut(new PrintStream(stdOut));
 
-        wsdlLocation = ToolTestBase.class.getResource("/wsdl/hello_world.wsdl");
+        wsdlLocation = ToolTestBase.class.getResource("/validator_wsdl/hello_world.wsdl");
     }
 
     public void tearDown() {

Modified: incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java?rev=439084&r1=439083&r2=439084&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
(original)
+++ incubator/cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java
Thu Aug 31 15:58:53 2006
@@ -43,7 +43,7 @@
         try {
 
             String[] args = new String[] {"-d", schemaDir,
-                                          "-verbose", getLocation("/wsdl/doc_lit_bare.wsdl")};
+                                          "-verbose", getLocation("/validator_wsdl/doc_lit_bare.wsdl")};
             WSDLValidator.main(args);
             assertTrue("Non Unique Body Parts Error should be discovered",
                        getStdErr().indexOf("Non unique body part") > -1);
@@ -56,7 +56,7 @@
         try {
 
             String[] args = new String[] {"-d", schemaDir, "-verbose",
-                                          getLocation("/wsdl/hello_world_mixed_style.wsdl")};
+                                          getLocation("/validator_wsdl/hello_world_mixed_style.wsdl")};
             WSDLValidator.main(args);
             assertTrue("Mixted style Error should be discovered",
                        getStdErr().indexOf("Mixted style ,Wrong WSDL") > -1);
@@ -70,7 +70,7 @@
         try {
 
             String[] args = new String[] {"-d", schemaDir, "-verbose",
-                                          getLocation("/wsdl/hello_world_doc_lit_type.wsdl")};
+                                          getLocation("/validator_wsdl/hello_world_doc_lit_type.wsdl")};
             WSDLValidator.main(args);
             assertTrue("Refere type element error   should be discovered",
                        getStdErr().indexOf("using the element attribute") > -1);
@@ -83,7 +83,7 @@
         try {
 
             String[] args = new String[] {"-d", schemaDir, "-verbose",
-                                          getLocation("/wsdl/hello_world_error_attribute.wsdl")};
+                                          getLocation("/validator_wsdl/hello_world_error_attribute.wsdl")};
             WSDLValidator.main(args);
             assertTrue("Attribute error should be discovered",
                        getStdErr().indexOf(" is not allowed to appear in element") > -1);
@@ -98,7 +98,7 @@
         try {
 
             String[] args = new String[] {"-d", schemaDir, "-verbose",
-                                          getLocation("/wsdl/hello_world_error_reference.wsdl")};
+                                          getLocation("/validator_wsdl/hello_world_error_reference.wsdl")};
             WSDLValidator.main(args);
             assertTrue("Reference error should be discovered",
                        getStdErr().indexOf("reference binding is not defined") > -1);
@@ -112,7 +112,7 @@
     public void testBug305872() throws Exception {
         try {
             String[] args = new String[] {"-d", schemaDir, "-verbose",
-                                          getLocation("/wsdl/bug305872/http.xsd")};
+                                          getLocation("/validator_wsdl/bug305872/http.xsd")};
             WSDLValidator.main(args);
             
             assertTrue("Tools should check if this file is a wsdl file",

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java?rev=439084&r1=439083&r2=439084&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/common/ToolTestBase.java
Thu Aug 31 15:58:53 2006
@@ -42,7 +42,7 @@
         System.setErr(new PrintStream(errOut));
         System.setOut(new PrintStream(stdOut));
         
-        wsdlLocation = ToolTestBase.class.getResource("/wsdl/hello_world.wsdl");
+        wsdlLocation = ToolTestBase.class.getResource("/wsdl2java_wsdl/hello_world.wsdl");
     }
     
     public void tearDown() { 

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLTOJavaEOLStyleTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLTOJavaEOLStyleTest.java?rev=439084&r1=439083&r2=439084&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLTOJavaEOLStyleTest.java
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLTOJavaEOLStyleTest.java
Thu Aug 31 15:58:53 2006
@@ -40,7 +40,7 @@
     }
 
     public void testHelloWorld() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
         processor.setEnvironment(env);
         processor.process();
         File seiFile = new File(output.getCanonicalPath()

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaClientServerTest.java?rev=439084&r1=439083&r2=439084&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaClientServerTest.java
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaClientServerTest.java
Thu Aug 31 15:58:53 2006
@@ -49,7 +49,7 @@
 
     public void testGenClientOnly() throws Exception {
 
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
         env.put(ToolConstants.CFG_GEN_CLIENT, ToolConstants.CFG_GEN_CLIENT);
         processor.setEnvironment(env);
         processor.process();
@@ -69,7 +69,7 @@
 
     public void testGenServerOnly() throws Exception {
 
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
         env.put(ToolConstants.CFG_GEN_SERVER, ToolConstants.CFG_GEN_SERVER);
         processor.setEnvironment(env);
         processor.process();

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaExSoapHeaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaExSoapHeaderTest.java?rev=439084&r1=439083&r2=439084&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaExSoapHeaderTest.java
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaExSoapHeaderTest.java
Thu Aug 31 15:58:53 2006
@@ -49,7 +49,7 @@
     public void testSoapBindingDiffMessage() throws Exception {
         String[] args = new String[] {"-d", output.getCanonicalPath(), 
                                       "-exsh", "true", "-compile", 
-                                      getLocation("/wsdl/soapheader_test.wsdl")};
+                                      getLocation("/wsdl2java_wsdl/soapheader_test.wsdl")};
         WSDLToJava.main(args);
 
         Class clz = classLoader.loadClass("org.apache.header_test.TestHeader");        
@@ -69,7 +69,7 @@
 
     public void testSoapHeaderBinding() throws Exception {
         String[] args = new String[] {"-d", output.getCanonicalPath(), "-compile",
-                                      getLocation("/wsdl/soapheader_test.wsdl")};
+                                      getLocation("/wsdl2java_wsdl/soapheader_test.wsdl")};
         WSDLToJava.main(args);
 
         Class clz = classLoader.loadClass("org.apache.header_test.TestHeader");

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaMIMETest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaMIMETest.java?rev=439084&r1=439083&r2=439084&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaMIMETest.java
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaMIMETest.java
Thu Aug 31 15:58:53 2006
@@ -38,7 +38,7 @@
 
 //    public void testHelloWorld() throws Exception {
 //        String[] args = new String[] {"-d", output.getCanonicalPath(),
-//                                      getLocation("/wsdl/binary_attachment.wsdl")};
+//                                      getLocation("/wsdl2java_wsdl/binary_attachment.wsdl")};
 //        WSDLToJava.main(args);
 //        assertNotNull(output);
 //        File org = new File(output, "org");
@@ -70,8 +70,8 @@
 //
 //    public void testWithExternalBindingSwitch() throws Exception {
 //        String[] args = new String[] {"-d", output.getCanonicalPath(), "-b",
-//                                      getLocation("/wsdl/mime_binding.wsdl"),
-//                                      getLocation("/wsdl/binary_attachment.wsdl")};
+//                                      getLocation("/wsdl2java_wsdl/mime_binding.wsdl"),
+//                                      getLocation("/wsdl2java_wsdl/binary_attachment.wsdl")};
 //        WSDLToJava.main(args);
 //        assertNotNull(output);
 //        File org = new File(output, "org");

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessorTest.java?rev=439084&r1=439083&r2=439084&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessorTest.java
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaProcessorTest.java
Thu Aug 31 15:58:53 2006
@@ -66,7 +66,7 @@
     }
 
     public void testRPCLit() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world_rpc_lit.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_rpc_lit.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
@@ -103,7 +103,7 @@
     }
 
     public void testAsynMethod() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world_async.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_async.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
@@ -138,7 +138,7 @@
 
     public void testHelloWorld() throws Exception {
 
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
@@ -212,7 +212,7 @@
     }
 
     public void testDocLitHolder() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/mapping-doc-literal.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/mapping-doc-literal.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
@@ -239,7 +239,7 @@
     }
 
     public void testSchemaImport() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world_schema_import.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_schema_import.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
@@ -275,8 +275,8 @@
 
     public void testExternalJaxbBinding() throws Exception {
         String[] args = new String[] {"-d", output.getCanonicalPath(), "-b",
-                                      getLocation("/wsdl/hello_world_schema_import.xjb"),
-                                      getLocation("/wsdl/hello_world_schema_import.wsdl")};
+                                      getLocation("/wsdl2java_wsdl/hello_world_schema_import.xjb"),
+                                      getLocation("/wsdl2java_wsdl/hello_world_schema_import.wsdl")};
         WSDLToJava.main(args);
 
         assertNotNull(output);
@@ -294,7 +294,7 @@
     }
 
     public void testExceptionNameCollision() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/InvoiceServer.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/InvoiceServer.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
@@ -326,7 +326,7 @@
     }
 
     public void testAllNameCollision() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world_collision.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_collision.wsdl"));
         env.setPackageName("org.apache");
         processor.setEnvironment(env);
         processor.process();
@@ -356,7 +356,8 @@
     }
 
     public void testImportNameCollision() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/helloworld-portname_servicename.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL,
+                getLocation("/wsdl2java_wsdl/helloworld-portname_servicename.wsdl"));
         env.setPackageName("org.apache");
         processor.setEnvironment(env);
         processor.process();
@@ -381,8 +382,8 @@
     }
 
     public void testHelloWorldExternalBindingFile() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world_jaxws_base.wsdl"));
-        env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl/hello_world_jaxws_binding.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_jaxws_base.wsdl"));
+        env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/hello_world_jaxws_binding.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
@@ -402,7 +403,7 @@
     }
 
     public void testSoapHeader() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/soap_header.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/soap_header.wsdl"));
         env.setPackageName("org.apache");
         processor.setEnvironment(env);
         processor.process();
@@ -439,7 +440,7 @@
     }
 
     public void testHolderHeader() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world_holder.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_holder.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
@@ -466,7 +467,7 @@
     public void testNamespacePackageMapping1() throws Exception {
         env.setPackageName("org.cxf");
         env.addNamespacePackageMap("http://apache.org/hello_world_soap_http/types", "org.apache.types");
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
@@ -492,7 +493,7 @@
     public void testNamespacePackageMapping2() throws Exception {
         env.setPackageName("org.cxf");
         env.addNamespacePackageMap("http://apache.org/hello_world_soap_http", "org.apache");
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
@@ -517,7 +518,7 @@
 
     public void testNamespacePackageMapping3() throws Exception {
         env.addNamespacePackageMap("http://apache.org/hello_world_soap_http", "org.cxf");
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
@@ -544,8 +545,8 @@
 
     public void testWSAddress() throws Exception {
         env.addNamespacePackageMap("http://apache.org/hello_world_soap_http", "ws.address");
-        env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl/ws_address_binding.wsdl"));
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world_addr.wsdl"));
+        env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/ws_address_binding.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_addr.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
@@ -569,20 +570,20 @@
     }
 
     public void testSupportXMLBindingBare() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/xml_http_bare.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/xml_http_bare.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
     }
 
     public void testSupportXMLBindingWrapped() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/xml_http_wrapped.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/xml_http_wrapped.wsdl"));
         processor.setEnvironment(env);
         processor.process();
     }
 
     public void testRouterWSDL() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/router.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/router.wsdl"));
         processor.setEnvironment(env);
         processor.process();
     }
@@ -592,7 +593,7 @@
         String[] args = new String[] {"-d", output.getCanonicalPath(), "-nexclude",
                                       "http://apache.org/test/types=com.iona", "-nexclude",
                                       "http://apache.org/Invoice",
-                                      getLocation("/wsdl/hello_world_exclude.wsdl")};
+                                      getLocation("/wsdl2java_wsdl/hello_world_exclude.wsdl")};
         WSDLToJava.main(args);
 
         assertNotNull(output);
@@ -612,7 +613,7 @@
 
         String[] args = new String[] {"-d", output.getCanonicalPath(), "-nexclude",
                                       "http://apache.org/test/types",
-                                      getLocation("/wsdl/hello_world_exclude.wsdl")};
+                                      getLocation("/wsdl2java_wsdl/hello_world_exclude.wsdl")};
         WSDLToJava.main(args);
 
         assertNotNull(output);
@@ -625,7 +626,8 @@
         String[] args = new String[] {"-compile", "-d", output.getCanonicalPath(), "-classdir",
                                       output.getCanonicalPath() + "/classes", "-p", "org.cxf",
"-p",
                                       "http://apache.org/hello_world_soap_http/types=org.apache.types",
-                                      "-client", "-server", "-impl", getLocation("/wsdl/hello_world.wsdl")};
+                                      "-client", "-server", "-impl",
+                                      getLocation("/wsdl2java_wsdl/hello_world.wsdl")};
         WSDLToJava.main(args);
 
         Class clz = classLoader.loadClass("org.cxf.Greeter");
@@ -635,7 +637,7 @@
 
     public void testDefaultLoadNSMappingOFF() throws Exception {
         String[] args = new String[] {"-dns", "false", "-d", output.getCanonicalPath(),
-                                      getLocation("/wsdl/basic_callback.wsdl")};
+                                      getLocation("/wsdl2java_wsdl/basic_callback.wsdl")};
 
         WSDLToJava.main(args);
 
@@ -657,7 +659,7 @@
 
     public void testDefaultLoadNSMappingON() throws Exception {
         String[] args = new String[] {"-d", output.getCanonicalPath(),
-                                      getLocation("/wsdl/basic_callback.wsdl")};
+                                      getLocation("/wsdl2java_wsdl/basic_callback.wsdl")};
 
         WSDLToJava.main(args);
 
@@ -678,7 +680,7 @@
     }
 
     public void testWithNoService() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/helloworld-noservice.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/helloworld-noservice.wsdl"));
         processor.setEnvironment(env);
         processor.process();
         Class clz = classLoader.loadClass("org.apache.tuscany.samples.helloworldaxis.HelloWorldServiceImpl");
@@ -696,7 +698,7 @@
     }
 
     public void testWithNoBinding() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/helloworld-nobinding.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/helloworld-nobinding.wsdl"));
         processor.setEnvironment(env);
         processor.process();
         Class clz = classLoader.loadClass("org.apache.tuscany.samples.helloworldaxis.HelloWorldServiceImpl");
@@ -716,7 +718,7 @@
     }
 
     public void testVoidInOutMethod() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/interoptestdoclit.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/interoptestdoclit.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
@@ -745,7 +747,7 @@
     }
 
     public void testWsdlImport() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/hello_world_wsdl_import.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_wsdl_import.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
@@ -771,7 +773,7 @@
     }
 
     public void testWebFault() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/InvoiceServer-issue305570.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/InvoiceServer-issue305570.wsdl"));
         processor.setEnvironment(env);
         processor.process();
 
@@ -794,7 +796,7 @@
 
     public void testMultiSchemaParsing() throws Exception {
         String[] args = 
-            new String[] {"-d", output.getCanonicalPath(), getLocation("/wsdl/multi_schema.wsdl")};
+            new String[] {"-d", output.getCanonicalPath(), getLocation("/wsdl2java_wsdl/multi_schema.wsdl")};
         WSDLToJava.main(args);
 
         assertNotNull(output);
@@ -817,7 +819,7 @@
                                           "-nexclude",
                                           "http://www.w3.org/2005/08/addressing"
                                               + "=org.apache.cxf.ws.addressing",
-                                          getLocation("/wsdl/bug305728/hello_world.wsdl")};
+                                          getLocation("/wsdl2java_wsdl/bug305728/hello_world.wsdl")};
             WSDLToJava.main(args);
         } catch (Exception e) {
             e.printStackTrace(System.err);
@@ -852,7 +854,7 @@
             String[] args = new String[] {"-compile", "-classdir", output.getCanonicalPath()
+ "/classes",
                                           "-d", output.getCanonicalPath(), "-nexclude",
                                           "http://apache.org/hello_world/types",
-                                          getLocation("/wsdl/bug305728/hello_world2.wsdl")};
+                                          getLocation("/wsdl2java_wsdl/bug305728/hello_world2.wsdl")};
             WSDLToJava.main(args);
         } catch (Exception e) {
             e.printStackTrace();
@@ -874,7 +876,7 @@
     }
 
     public void testBug305729() {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/bug305729/hello_world.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug305729/hello_world.wsdl"));
         processor.setEnvironment(env);
         processor.process();
         assertNotNull("Process message with no part wsdl error", output);
@@ -886,7 +888,7 @@
             env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
             env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes");
             env.put(ToolConstants.CFG_CLIENT, ToolConstants.CFG_CLIENT);
-            env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/bug305700/addNumbers.wsdl"));
+            env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug305700/addNumbers.wsdl"));
             processor.setEnvironment(env);
             processor.process();
         } catch (Exception e) {
@@ -900,7 +902,7 @@
             env.put(ToolConstants.CFG_IMPL, ToolConstants.CFG_IMPL);
             env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
             env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes");
-            env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/bug305773/hello_world.wsdl"));
+            env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug305773/hello_world.wsdl"));
             processor.setEnvironment(env);
             processor.process();
             Class clz = classLoader.loadClass("org.apache.hello_world_soap_http.GreeterImpl");
@@ -924,7 +926,7 @@
             env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
             env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes");
             // env.put(ToolConstants.CFG_CLIENT, ToolConstants.CFG_CLIENT);
-            env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/bug305772/hello_world.wsdl"));
+            env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug305772/hello_world.wsdl"));
             processor.setEnvironment(env);
             processor.process();
             File file = new File(output.getCanonicalPath(), "build.xml");
@@ -947,7 +949,7 @@
             env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
             env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes");
             env.put(ToolConstants.CFG_ALL, ToolConstants.CFG_ALL);
-            env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/bug305770/Printer.wsdl"));
+            env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/bug305770/Printer.wsdl"));
             processor.setEnvironment(env);
             processor.process();
         } catch (Exception e) {
@@ -956,7 +958,8 @@
     }
 
     public void testHangingBug() throws Exception {
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/bughanging/wsdl/wsrf.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL,
+                getLocation("/wsdl2java_wsdl/bughanging/wsdl/wsrf.wsdl"));
         processor.setEnvironment(env);
         processor.process();
     }
@@ -966,8 +969,8 @@
             String[] args = new String[] {"-all", "-compile", "-classdir",
                                           output.getCanonicalPath() + "/classes", "-d",
                                           output.getCanonicalPath(), "-b",
-                                          getLocation("/wsdl/bug305924/binding2.xml"),
-                                          getLocation("/wsdl/bug305924/hello_world.wsdl")};
+                                          getLocation("/wsdl2java_wsdl/bug305924/binding2.xml"),
+                                          getLocation("/wsdl2java_wsdl/bug305924/hello_world.wsdl")};
             WSDLToJava.main(args);
         } catch (Exception e) {
             e.printStackTrace(System.err);
@@ -987,8 +990,8 @@
             String[] args = new String[] {"-all", "-compile", "-classdir",
                                           output.getCanonicalPath() + "/classes", "-d",
                                           output.getCanonicalPath(), "-b",
-                                          getLocation("/wsdl/bug305924/binding1.xml"),
-                                          getLocation("/wsdl/bug305924/hello_world.wsdl")};
+                                          getLocation("/wsdl2java_wsdl/bug305924/binding1.xml"),
+                                          getLocation("/wsdl2java_wsdl/bug305924/hello_world.wsdl")};
             WSDLToJava.main(args);
         } catch (Exception e) {
             e.printStackTrace(System.err);
@@ -1005,7 +1008,7 @@
 
     public void testInvalidMepOperation() throws Exception {
         try {
-            env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/invalid_mep.wsdl"));
+            env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/invalid_mep.wsdl"));
             processor.setEnvironment(env);
             processor.process();
         } catch (Exception e) {

Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaXMLFormatTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaXMLFormatTest.java?rev=439084&r1=439083&r2=439084&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaXMLFormatTest.java
(original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/java/org/apache/cxf/tools/wsdl2java/processor/WSDLToJavaXMLFormatTest.java
Thu Aug 31 15:58:53 2006
@@ -34,7 +34,7 @@
     public void testXMLFormatRootNodeValidationFail() throws Exception {
         WSDLToJavaProcessor processor = new WSDLToJavaProcessor();
         env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/xml_format_fail.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/xml_format_fail.wsdl"));
         env.put(ToolConstants.CFG_VALIDATE_WSDL, ToolConstants.CFG_VALIDATE_WSDL);
         System.setProperty(ToolConstants.CXF_SCHEMA_DIR, getLocation("/schemas"));
         processor.setEnvironment(env);
@@ -51,7 +51,7 @@
     public void testXMLFormatRootNodeValidationPass() throws Exception {
         WSDLToJavaProcessor processor = new WSDLToJavaProcessor();
         env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
-        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl/xml_format_pass.wsdl"));
+        env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/xml_format_pass.wsdl"));
         processor.setEnvironment(env);
         processor.process();
     }



Mime
View raw message