SWS-339

Author: poutsma

core/src/test/resources/org/springframework/ws/wsdl/wsdl11/include-inline.wsdl

@@ -11,11 +11,14 @@
                     xmlns="http://www.springframework.org/spring-ws/include/schema" elementFormDefault="qualified"
                     attributeFormDefault="unqualified">
 
+            <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+
             <xsd:element name="GetOrderRequest">
                 <xsd:complexType>
                     <xsd:sequence>
                         <xsd:element name="child" type="xsd:string"/>
                     </xsd:sequence>
+                    <xsd:attribute ref="xml:lang" use="required"/>
                 </xsd:complexType>
             </xsd:element>
 

core/src/test/resources/org/springframework/ws/wsdl/wsdl11/including.xsd

@@ -5,12 +5,14 @@
             attributeFormDefault="unqualified">
 
     <xsd:include schemaLocation="included.xsd"/>
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
 
     <xsd:element name="GetOrderRequest">
         <xsd:complexType>
             <xsd:sequence>
                 <xsd:element name="child" type="xsd:string"/>
             </xsd:sequence>
+            <xsd:attribute ref="xml:lang" use="required"/>
         </xsd:complexType>
     </xsd:element>
 

core/src/test/resources/org/springframework/ws/wsdl/wsdl11/provider/B.xsd

@@ -3,12 +3,14 @@
             targetNamespace="urn:1"
             xmlns="urn:1"
             xmlns:imported="urn:2" elementFormDefault="qualified">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
     <xsd:include schemaLocation="C.xsd"/>
     <xsd:import schemaLocation="D.xsd" namespace="urn:2"/>
     <xsd:complexType name="B">
         <xsd:sequence>
             <xsd:element type="C" name="c"/>
             <xsd:element type="imported:D" name="d"/>
         </xsd:sequence>
+        <!--<xsd:attribute ref="xml:lang" use="required"/>-->
     </xsd:complexType>
 </xsd:schema>

samples/airline/src/main/java/org/springframework/ws/samples/airline/security/AcegiFrequentFlyerSecurityService.java

@@ -159,12 +159,12 @@ private void inlineIncludes(XmlSchema schema, List processedSchemas) {
 
     private void findImports(XmlSchema schema, List processedSchemas) {
         processedSchemas.add(schema);
-        XmlSchemaObjectCollection includes = schema.getIncludes();
-        for (int i = 0; i < includes.getCount(); i++) {
-            XmlSchemaExternal external = (XmlSchemaExternal) includes.getItem(i);
+        XmlSchemaObjectCollection imports = schema.getIncludes();
+        for (int i = 0; i < imports.getCount(); i++) {
+            XmlSchemaExternal external = (XmlSchemaExternal) imports.getItem(i);
             if (external instanceof XmlSchemaImport) {
                 XmlSchema importedSchema = external.getSchema();
-                if (!processedSchemas.contains(importedSchema)) {
+                if (importedSchema != null && !processedSchemas.contains(importedSchema)) {
                     inlineIncludes(importedSchema, processedSchemas);
                     findImports(importedSchema, processedSchemas);
                     xmlSchemas.add(importedSchema);

xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollection.java

@@ -85,6 +85,19 @@ public void testImports() throws Exception {
         assertXMLEqual("Invalid Source returned", expected, result);
     }
 
+    public void testXmlNamespace() throws Exception {
+        Resource resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTestCase.class);
+        XsdSchema importing = createSchema(resource);
+        String namespace = "http://www.springframework.org/spring-ws/xmlNamespace";
+        assertEquals("Invalid target namespace", namespace, importing.getTargetNamespace());
+        resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTestCase.class);
+        Document expected = documentBuilder.parse(SaxUtils.createInputSource(resource));
+        DOMResult domResult = new DOMResult();
+        transformer.transform(importing.getSource(), domResult);
+        Document result = (Document) domResult.getNode();
+        assertXMLEqual("Invalid Source returned", expected, result);
+    }
+
     public void testCreateValidator() throws Exception {
         Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTestCase.class);
         XsdSchema single = createSchema(resource);

xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            targetNamespace="http://www.springframework.org/spring-ws/xmlNamespace"
+            xmlns="http://www.springframework.org/spring-ws/xmlNamespace" elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
+
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+
+    <xsd:element name="GetOrderRequest">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="child" type="xsd:string"/>
+            </xsd:sequence>
+            <xsd:attribute ref="xml:lang" use="required"/>
+        </xsd:complexType>
+    </xsd:element>
+
+</xsd:schema>