cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1401769 - in /cxf/branches/2.6.x-fixes/tools: validator/src/main/java/org/apache/cxf/tools/validator/internal/ wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/ wsdlto/test/src/test/java/org/apache/cxf/too...
Date Wed, 24 Oct 2012 16:38:40 GMT
Author: dkulp
Date: Wed Oct 24 16:38:39 2012
New Revision: 1401769

URL: http://svn.apache.org/viewvc?rev=1401769&view=rev
Log:
Merged revisions 1401764 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1401764 | dkulp | 2012-10-24 12:25:11 -0400 (Wed, 24 Oct 2012) | 3 lines

  Turn on wsdl validation for a much larger set of the tooling tests and fix some of the issues
that reveals.
  Should make it easier/quicker to spot if changes to the validation code will cause issues.

........

Modified:
    cxf/branches/2.6.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java
    cxf/branches/2.6.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDL11Validator.java
    cxf/branches/2.6.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
    cxf/branches/2.6.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
    cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java
    cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
    cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
    cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf2193/hello_world_extension_wrapped.wsdl
    cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/jms_test_rpc_fault.wsdl
    cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/mapping-doc-literal.wsdl
    cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/schema1.xsd
    cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/schema2.xsd

Modified: cxf/branches/2.6.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java?rev=1401769&r1=1401768&r2=1401769&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java
Wed Oct 24 16:38:39 2012
@@ -53,7 +53,7 @@ public class UniqueBodyPartsValidator ex
             List<BindingOperation> ops = CastUtils.cast(binding.getBindingOperations());
             for (BindingOperation op : ops) {
                 Operation operation = op.getOperation();
-                if (operation.getInput() != null) {
+                if (operation != null && operation.getInput() != null) {
                     Message inMessage = operation.getInput().getMessage();
                     BindingInput bin = op.getBindingInput();
                     Set<String> headers = new HashSet<String>();

Modified: cxf/branches/2.6.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDL11Validator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDL11Validator.java?rev=1401769&r1=1401768&r2=1401769&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDL11Validator.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDL11Validator.java
Wed Oct 24 16:38:39 2012
@@ -136,6 +136,7 @@ public class WSDL11Validator extends Abs
             }
         }
         if (notValid) {
+            System.out.println(this.getErrorMessage());
             throw new ToolException(this.getErrorMessage());            
         }
 

Modified: cxf/branches/2.6.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java?rev=1401769&r1=1401768&r2=1401769&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
Wed Oct 24 16:38:39 2012
@@ -372,6 +372,10 @@ public class WSIBPValidator extends Abst
                                    + binding.getQName() + "> is NOT a SOAP binding");
                 continue;
             }
+            if (binding.getPortType() == null) {
+                //will error later
+                continue;
+            }
 
             for (Iterator<?> ite2 = binding.getPortType().getOperations().iterator();
ite2.hasNext();) {
                 Operation operation = (Operation)ite2.next();

Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=1401769&r1=1401768&r2=1401769&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Wed Oct 24 16:38:39 2012
@@ -22,6 +22,8 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.io.Writer;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -646,7 +648,7 @@ public class JAXBDataBinding implements 
                     } catch (Throwable ex) {
                         //ignore - DOM level 3
                     }
-                    validateSchema(ele, uri, catalog);
+                    validateSchema(ele, uri, catalog, schemaCollection);
                 }
                 ele = removeImportElement(ele, key, catalog);
                 try {
@@ -715,7 +717,7 @@ public class JAXBDataBinding implements 
                 ids.add(key);
                 Element ele = sci.getElement();
                 if (context.fullValidateWSDL()) {
-                    validateSchema(ele, sci.getSystemId(), catalog);
+                    validateSchema(ele, sci.getSystemId(), catalog, schemaCollection);
                 }
                 ele = removeImportElement(ele, key, catalog);
                 InputSource is = new InputSource((InputStream)null);
@@ -955,8 +957,10 @@ public class JAXBDataBinding implements 
     }
 
 
-    public void validateSchema(Element ele, String uri,
-                               final OASISCatalogManager catalog) throws ToolException {
+    public void validateSchema(Element ele, 
+                               String uri,
+                               final OASISCatalogManager catalog,
+                               final SchemaCollection schemaCollection) throws ToolException
{
         SchemaFactory schemaFact = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
         schemaFact.setResourceResolver(new LSResourceResolver() {
             public LSInput resolveResource(String type,
@@ -965,6 +969,15 @@ public class JAXBDataBinding implements 
                                            String systemId,
                                            String baseURI) {
                 String s = JAXBDataBinding.mapSchemaLocation(systemId, baseURI, catalog);
+                //System.out.println(namespaceURI + " " + systemId + " " + baseURI + " "
+ s);
+                if (s == null) {
+                    XmlSchema sc = schemaCollection.getSchemaByTargetNamespace(namespaceURI);
+                    StringWriter writer = new StringWriter();
+                    sc.write(writer);
+                    InputSource src = new InputSource(new StringReader(writer.toString()));
+                    src.setSystemId(sc.getSourceURI());
+                    return new LSInputSAXWrapper(src);
+                }
                 return new LSInputSAXWrapper(new InputSource(s));
             }
         });
@@ -975,6 +988,7 @@ public class JAXBDataBinding implements 
             if (e.getLocalizedMessage().indexOf("src-resolve.4.2") > -1)  {
                 //Ignore schema resolve error and do nothing
             } else {
+                //e.printStackTrace();
                 throw new ToolException("Schema Error : " + e.getLocalizedMessage(), e);
             }
         }

Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java?rev=1401769&r1=1401768&r2=1401769&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java
Wed Oct 24 16:38:39 2012
@@ -50,6 +50,7 @@ public abstract class AbstractCodeGenTes
             env.put(ToolConstants.CFG_IMPL, "impl");
             env.put(ToolConstants.CFG_OUTPUTDIR, tmpDir.getRoot().toString());
             env.put(ToolConstants.CFG_SUPPRESS_WARNINGS, true);
+            env.put(ToolConstants.CFG_VALIDATE_WSDL, true);
         }
     };
     //CHECKSTYLE:ON

Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=1401769&r1=1401768&r2=1401769&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Wed Oct 24 16:38:39 2012
@@ -79,6 +79,8 @@ public class CodeGenBugTest extends Abst
     @Test
     public void testCXF1969() throws Exception {
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/cxf1969/report_incident.wsdl"));
+        //wsdl is invalid, but want to test some of the parsing of the invalid parts
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL); 
         processor.setContext(env);
 
         try {
@@ -93,6 +95,7 @@ public class CodeGenBugTest extends Abst
     public void testLogicalOnlyWSDL() throws Exception {
         env.put(ToolConstants.CFG_WSDLURL,
                 getLocation("/wsdl2java_wsdl/cxf-1678/hello_world_logical_only.wsdl"));
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL); //no binding/service
         processor.setContext(env);
         processor.execute();
 
@@ -381,6 +384,7 @@ public class CodeGenBugTest extends Abst
     @Test
     public void testWsdlNoService() throws Exception {
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/helloworld_withnoservice.wsdl"));
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL); //no binding/service
         processor.setContext(env);
         processor.execute();
     }
@@ -620,6 +624,7 @@ public class CodeGenBugTest extends Abst
     @Test
     public void testRecursiveImport() throws Exception {
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/cxf778/hello_world_recursive.wsdl"));
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL);
         processor.setContext(env);
         processor.execute();
         assertNotNull("Process recursive import wsdl error ", output);
@@ -694,8 +699,7 @@ public class CodeGenBugTest extends Abst
     public void testNonUniqueBody() throws Exception {
         try {
             env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/cxf939/bug.wsdl"));
-            // env.put(ToolConstants.CFG_VALIDATE_WSDL,
-            // ToolConstants.CFG_VALIDATE_WSDL);
+            env.remove(ToolConstants.CFG_VALIDATE_WSDL);
             processor.setContext(env);
             processor.execute();
         } catch (Exception e) {
@@ -902,6 +906,7 @@ public class CodeGenBugTest extends Abst
         env.put(ToolConstants.CFG_WSDLURL, "http://example.org/wsdl");
         env.put(ToolConstants.CFG_CATALOG, getLocation("/wsdl2java_wsdl/cxf1112/jax-ws-catalog.xml"));
         env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/cxf1112/binding.xml"));
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL);
         processor.setContext(env);
         processor.execute();
     }
@@ -911,6 +916,7 @@ public class CodeGenBugTest extends Abst
         env.put(ToolConstants.CFG_WSDLURL, "http://example.org/wsdl");
         env.put(ToolConstants.CFG_CATALOG, getLocation("/wsdl2java_wsdl/cxf1112/jax-ws-catalog2.xml"));
         env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/cxf1112/binding.xml"));
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL);
         processor.setContext(env);
         processor.execute();
     }

Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java?rev=1401769&r1=1401768&r2=1401769&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Wed Oct 24 16:38:39 2012
@@ -57,6 +57,7 @@ public class CodeGenTest extends Abstrac
 
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/pizza.wsdl"));
         env.put(ToolConstants.CFG_EXTRA_SOAPHEADER, "TRUE");
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL); 
         processor.setContext(env);
         processor.execute();
 
@@ -116,6 +117,7 @@ public class CodeGenTest extends Abstrac
     @Test
     public void testHeaderFromAnotherMessage2() throws Exception {
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/pizza.wsdl"));
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL); 
         processor.setContext(env);
         processor.execute();
 
@@ -149,6 +151,7 @@ public class CodeGenTest extends Abstrac
     public void testHeaderFromAnotherMessage3() throws Exception {
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/pizza.wsdl"));
         env.put(ToolConstants.CFG_EXTRA_SOAPHEADER, "FALSE");
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL); 
         processor.setContext(env);
         processor.execute();
 
@@ -367,6 +370,7 @@ public class CodeGenTest extends Abstrac
     @Test
     public void testAsyncMethodNoService() throws Exception {
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_async_noservice.wsdl"));
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL); //no binding so all the tests that check
bindings fail
         processor.setContext(env);
         processor.execute();
 
@@ -870,6 +874,7 @@ public class CodeGenTest extends Abstrac
     @Test
     public void testHolderHeader() throws Exception {
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world_holder.wsdl"));
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL); // testing multiple parts in body
         processor.setContext(env);
         processor.execute();
 
@@ -930,6 +935,7 @@ public class CodeGenTest extends Abstrac
     @Test
     public void testVoidInOutMethod() throws Exception {
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/interoptestdoclit.wsdl"));
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL);
         processor.setContext(env);
         processor.execute();
 
@@ -1138,6 +1144,7 @@ public class CodeGenTest extends Abstrac
 
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/swa-mime.wsdl"));
         env.put(ToolConstants.CFG_BINDING, getLocation("/wsdl2java_wsdl/swa-mime-binding.xml"));
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL); // swa-mime puts multple parts in body
         processor.setContext(env);
         processor.execute();
         Class<?> clz = classLoader.loadClass("org.apache.cxf.swa.SwAServiceInterface");
@@ -1156,6 +1163,9 @@ public class CodeGenTest extends Abstrac
     @Test
     public void testRPCHeader() throws Exception {
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/soapheader_rpc.wsdl"));
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL); // headers must be element, but validation
+                       // doesn't fully process the entire soap:binding information to 
+                       // to figure out which parts are headers and which are body for rpc/lit
         processor.setContext(env);
         processor.execute();
         Class<?> cls = classLoader.loadClass("org.apache.header_test.rpc.TestRPCHeader");
@@ -1228,9 +1238,10 @@ public class CodeGenTest extends Abstrac
     }
 
     @Test
-    public void testWebFaultAnnotaion() throws Exception {
+    public void testWebFaultAnnotation() throws Exception {
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/jms_test_rpc_fault.wsdl"));
         env.put(ToolConstants.CFG_SERVICENAME, "HelloWorldService");
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL); //testing some technically invalid fault
message formats
         processor.setContext(env);
         processor.execute();
         Class<?> cls = classLoader.loadClass("org.apache.cxf.w2j.hello_world_jms.BadRecordLitFault");
@@ -1286,7 +1297,8 @@ public class CodeGenTest extends Abstrac
     public void testMimeFromCommandLine() throws Exception {
         env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello-mime.wsdl"));
         env.put(ToolConstants.CFG_MIMEMETHODS, new String[0]);
-
+        env.remove(ToolConstants.CFG_VALIDATE_WSDL);
+        
         processor.setContext(env);
         processor.execute();
 

Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf2193/hello_world_extension_wrapped.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf2193/hello_world_extension_wrapped.wsdl?rev=1401769&r1=1401768&r2=1401769&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf2193/hello_world_extension_wrapped.wsdl
(original)
+++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf2193/hello_world_extension_wrapped.wsdl
Wed Oct 24 16:38:39 2012
@@ -63,7 +63,6 @@
 	</wsdl:message>
 
 	<wsdl:portType name="Greeter">
-		>
 		<wsdl:operation name="greetMe">
 			<wsdl:input name="greetMeRequest" message="tns:greetMeRequest" />
 			<wsdl:output name="greetMeResponse" message="tns:greetMeResponse" />

Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/jms_test_rpc_fault.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/jms_test_rpc_fault.wsdl?rev=1401769&r1=1401768&r2=1401769&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/jms_test_rpc_fault.wsdl
(original)
+++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/jms_test_rpc_fault.wsdl
Wed Oct 24 16:38:39 2012
@@ -156,10 +156,10 @@
                 <soap:body namespace="http://cxf.apache.org/w2j/hello_world_jms"  use="literal"/>
             </output>
             <fault name="NoSuchCodeLitFault">
-                <soap:fault name="NoSuchCodeLitFault" namespace="http://cxf.apache.org/w2j/hello_world_jms"
use="literal"/>
+                <soap:fault name="NoSuchCodeLitFault" use="literal"/>
             </fault>
             <fault name="BadRecordLitFault">
-                <soap:fault name="BadRecordLitFault" namespace="http://cxf.apache.org/w2j/hello_world_jms"
use="literal"/>
+                <soap:fault name="BadRecordLitFault" use="literal"/>
             </fault>
         </operation>
     </binding>

Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/mapping-doc-literal.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/mapping-doc-literal.wsdl?rev=1401769&r1=1401768&r2=1401769&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/mapping-doc-literal.wsdl
(original)
+++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/mapping-doc-literal.wsdl
Wed Oct 24 16:38:39 2012
@@ -99,6 +99,15 @@
                 <soap:body use="literal"/>
             </output>
         </operation>
+        <operation name="gdocsRequest">
+            <soap:operation soapAction="" style="document"/>
+            <input name="gdocsRequest">
+                <soap:body use="literal"/>
+            </input>
+            <output name="gdocsResponse">
+                <soap:body use="literal"/>
+            </output>
+        </operation>
     </binding>
     <service name="SomethingService">
         <port binding="tns:SomethingServerSOAPBinding" name="SOAPOverHTTPPort">

Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/schema1.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/schema1.xsd?rev=1401769&r1=1401768&r2=1401769&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/schema1.xsd
(original)
+++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/schema1.xsd
Wed Oct 24 16:38:39 2012
@@ -19,9 +19,9 @@
 -->
 <xs:schema version="1.0" targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http/types"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-  <xs:import namespace="http://cxf.apache.org/w2j/hello_world_soap_http/types" schemaLocation="./schema2.xsd"/>
+  <xs:include schemaLocation="./schema2.xsd"/>
 
-  <xs:import namespace="http://cxf.apache.org/w2j/hello_world_soap_http/types" schemaLocation="./schema3.xsd"/>
+  <xs:include schemaLocation="./schema3.xsd"/>
 
   <xs:element name="pingMe">
     <xs:complexType/>

Modified: cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/schema2.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/schema2.xsd?rev=1401769&r1=1401768&r2=1401769&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/schema2.xsd
(original)
+++ cxf/branches/2.6.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/schema2.xsd
Wed Oct 24 16:38:39 2012
@@ -19,7 +19,7 @@
 -->
 <xs:schema version="1.0" targetNamespace="http://cxf.apache.org/w2j/hello_world_soap_http/types"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
-  <xs:import namespace="http://cxf.apache.org/w2j/hello_world_soap_http/types" schemaLocation="./schema4.xsd"/>
+  <xs:include schemaLocation="./schema4.xsd"/>
 
   <xs:element name="sayHi">
     <xs:complexType/>



Mime
View raw message