cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject svn commit: r472123 - in /incubator/cxf/trunk: common/common/src/main/java/org/apache/cxf/resource/ common/common/src/test/java/org/apache/cxf/resource/ rt/core/src/test/java/org/apache/cxf/wsdl11/ rt/core/src/test/resources/org/apache/cxf/wsdl11/ rt/c...
Date Tue, 07 Nov 2006 14:10:33 GMT
Author: tli
Date: Tue Nov  7 06:10:31 2006
New Revision: 472123

URL: http://svn.apache.org/viewvc?view=rev&rev=472123
Log:
CXF-178 support complex schema import

Added:
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/s5/
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/s5/schema5.xsd
  (with props)
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/schema4.xsd
  (with props)
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/schema2.xsd
  (with props)
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s3/
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s3/schema3.xsd
  (with props)
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/schema1.xsd  
(with props)
Removed:
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema1.xsd
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema2.xsd
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema3.xsd
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema4.xsd
Modified:
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
    incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/XmlSchemaURIResolver.java
    incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/resource/URIResolverTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
    incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?view=diff&rev=472123&r1=472122&r2=472123
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
(original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Tue Nov  7 06:10:31 2006
@@ -124,8 +124,13 @@
                 } else {
                     Location location = null;
                     // assume that the outmost element of history is parent
-                    if (!history.empty()) {
+                    while (!history.empty()) {
                         location = history.pop();
+                        if (location.getRelative().equals(baseUriStr)) {
+                            break;
+                        } else {
+                            location = null;
+                        }
                     }
                     if (location != null) {
                         URI result = getAbsoluteFileStr(location.base, location.relative).resolve(relative);
@@ -146,10 +151,16 @@
         throws IOException, MalformedURLException {
         if (baseUriStr == null && uriStr == null) {
             return;
-        }        
+        }                
         URI finalRelative = getAbsoluteFileStr(baseUriStr, uriStr);
+        try {
+            if (!(new URI(uriStr)).isAbsolute()) {
+                history.push(new Location(baseUriStr, uriStr));
+            } 
+        } catch (URISyntaxException ue) {
+            // move on
+        }
         if (finalRelative != null) {
-            history.push(new Location(baseUriStr, uriStr));
             File targetFile = new File(finalRelative);
             if (!targetFile.exists() && baseUriStr.startsWith("file:/")) {
                 targetFile = new File(baseUriStr.substring(6));

Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/XmlSchemaURIResolver.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/XmlSchemaURIResolver.java?view=diff&rev=472123&r1=472122&r2=472123
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/XmlSchemaURIResolver.java
(original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/XmlSchemaURIResolver.java
Tue Nov  7 06:10:31 2006
@@ -19,6 +19,9 @@
 package org.apache.cxf.resource;
 
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Stack;
 
 import org.xml.sax.InputSource;
 
@@ -31,36 +34,64 @@
  */
 public class XmlSchemaURIResolver implements URIResolver {
 
-    private org.apache.cxf.resource.URIResolver resolver;
-
-    public XmlSchemaURIResolver() {
-        try {
-            resolver = new org.apache.cxf.resource.URIResolver();
-        } catch (IOException e) {
-            // move on...
+    private Stack<ResolverInfo> stack = new Stack<ResolverInfo>();
+    private org.apache.cxf.resource.URIResolver currentResolver;
+    
+    private class ResolverInfo {
+        String uri;
+        org.apache.cxf.resource.URIResolver resolver;
+        public ResolverInfo(String uri, org.apache.cxf.resource.URIResolver resolver) {
+            this.uri = uri;
+            this.resolver = resolver;
+        }
+        public String getUri() {
+            return uri;
+        }
+        public org.apache.cxf.resource.URIResolver getResolver() {
+            return resolver;
         }
     }
-
     public InputSource resolveEntity(String targetNamespace, String schemaLocation, String
baseUri) {
-        try {
-            resolver.resolveStateful(baseUri, schemaLocation, getClass());
+        try {            
+            if (new URI(baseUri).isAbsolute()) {
+                currentResolver = new org.apache.cxf.resource.URIResolver();
+                stack.addElement(new ResolverInfo(schemaLocation, currentResolver));    
       
+            } else {
+                while (!stack.isEmpty()) {
+                    ResolverInfo ri = stack.pop();
+                    if (ri.getUri().equals(baseUri)) {
+                        currentResolver = ri.getResolver();
+                        stack.addElement(ri);
+                        break;
+                    }
+                }
+                stack.addElement(new ResolverInfo(schemaLocation, currentResolver));    
       
+            }
+            if (currentResolver == null) {
+                throw new RuntimeException("invalidate schema import");
+            }
+            currentResolver.resolveStateful(baseUri, schemaLocation, getClass());
+            if (currentResolver.isResolved()) {
+                if (currentResolver.getURI().isAbsolute()) {
+                    // When importing a relative file,
+                    // setSystemId with an absolute path so the
+                    // resolver finds any files which that file
+                    // imports with locations relative to it.
+                    schemaLocation = currentResolver.getURI().toString();
+                }
+                InputSource source = new InputSource(currentResolver.getInputStream());
+                source.setSystemId(schemaLocation);
+                return source;
+            }
+
         } catch (IOException e) {
             // move on...
-        }
-        if (resolver.isResolved()) {
-            if (resolver.getURI().isAbsolute()) {
-                // When importing a relative file,
-                // setSystemId with an absolute path so the
-                // resolver finds any files which that file
-                // imports with locations relative to it.
-                schemaLocation = resolver.getURI().toString();
-            }
-            InputSource source = new InputSource(resolver.getInputStream());
-            source.setSystemId(schemaLocation);
-            return source;
+        } catch (URISyntaxException use) {            
+            // move on...
         }
 
         return new InputSource(schemaLocation);
+
     }
 
 }

Modified: incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/resource/URIResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/resource/URIResolverTest.java?view=diff&rev=472123&r1=472122&r2=472123
==============================================================================
--- incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/resource/URIResolverTest.java
(original)
+++ incubator/cxf/trunk/common/common/src/test/java/org/apache/cxf/resource/URIResolverTest.java
Tue Nov  7 06:10:31 2006
@@ -35,26 +35,18 @@
         assertEquals("check level 1: ", "file:/c:/tmp1/tmp2/b.xsd", uriResolver.getURI().toString());
 
         try {
-            uriResolver.resolveStateful("./b.xsd", "./tmp3/c.xsd", getClass());
+            uriResolver.resolveStateful("./tmp2/b.xsd", "./tmp3/c.xsd", getClass());
         } catch (IOException ioe) {
             // ignore the io exception, due to file not exist
         }
         assertEquals("check level 2: ", "file:/c:/tmp1/tmp2/tmp3/c.xsd", uriResolver.getURI().toString());
 
         try {
-            uriResolver.resolveStateful("./c.xsd", "./tmp4/d.xsd", getClass());
+            uriResolver.resolveStateful("./tmp3/c.xsd", "./tmp4/d.xsd", getClass());
         } catch (IOException ioe) {
             // ignore the io exception, due to file not exist
         }
         assertEquals("check level 3: ", "file:/c:/tmp1/tmp2/tmp3/tmp4/d.xsd", uriResolver.getURI()
-            .toString());
-
-        try {
-            uriResolver.resolveStateful("file:/c:/tmp1/tmp2/b.xsd", "./tmp4/d.xsd", getClass());
-        } catch (IOException ioe) {
-            // ignore the io exception, due to file not exist
-        }
-        assertEquals("check level 2 again: ", "file:/c:/tmp1/tmp2/tmp4/d.xsd", uriResolver.getURI()
             .toString());
 
     }

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java?view=diff&rev=472123&r1=472122&r2=472123
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
(original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
Tue Nov  7 06:10:31 2006
@@ -19,6 +19,9 @@
 
 package org.apache.cxf.wsdl11;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.net.URI;
 import java.util.Collection;
 import java.util.List;
 import java.util.logging.Logger;
@@ -28,13 +31,19 @@
 import javax.wsdl.factory.WSDLFactory;
 import javax.wsdl.xml.WSDLReader;
 import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.validation.Schema;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
 import junit.framework.TestCase;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.helpers.XMLUtils;
 import org.apache.cxf.service.model.BindingFaultInfo;
 import org.apache.cxf.service.model.BindingInfo;
 import org.apache.cxf.service.model.BindingMessageInfo;
@@ -55,16 +64,25 @@
 public class WSDLServiceBuilderTest extends TestCase {
 
     private static final Logger LOG = Logger.getLogger(WSDLServiceBuilderTest.class.getName());
+
     private static final String WSDL_PATH = "hello_world.wsdl";
+
     private static final String BARE_WSDL_PATH = "hello_world_bare.wsdl";
+
     private static final String IMPORT_WSDL_PATH = "hello_world_schema_import.wsdl";
+
     private Definition def;
+
     private Service service;
+
     private ServiceInfo serviceInfo;
 
     private IMocksControl control;
+
     private Bus bus;
+
     private BindingFactoryManager bindingFactoryManager;
+
     private DestinationFactoryManager destinationFactoryManager;
 
     public void setUp() throws Exception {
@@ -94,8 +112,8 @@
         wsdlServiceBuilder = new WSDLServiceBuilder(bus);
 
         EasyMock.expect(bus.getExtension(BindingFactoryManager.class)).andReturn(bindingFactoryManager);
-        EasyMock.expect(bus.getExtension(DestinationFactoryManager.class))
-            .andReturn(destinationFactoryManager);
+        EasyMock.expect(bus.getExtension(DestinationFactoryManager.class)).andReturn(
+                destinationFactoryManager);
 
         control.replay();
         serviceInfo = wsdlServiceBuilder.buildService(def, service);
@@ -115,7 +133,7 @@
 
         assertEquals("Incorrect number of endpoints", serviceInfo.getEndpoints().size(),
1);
         EndpointInfo ei = serviceInfo.getEndpoint(new QName("http://apache.org/hello_world_soap_http",
-                                                            "SoapPort"));
+                "SoapPort"));
         assertNotNull(ei);
         assertEquals("http://schemas.xmlsoap.org/wsdl/soap/", ei.getTransportId());
         assertNotNull(ei.getBinding());
@@ -129,8 +147,7 @@
         QName name = new QName(serviceInfo.getName().getNamespaceURI(), "sayHi");
         assertEquals(serviceInfo.getInterface().getOperations().size(), 4);
         OperationInfo sayHi = serviceInfo.getInterface().getOperation(
-                                                                      new QName(serviceInfo.getName()
-                                                                          .getNamespaceURI(),
"sayHi"));
+                new QName(serviceInfo.getName().getNamespaceURI(), "sayHi"));
         assertNotNull(sayHi);
         assertEquals(sayHi.getName(), name);
         assertFalse(sayHi.isOneWay());
@@ -150,13 +167,13 @@
         MessagePartInfo part = inParts.get(0);
         assertNotNull(part.getXmlSchema());
         assertTrue(part.getXmlSchema() instanceof XmlSchemaElement);
-        
+
         List<MessagePartInfo> outParts = greetMe.getOutput().getMessageParts();
         assertEquals(1, outParts.size());
         part = outParts.get(0);
         assertNotNull(part.getXmlSchema());
         assertTrue(part.getXmlSchema() instanceof XmlSchemaElement);
-        
+
         assertTrue("greatMe should be wrapped", greetMe.isUnwrappedCapable());
         OperationInfo greetMeUnwrapped = greetMe.getUnwrappedOperation();
 
@@ -165,14 +182,14 @@
         assertEquals("wrapped part not set", 1, greetMeUnwrapped.getInput().size());
         assertEquals("wrapped part not set", 1, greetMeUnwrapped.getOutput().size());
         assertEquals("wrapper part name wrong", "requestType", greetMeUnwrapped.getInput()
-            .getMessagePartByIndex(0).getName().getLocalPart());
+                .getMessagePartByIndex(0).getName().getLocalPart());
         assertEquals("wrapper part type name wrong", "MyStringType", greetMeUnwrapped.getInput()
-            .getMessagePartByIndex(0).getTypeQName().getLocalPart());
+                .getMessagePartByIndex(0).getTypeQName().getLocalPart());
 
         assertEquals("wrapper part name wrong", "responseType", greetMeUnwrapped.getOutput()
-            .getMessagePartByIndex(0).getName().getLocalPart());
+                .getMessagePartByIndex(0).getName().getLocalPart());
         assertEquals("wrapper part type name wrong", "string", greetMeUnwrapped.getOutput()
-            .getMessagePartByIndex(0).getTypeQName().getLocalPart());
+                .getMessagePartByIndex(0).getTypeQName().getLocalPart());
 
         name = new QName(serviceInfo.getName().getNamespaceURI(), "greetMeOneWay");
         OperationInfo greetMeOneWay = serviceInfo.getInterface().getOperation(name);
@@ -225,7 +242,7 @@
         name = new QName(serviceInfo.getName().getNamespaceURI(), "greetMe");
         BindingOperationInfo greetMe = bindingInfo.getOperation(name);
         assertNotNull(greetMe);
-        assertEquals(greetMe.getName(), name);        
+        assertEquals(greetMe.getName(), name);
 
         name = new QName(serviceInfo.getName().getNamespaceURI(), "greetMeOneWay");
         BindingOperationInfo greetMeOneWay = bindingInfo.getOperation(name);
@@ -248,11 +265,11 @@
         assertNotNull(input);
         assertEquals(input.getMessageInfo().getName().getLocalPart(), "sayHiRequest");
         assertEquals(input.getMessageInfo().getName().getNamespaceURI(),
-                     "http://apache.org/hello_world_soap_http");
+                "http://apache.org/hello_world_soap_http");
         assertEquals(input.getMessageInfo().getMessageParts().size(), 1);
         assertEquals(input.getMessageInfo().getMessageParts().get(0).getName().getLocalPart(),
"in");
         assertEquals(input.getMessageInfo().getMessageParts().get(0).getName().getNamespaceURI(),
-                     "http://apache.org/hello_world_soap_http");
+                "http://apache.org/hello_world_soap_http");
         assertTrue(input.getMessageInfo().getMessageParts().get(0).isElement());
         QName elementName = input.getMessageInfo().getMessageParts().get(0).getElementQName();
         assertEquals(elementName.getLocalPart(), "sayHi");
@@ -262,11 +279,11 @@
         assertNotNull(output);
         assertEquals(output.getMessageInfo().getName().getLocalPart(), "sayHiResponse");
         assertEquals(output.getMessageInfo().getName().getNamespaceURI(),
-                     "http://apache.org/hello_world_soap_http");
+                "http://apache.org/hello_world_soap_http");
         assertEquals(output.getMessageInfo().getMessageParts().size(), 1);
         assertEquals(output.getMessageInfo().getMessageParts().get(0).getName().getLocalPart(),
"out");
         assertEquals(output.getMessageInfo().getMessageParts().get(0).getName().getNamespaceURI(),
-                     "http://apache.org/hello_world_soap_http");
+                "http://apache.org/hello_world_soap_http");
         assertTrue(output.getMessageInfo().getMessageParts().get(0).isElement());
         elementName = output.getMessageInfo().getMessageParts().get(0).getElementQName();
         assertEquals(elementName.getLocalPart(), "sayHiResponse");
@@ -283,11 +300,11 @@
         assertNotNull(fault);
         assertEquals(fault.getFaultInfo().getName().getLocalPart(), "pingMeFault");
         assertEquals(fault.getFaultInfo().getName().getNamespaceURI(),
-                     "http://apache.org/hello_world_soap_http");
+                "http://apache.org/hello_world_soap_http");
         assertEquals(fault.getFaultInfo().getMessageParts().size(), 1);
         assertEquals(fault.getFaultInfo().getMessageParts().get(0).getName().getLocalPart(),
"faultDetail");
         assertEquals(fault.getFaultInfo().getMessageParts().get(0).getName().getNamespaceURI(),
-                     "http://apache.org/hello_world_soap_http");
+                "http://apache.org/hello_world_soap_http");
         assertTrue(fault.getFaultInfo().getMessageParts().get(0).isElement());
         elementName = fault.getFaultInfo().getMessageParts().get(0).getElementQName();
         assertEquals(elementName.getLocalPart(), "faultDetail");
@@ -296,7 +313,7 @@
 
     public void testSchema() {
         XmlSchemaCollection schemas = serviceInfo.getProperty(WSDLServiceBuilder.WSDL_SCHEMA_LIST,
-                                                              XmlSchemaCollection.class);
+                XmlSchemaCollection.class);
         assertNotNull(schemas);
         TypeInfo typeInfo = serviceInfo.getTypeInfo();
         assertNotNull(typeInfo);
@@ -305,11 +322,13 @@
         assertNotNull(schemaInfo);
         assertEquals(schemaInfo.getNamespaceURI(), "http://apache.org/hello_world_soap_http/types");
         assertEquals(schemas.read(schemaInfo.getElement()).getTargetNamespace(),
-                     "http://apache.org/hello_world_soap_http/types");
-        // add below code to test the creation of javax.xml.validation.Schema with schema
in serviceInfo
+                "http://apache.org/hello_world_soap_http/types");
+        // add below code to test the creation of javax.xml.validation.Schema
+        // with schema in serviceInfo
         Schema schema = EndpointReferenceUtils.getSchema(serviceInfo);
         assertNotNull(schema);
     }
+
     public void testBare() throws Exception {
         setUpWSDL(BARE_WSDL_PATH);
         BindingInfo bindingInfo = null;
@@ -320,16 +339,54 @@
         LOG.info("the binding operation is " + bindingOperationInfos.iterator().next().getName());
         QName name = new QName(serviceInfo.getName().getNamespaceURI(), "greetMe");
         BindingOperationInfo greetMe = bindingInfo.getOperation(name);
-        assertNotNull(greetMe);        
+        assertNotNull(greetMe);
         assertEquals("greetMe OperationInfo name error", greetMe.getName(), name);
         assertFalse("greetMe should be a Unwrapped operation ", greetMe.isUnwrappedCapable());
     }
 
     public void testImport() throws Exception {
+        // rewrite the schema1.xsd to import schema2.xsd with absolute path.
+        DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+        Document doc = db.parse(this.getClass().getResourceAsStream("./s1/s2/schema2.xsd"));
+        Element schemaImport = null;
+        for (int i = 0; i < doc.getChildNodes().getLength(); i++) {
+            if (doc.getChildNodes().item(i) instanceof Element) {
+                Element schema = (Element) doc.getChildNodes().item(i);
+                for (int j = 0; j < schema.getChildNodes().getLength(); j++) {
+                    if (schema.getChildNodes().item(j) instanceof Element) {
+                        schemaImport = (Element) schema.getChildNodes().item(j);
+                        break;
+                    }
+                }
+                break;
+            }
+        }
+        if (schemaImport == null) {
+            fail("Can't find import element");
+        }
+        String filePath = this.getClass().getResource("./s1/s2/s4/schema4.xsd").getFile();
+        String importPath = schemaImport.getAttributeNode("schemaLocation").getValue();
+        if (!new URI(importPath).isAbsolute()) {
+            schemaImport.getAttributeNode("schemaLocation").setNodeValue("file:" + filePath);
           
+            String fileStr = this.getClass().getResource("./s1/s2/schema2.xsd").getFile();
+            File file = new File(fileStr);
+            if (file.exists()) {
+                file.delete();
+            }
+            FileOutputStream fout = new FileOutputStream(fileStr);
+            XMLUtils.writeTo(doc, fout);
+            fout.flush();
+            fout.close();
+        }
         setUpWSDL(IMPORT_WSDL_PATH);
         TypeInfo types = serviceInfo.getTypeInfo();
         assertNotNull(types);
         assertNotNull(types.getSchemas());
+        System.out.println(types.getSchemas().size());
+        // XMLStreamWriter xsw = StaxUtils.createXMLStreamWriter(System.out);
+        Element ele = types.getSchemas().iterator().next().getElement();
+        Schema schema = EndpointReferenceUtils.getSchema(serviceInfo);        
+        assertNotNull(schema);        
     }
 
 }

Modified: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl?view=diff&rev=472123&r1=472122&r2=472123
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl
(original)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl
Tue Nov  7 06:10:31 2006
@@ -26,7 +26,7 @@
 		  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <wsdl:types>
 	<xsd:schema>
-	    <xsd:import namespace="http://apache.org/hello_world_soap_http/types" schemaLocation="schema1.xsd"/>
+	    <xsd:import namespace="http://apache.org/hello_world_soap_http/types" schemaLocation="./s1/schema1.xsd"/>
 	</xsd:schema>
     </wsdl:types>
     <wsdl:message name="sayHiRequest">

Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/s5/schema5.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/s5/schema5.xsd?view=auto&rev=472123
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/s5/schema5.xsd
(added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/s5/schema5.xsd
Tue Nov  7 06:10:31 2006
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  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.
+-->
+<xs:schema version="1.0" targetNamespace="http://apache.org/hello_world_soap_http/types/s5"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:element name="sayHi">
+    <xs:complexType/>
+  </xs:element>
+
+</xs:schema>
+

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/s5/schema5.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/s5/schema5.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/s5/schema5.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/schema4.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/schema4.xsd?view=auto&rev=472123
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/schema4.xsd
(added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/schema4.xsd
Tue Nov  7 06:10:31 2006
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  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.
+-->
+<xs:schema version="1.0" targetNamespace="http://apache.org/hello_world_soap_http/types/s4"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:import namespace="http://apache.org/hello_world_soap_http/types/s5" schemaLocation="./s5/schema5.xsd"/>
+
+  <xs:element name="greetMeOneWay">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="requestType" type="xs:string" form="qualified" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+</xs:schema>
+

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/schema4.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/schema4.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/s4/schema4.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/schema2.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/schema2.xsd?view=auto&rev=472123
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/schema2.xsd
(added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/schema2.xsd
Tue Nov  7 06:10:31 2006
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  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.
+-->
+<xs:schema version="1.0" targetNamespace="http://apache.org/hello_world_soap_http/types/s2"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:import namespace="http://apache.org/hello_world_soap_http/types/s4" schemaLocation="./s4/schema4.xsd"/>
+
+  <xs:element name="sayHiResponse">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="responseType" type="xs:string" form="qualified" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+</xs:schema>
+

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/schema2.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/schema2.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s2/schema2.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s3/schema3.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s3/schema3.xsd?view=auto&rev=472123
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s3/schema3.xsd
(added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s3/schema3.xsd
Tue Nov  7 06:10:31 2006
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  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.
+-->
+<xs:schema version="1.0" targetNamespace="http://apache.org/hello_world_soap_http/types/s3"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:element name="greetMe">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="requestType" type="xs:string" form="qualified" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="greetMeResponse">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="responseType" type="xs:string" form="qualified" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+
+</xs:schema>
+

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s3/schema3.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s3/schema3.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/s3/schema3.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/schema1.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/schema1.xsd?view=auto&rev=472123
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/schema1.xsd (added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/schema1.xsd Tue
Nov  7 06:10:31 2006
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  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.
+-->
+<xs:schema version="1.0" targetNamespace="http://apache.org/hello_world_soap_http/types"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:import namespace="http://apache.org/hello_world_soap_http/types/s2" schemaLocation="./s2/schema2.xsd"/>
+
+  <xs:import namespace="http://apache.org/hello_world_soap_http/types/s3" schemaLocation="./s3/schema3.xsd"/>
+
+  <xs:element name="pingMe">
+    <xs:complexType/>
+  </xs:element>
+
+  <xs:element name="faultDetail">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="minor" type="xs:short" form="qualified" minOccurs="0"/>
+        <xs:element name="major" type="xs:short" form="qualified" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="pingMeResponse">
+    <xs:complexType/>
+  </xs:element>
+</xs:schema>
+

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/schema1.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/schema1.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/s1/schema1.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message