Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWS-575 - CommonsXsdSchemaCollection: Combination of xs:includes and xs:imports in a schema result in incorrect/overcomplete schema in wsdl generated by DefaultWsdl11Definition

Browse Source
This commit is contained in:
Arjen Poutsma
2010-01-11 10:11:47 +00:00
parent 3eeb8b20ce
commit 30911093c3
6 changed files with 105 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xml/src/test/resources/org/springframework/xml/xsd/commons/employee.xsd Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:hr="http://mycompany.com/hr/schemas"
elementFormDefault="qualified"
targetNamespace="http://mycompany.com/hr/schemas">
<xs:complexType name="EmployeeType">
<xs:sequence>
<xs:element name="Number" type="xs:integer"/>
<xs:element name="FirstName" type="xs:string"/>
<xs:element name="LastName" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:schema>

14
xml/src/test/resources/org/springframework/xml/xsd/commons/holiday.xsd Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:hrh="http://mycompany.com/hr/schemas/holiday"
attributeFormDefault="unqualified"
elementFormDefault="qualified"
targetNamespace="http://mycompany.com/hr/schemas/holiday">
<xs:complexType name="HolidayType">
<xs:sequence>
<xs:element name="StartDate" type="xs:date"/>
<xs:element name="EndDate" type="xs:date"/>
</xs:sequence>
</xs:complexType>
</xs:schema>

18
xml/src/test/resources/org/springframework/xml/xsd/commons/hr.xsd Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:hr="http://mycompany.com/hr/schemas"
xmlns:hrh="http://mycompany.com/hr/schemas/holiday"
elementFormDefault="qualified"
targetNamespace="http://mycompany.com/hr/schemas">
<xs:import namespace="http://mycompany.com/hr/schemas/holiday" schemaLocation="holiday.xsd"/>
<xs:include schemaLocation="employee.xsd"/>
<xs:element name="HolidayRequest">
<xs:complexType>
<xs:all>
<xs:element name="Holiday" type="hrh:HolidayType"/>
<xs:element name="Employee" type="hr:EmployeeType"/>
</xs:all>
</xs:complexType>
</xs:element>
</xs:schema>

25
xml/src/test/resources/org/springframework/xml/xsd/commons/hr_employee.xsd Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:hr="http://mycompany.com/hr/schemas"
xmlns:hrh="http://mycompany.com/hr/schemas/holiday"
attributeFormDefault="unqualified"
elementFormDefault="qualified"
targetNamespace="http://mycompany.com/hr/schemas">
<xs:import namespace="http://mycompany.com/hr/schemas/holiday"/>
<xs:element name="HolidayRequest">
<xs:complexType>
<xs:all>
<xs:element name="Holiday" type="hrh:HolidayType"/>
<xs:element name="Employee" type="hr:EmployeeType"/>
</xs:all>
</xs:complexType>
</xs:element>
<xs:complexType name="EmployeeType">
<xs:sequence>
<xs:element name="Number" type="xs:integer"/>
<xs:element name="FirstName" type="xs:string"/>
<xs:element name="LastName" type="xs:string"/>
</xs:sequence>
</xs:complexType>
</xs:schema>