[jboss-svn-commits] JBossWS SVN: r612 - in branches/jbossws-1.0: . src/main/java/org/jboss/ws/metadata/wsdl src/main/java/org/jboss/ws/metadata/wsdl/xmlschema src/main/resources/schema src/test/resources/eventing/WEB-INF/wsdl src/test/resources/wsdl11/inherit
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 14 12:47:39 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-07-14 12:47:30 -0400 (Fri, 14 Jul 2006)
New Revision: 612
Added:
branches/jbossws-1.0/src/main/resources/schema/ws-addr.xsd
Removed:
branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/XML.xsd
branches/jbossws-1.0/src/test/resources/wsdl11/inherit/XML.xsd
branches/jbossws-1.0/src/test/resources/wsdl11/inherit/wsaddr.xsd
Modified:
branches/jbossws-1.0/.classpath
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java
branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd
branches/jbossws-1.0/src/test/resources/wsdl11/inherit/eventing.xsd
Log:
[JBWS-1068] Cannot handle xsd:import of xml schema
More to come
Modified: branches/jbossws-1.0/.classpath
===================================================================
--- branches/jbossws-1.0/.classpath 2006-07-14 14:14:55 UTC (rev 611)
+++ branches/jbossws-1.0/.classpath 2006-07-14 16:47:30 UTC (rev 612)
@@ -7,7 +7,7 @@
<classpathentry path="thirdparty/mailapi.jar" kind="lib"/>
<classpathentry path="thirdparty/qdox.jar" kind="lib"/>
<classpathentry path="thirdparty/servlet-api.jar" kind="lib"/>
- <classpathentry path="thirdparty/wsdl4j.jar" kind="lib"/>
+ <classpathentry sourcepath="D:/java/sourceforge/wsdl4j-1_5_2jboss/src" path="thirdparty/wsdl4j.jar" kind="lib"/>
<classpathentry path="thirdparty/xercesImpl.jar" kind="lib"/>
<classpathentry path="thirdparty/xml-apis.jar" kind="lib"/>
<classpathentry path="thirdparty/xmlsec.jar" kind="lib"/>
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-07-14 14:14:55 UTC (rev 611)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-07-14 16:47:30 UTC (rev 612)
@@ -366,9 +366,9 @@
log.trace("handleSchemaImport: [namespace=" + namespace + ",schemaLocation=" + schemaLocation + "]");
// Skip, let the entity resolver resolve these
- if (namespace.length() > 0 && schemaLocation.length() > 0)
+ if (namespace.length() > 0 && schemaLocation.length() > 0 && !namespace.startsWith("http://www.w3.org/"))
{
- URL currLoc = this.getLocationURL(wsdlLoc, schemaLocation);
+ URL currLoc = getLocationURL(wsdlLoc, schemaLocation);
schemaLocationsMap.put(namespace, currLoc);
}
else
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java 2006-07-14 14:14:55 UTC (rev 611)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/WSDLDefinitionsFactory.java 2006-07-14 16:47:30 UTC (rev 612)
@@ -42,9 +42,12 @@
import org.jboss.util.xml.DOMUtils;
import org.jboss.util.xml.JBossEntityResolver;
import org.jboss.ws.Constants;
+import org.jboss.ws.WSException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
+
import com.ibm.wsdl.xml.WSDLReaderImpl;
/**
@@ -99,6 +102,8 @@
if (wsdlLocation == null)
throw new IllegalArgumentException("URL cannot be null");
+ EntityResolver entityResolver = new JBossEntityResolver();
+
log.debug("parse: " + wsdlLocation.toExternalForm());
WSDLDefinitions wsdlDefinitions = null;
try
@@ -119,7 +124,7 @@
wsdlReader.setFeature(key, flag.booleanValue());
}
- wsdlDefinitions = wsdlReader.readWSDL(new WSDLLocatorImpl(wsdlLocation));
+ wsdlDefinitions = wsdlReader.readWSDL(new WSDLLocatorImpl(entityResolver, wsdlLocation));
wsdlDefinitions.setWsdlDocument(wsdlDoc);
}
else if (Constants.NS_WSDL11.equals(defaultNamespace))
@@ -138,10 +143,10 @@
wsdlReader.setFeature(key, flag.booleanValue());
}
- // inject entity resolver
- ((WSDLReaderImpl)wsdlReader).setEntityResolver(new JBossEntityResolver());
+ // Set EntityResolver in patched version of wsdl4j-1.5.2jboss
+ ((WSDLReaderImpl)wsdlReader).setEntityResolver(entityResolver);
- Definition definition = wsdlReader.readWSDL(new WSDLLocatorImpl(wsdlLocation));
+ Definition definition = wsdlReader.readWSDL(new WSDLLocatorImpl(entityResolver, wsdlLocation));
wsdlDefinitions = new WSDL11Reader().processDefinition(definition, wsdlLocation);
wsdlDefinitions.setWsdlDocument(wsdlDoc);
}
@@ -212,14 +217,16 @@
*/
public static class WSDLLocatorImpl implements WSDLLocator
{
+ private EntityResolver entityResolver;
private URL wsdlURL;
private String latestImportURI;
- public WSDLLocatorImpl(URL wsdlFile)
+ public WSDLLocatorImpl(EntityResolver entityResolver, URL wsdlFile)
{
if (wsdlFile == null)
throw new IllegalArgumentException("WSDL file argument cannot be null");
+ this.entityResolver = entityResolver;
this.wsdlURL = wsdlFile;
}
@@ -297,18 +304,27 @@
try
{
- log.trace("Resolved to: " + wsdlImport);
- InputStream is = new URL(wsdlImport).openStream();
- if (is == null)
- throw new IllegalArgumentException("Cannot import wsdl from [" + wsdlImport + "]");
-
- latestImportURI = wsdlImport;
- return new InputSource(is);
+ log.trace("Trying to resolve: " + wsdlImport);
+ InputSource inputSource = entityResolver.resolveEntity(wsdlImport, wsdlImport);
+ if (inputSource != null)
+ {
+ latestImportURI = wsdlImport;
+ }
+ else
+ {
+ throw new IllegalArgumentException("Cannot resolve imported resource: " + wsdlImport);
+ }
+
+ return inputSource;
}
- catch (IOException e)
+ catch (RuntimeException rte)
{
- throw new RuntimeException("Cannot access imported wsdl [" + wsdlImport + "], " + e.getMessage());
+ throw rte;
}
+ catch (Exception e)
+ {
+ throw new WSException("Cannot access imported wsdl [" + wsdlImport + "], " + e.getMessage());
+ }
}
public String getLatestImportURI()
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java 2006-07-14 14:14:55 UTC (rev 611)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/JBossXSEntityResolver.java 2006-07-14 16:47:30 UTC (rev 612)
@@ -72,8 +72,27 @@
{
log.trace("Resolve entity: " + resId);
+ // First try the JBossEntityResolver
+ String publicId = resId.getPublicId();
+ String systemId = resId.getLiteralSystemId();
+ String namespace = resId.getNamespace();
try
{
+ String publicURI = (publicId != null ? publicId : namespace);
+ InputSource inputSource = resolver.resolveEntity(publicURI, systemId);
+ if (inputSource != null)
+ {
+ XMLInputSource source = getXMLInputSource(inputSource, resId);
+ return source;
+ }
+ }
+ catch (Exception ex)
+ {
+ log.trace(ex);
+ }
+
+ try
+ {
String expandedSysId = resId.getExpandedSystemId();
if (expandedSysId != null)
{
@@ -88,11 +107,10 @@
try
{
- String literalSysId = resId.getLiteralSystemId();
- if (literalSysId != null)
+ if (systemId != null)
{
- log.trace("Use LiteralSystemId: " + literalSysId);
- return getXMLInputSource(new URL(literalSysId), resId);
+ log.trace("Use LiteralSystemId: " + systemId);
+ return getXMLInputSource(new URL(systemId), resId);
}
}
catch (IOException e)
Added: branches/jbossws-1.0/src/main/resources/schema/ws-addr.xsd
===================================================================
--- branches/jbossws-1.0/src/main/resources/schema/ws-addr.xsd 2006-07-14 14:14:55 UTC (rev 611)
+++ branches/jbossws-1.0/src/main/resources/schema/ws-addr.xsd 2006-07-14 16:47:30 UTC (rev 612)
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd">
+<!--
+ W3C XML Schema defined in the Web Services Addressing 1.0 specification
+ http://www.w3.org/TR/ws-addr-core
+
+ Copyright © 2005 World Wide Web Consortium,
+
+ (Massachusetts Institute of Technology, European Research Consortium for
+ Informatics and Mathematics, Keio University). All Rights Reserved. This
+ work is distributed under the W3C® Software License [1] in the hope that
+ it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+ $Id$
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2005/08/addressing" targetNamespace="http://www.w3.org/2005/08/addressing" blockDefault="#all" elementFormDefault="qualified" finalDefault="" attributeFormDefault="unqualified">
+
+ <!-- Constructs from the WS-Addressing Core -->
+
+ <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/>
+ <xs:complexType name="EndpointReferenceType" mixed="false">
+ <xs:sequence>
+ <xs:element name="Address" type="tns:AttributedURIType"/>
+ <xs:element ref="tns:ReferenceParameters" minOccurs="0"/>
+ <xs:element ref="tns:Metadata" minOccurs="0"/>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType"/>
+ <xs:complexType name="ReferenceParametersType" mixed="false">
+ <xs:sequence>
+ <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:element name="Metadata" type="tns:MetadataType"/>
+ <xs:complexType name="MetadataType" mixed="false">
+ <xs:sequence>
+ <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+ <xs:element name="MessageID" type="tns:AttributedURIType"/>
+ <xs:element name="RelatesTo" type="tns:RelatesToType"/>
+ <xs:complexType name="RelatesToType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI">
+ <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:simpleType name="RelationshipTypeOpenEnum">
+ <xs:union memberTypes="tns:RelationshipType xs:anyURI"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="RelationshipType">
+ <xs:restriction base="xs:anyURI">
+ <xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="ReplyTo" type="tns:EndpointReferenceType"/>
+ <xs:element name="From" type="tns:EndpointReferenceType"/>
+ <xs:element name="FaultTo" type="tns:EndpointReferenceType"/>
+ <xs:element name="To" type="tns:AttributedURIType"/>
+ <xs:element name="Action" type="tns:AttributedURIType"/>
+
+ <xs:complexType name="AttributedURIType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <!-- Constructs from the WS-Addressing SOAP binding -->
+
+ <xs:attribute name="IsReferenceParameter" type="xs:boolean"/>
+
+ <xs:simpleType name="FaultCodesOpenEnumType">
+ <xs:union memberTypes="tns:FaultCodesType xs:QName"/>
+ </xs:simpleType>
+
+ <xs:simpleType name="FaultCodesType">
+ <xs:restriction base="xs:QName">
+ <xs:enumeration value="tns:InvalidAddressingHeader"/>
+ <xs:enumeration value="tns:InvalidAddress"/>
+ <xs:enumeration value="tns:InvalidEPR"/>
+ <xs:enumeration value="tns:InvalidCardinality"/>
+ <xs:enumeration value="tns:MissingAddressInEPR"/>
+ <xs:enumeration value="tns:DuplicateMessageID"/>
+ <xs:enumeration value="tns:ActionMismatch"/>
+ <xs:enumeration value="tns:MessageAddressingHeaderRequired"/>
+ <xs:enumeration value="tns:DestinationUnreachable"/>
+ <xs:enumeration value="tns:ActionNotSupported"/>
+ <xs:enumeration value="tns:EndpointUnavailable"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/>
+ <xs:complexType name="AttributedUnsignedLongType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedLong">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/>
+ <xs:complexType name="AttributedQNameType" mixed="false">
+ <xs:simpleContent>
+ <xs:extension base="xs:QName">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="ProblemIRI" type="tns:AttributedURIType"/>
+
+ <xs:element name="ProblemAction" type="tns:ProblemActionType"/>
+ <xs:complexType name="ProblemActionType" mixed="false">
+ <xs:sequence>
+ <xs:element ref="tns:Action" minOccurs="0"/>
+ <xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
+</xs:schema>
Property changes on: branches/jbossws-1.0/src/main/resources/schema/ws-addr.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/XML.xsd
===================================================================
--- branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/XML.xsd 2006-07-14 14:14:55 UTC (rev 611)
+++ branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/XML.xsd 2006-07-14 16:47:30 UTC (rev 612)
@@ -1,147 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace"
- xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-
- <xs:annotation>
- <xs:documentation>
- See http://www.w3.org/XML/1998/namespace.html and
- http://www.w3.org/TR/REC-xml for information about this namespace.
-
- This schema document describes the XML namespace, in a form
- suitable for import by other schema documents.
-
- Note that local names in this namespace are intended to be defined
- only by the World Wide Web Consortium or its subgroups. The
- following names are currently defined in this namespace and should
- not be used with conflicting semantics by any Working Group,
- specification, or document instance:
-
- base (as an attribute name): denotes an attribute whose value
- provides a URI to be used as the base for interpreting any
- relative URIs in the scope of the element on which it
- appears; its value is inherited. This name is reserved
- by virtue of its definition in the XML Base specification.
-
- id (as an attribute name): denotes an attribute whose value
- should be interpreted as if declared to be of type ID.
- The xml:id specification is not yet a W3C Recommendation,
- but this attribute is included here to facilitate experimentation
- with the mechanisms it proposes. Note that it is _not_ included
- in the specialAttrs attribute group.
-
- lang (as an attribute name): denotes an attribute whose value
- is a language code for the natural language of the content of
- any element; its value is inherited. This name is reserved
- by virtue of its definition in the XML specification.
-
- space (as an attribute name): denotes an attribute whose
- value is a keyword indicating what whitespace processing
- discipline is intended for the content of the element; its
- value is inherited. This name is reserved by virtue of its
- definition in the XML specification.
-
- Father (in any context at all): denotes Jon Bosak, the chair of
- the original XML Working Group. This name is reserved by
- the following decision of the W3C XML Plenary and
- XML Coordination groups:
-
- In appreciation for his vision, leadership and dedication
- the W3C XML Plenary on this 10th day of February, 2000
- reserves for Jon Bosak in perpetuity the XML name
- xml:Father
- </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
- <xs:documentation>This schema defines attributes and an attribute group
- suitable for use by
- schemas wishing to allow xml:base, xml:lang, xml:space or xml:id
- attributes on elements they define.
-
- To enable this, such a schema must import this schema
- for the XML namespace, e.g. as follows:
- <schema . . .>
- . . .
- <import namespace="http://www.w3.org/XML/1998/namespace"
- schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
- Subsequently, qualified reference to any of the attributes
- or the group defined below will have the desired effect, e.g.
-
- <type . . .>
- . . .
- <attributeGroup ref="xml:specialAttrs"/>
-
- will define a type which will schema-validate an instance
- element with any of those attributes</xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
- <xs:documentation>In keeping with the XML Schema WG's standard versioning
- policy, this schema document will persist at
- http://www.w3.org/2005/08/xml.xsd.
- At the date of issue it can also be found at
- http://www.w3.org/2001/xml.xsd.
- The schema document at that URI may however change in the future,
- in order to remain compatible with the latest version of XML Schema
- itself, or with the XML namespace itself. In other words, if the XML
- Schema or XML namespaces change, the version of this document at
- http://www.w3.org/2001/xml.xsd will change
- accordingly; the version at
- http://www.w3.org/2005/08/xml.xsd will not change.
- </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="lang">
- <xs:annotation>
- <xs:documentation>Attempting to install the relevant ISO 2- and 3-letter
- codes as the enumerated possible values is probably never
- going to be a realistic possibility. See
- RFC 3066 at http://www.ietf.org/rfc/rfc3066.txt and the IANA registry
- at http://www.iana.org/assignments/lang-tag-apps.htm for
- further information.
-
- The union allows for the 'un-declaration' of xml:lang with
- the empty string.</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:union memberTypes="xs:language">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value=""/>
- </xs:restriction>
- </xs:simpleType>
- </xs:union>
- </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="space">
- <xs:simpleType>
- <xs:restriction base="xs:NCName">
- <xs:enumeration value="default"/>
- <xs:enumeration value="preserve"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="base" type="xs:anyURI">
- <xs:annotation>
- <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
- information about this attribute.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="id" type="xs:ID">
- <xs:annotation>
- <xs:documentation>See http://www.w3.org/TR/xml-id/ for
- information about this attribute.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
- <xs:attribute ref="xml:base"/>
- <xs:attribute ref="xml:lang"/>
- <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
-
-</xs:schema>
Modified: branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd
===================================================================
--- branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd 2006-07-14 14:14:55 UTC (rev 611)
+++ branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd 2006-07-14 16:47:30 UTC (rev 612)
@@ -9,11 +9,9 @@
attributeFormDefault="unqualified"
blockDefault="#all">
- <!--TODO Parser complains about this
-xs:import namespace="http://www.w3.org/XML/1998/namespace"
- schemaLocation="http://www.w3.org/2001/xml.xsd"/-->
+ <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
- <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="wsaddr.xsd"/>
+ <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="ws-addr.xsd"/>
<!-- Types and global elements -->
<xs:complexType name="DeliveryType" mixed="true">
@@ -55,8 +53,7 @@
<xs:complexType name="LanguageSpecificStringType">
<xs:simpleContent>
<xs:extension base="xs:string">
- <!-- TODO Parser complains about this
- xs:attribute ref="xml:lang" /-->
+ <xs:attribute ref="xml:lang" />
<!--xs:anyAttribute namespace="##other" processContents="lax" /-->
</xs:extension>
</xs:simpleContent>
Deleted: branches/jbossws-1.0/src/test/resources/wsdl11/inherit/XML.xsd
===================================================================
--- branches/jbossws-1.0/src/test/resources/wsdl11/inherit/XML.xsd 2006-07-14 14:14:55 UTC (rev 611)
+++ branches/jbossws-1.0/src/test/resources/wsdl11/inherit/XML.xsd 2006-07-14 16:47:30 UTC (rev 612)
@@ -1,147 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace"
- xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-
- <xs:annotation>
- <xs:documentation>
- See http://www.w3.org/XML/1998/namespace.html and
- http://www.w3.org/TR/REC-xml for information about this namespace.
-
- This schema document describes the XML namespace, in a form
- suitable for import by other schema documents.
-
- Note that local names in this namespace are intended to be defined
- only by the World Wide Web Consortium or its subgroups. The
- following names are currently defined in this namespace and should
- not be used with conflicting semantics by any Working Group,
- specification, or document instance:
-
- base (as an attribute name): denotes an attribute whose value
- provides a URI to be used as the base for interpreting any
- relative URIs in the scope of the element on which it
- appears; its value is inherited. This name is reserved
- by virtue of its definition in the XML Base specification.
-
- id (as an attribute name): denotes an attribute whose value
- should be interpreted as if declared to be of type ID.
- The xml:id specification is not yet a W3C Recommendation,
- but this attribute is included here to facilitate experimentation
- with the mechanisms it proposes. Note that it is _not_ included
- in the specialAttrs attribute group.
-
- lang (as an attribute name): denotes an attribute whose value
- is a language code for the natural language of the content of
- any element; its value is inherited. This name is reserved
- by virtue of its definition in the XML specification.
-
- space (as an attribute name): denotes an attribute whose
- value is a keyword indicating what whitespace processing
- discipline is intended for the content of the element; its
- value is inherited. This name is reserved by virtue of its
- definition in the XML specification.
-
- Father (in any context at all): denotes Jon Bosak, the chair of
- the original XML Working Group. This name is reserved by
- the following decision of the W3C XML Plenary and
- XML Coordination groups:
-
- In appreciation for his vision, leadership and dedication
- the W3C XML Plenary on this 10th day of February, 2000
- reserves for Jon Bosak in perpetuity the XML name
- xml:Father
- </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
- <xs:documentation>This schema defines attributes and an attribute group
- suitable for use by
- schemas wishing to allow xml:base, xml:lang, xml:space or xml:id
- attributes on elements they define.
-
- To enable this, such a schema must import this schema
- for the XML namespace, e.g. as follows:
- <schema . . .>
- . . .
- <import namespace="http://www.w3.org/XML/1998/namespace"
- schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
- Subsequently, qualified reference to any of the attributes
- or the group defined below will have the desired effect, e.g.
-
- <type . . .>
- . . .
- <attributeGroup ref="xml:specialAttrs"/>
-
- will define a type which will schema-validate an instance
- element with any of those attributes</xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
- <xs:documentation>In keeping with the XML Schema WG's standard versioning
- policy, this schema document will persist at
- http://www.w3.org/2005/08/xml.xsd.
- At the date of issue it can also be found at
- http://www.w3.org/2001/xml.xsd.
- The schema document at that URI may however change in the future,
- in order to remain compatible with the latest version of XML Schema
- itself, or with the XML namespace itself. In other words, if the XML
- Schema or XML namespaces change, the version of this document at
- http://www.w3.org/2001/xml.xsd will change
- accordingly; the version at
- http://www.w3.org/2005/08/xml.xsd will not change.
- </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="lang">
- <xs:annotation>
- <xs:documentation>Attempting to install the relevant ISO 2- and 3-letter
- codes as the enumerated possible values is probably never
- going to be a realistic possibility. See
- RFC 3066 at http://www.ietf.org/rfc/rfc3066.txt and the IANA registry
- at http://www.iana.org/assignments/lang-tag-apps.htm for
- further information.
-
- The union allows for the 'un-declaration' of xml:lang with
- the empty string.</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:union memberTypes="xs:language">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value=""/>
- </xs:restriction>
- </xs:simpleType>
- </xs:union>
- </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="space">
- <xs:simpleType>
- <xs:restriction base="xs:NCName">
- <xs:enumeration value="default"/>
- <xs:enumeration value="preserve"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="base" type="xs:anyURI">
- <xs:annotation>
- <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
- information about this attribute.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="id" type="xs:ID">
- <xs:annotation>
- <xs:documentation>See http://www.w3.org/TR/xml-id/ for
- information about this attribute.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
- <xs:attribute ref="xml:base"/>
- <xs:attribute ref="xml:lang"/>
- <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
-
-</xs:schema>
Modified: branches/jbossws-1.0/src/test/resources/wsdl11/inherit/eventing.xsd
===================================================================
--- branches/jbossws-1.0/src/test/resources/wsdl11/inherit/eventing.xsd 2006-07-14 14:14:55 UTC (rev 611)
+++ branches/jbossws-1.0/src/test/resources/wsdl11/inherit/eventing.xsd 2006-07-14 16:47:30 UTC (rev 612)
@@ -9,11 +9,9 @@
attributeFormDefault="unqualified"
blockDefault="#all">
- <!--TODO Parser complains about this
-xs:import namespace="http://www.w3.org/XML/1998/namespace"
- schemaLocation="http://www.w3.org/2001/xml.xsd"/-->
+ <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
- <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="wsaddr.xsd"/>
+ <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="ws-addr.xsd"/>
<!-- Types and global elements -->
<xs:complexType name="DeliveryType" mixed="true">
Deleted: branches/jbossws-1.0/src/test/resources/wsdl11/inherit/wsaddr.xsd
===================================================================
--- branches/jbossws-1.0/src/test/resources/wsdl11/inherit/wsaddr.xsd 2006-07-14 14:14:55 UTC (rev 611)
+++ branches/jbossws-1.0/src/test/resources/wsdl11/inherit/wsaddr.xsd 2006-07-14 16:47:30 UTC (rev 612)
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN"
- "http://www.w3.org/2001/XMLSchema.dtd">
-<!--
- W3C XML Schema defined in the Web Services Addressing 1.0 specification
- http://www.w3.org/TR/ws-addr-core
-
- Copyright © 2005 World Wide Web Consortium,
-
- (Massachusetts Institute of Technology, European Research Consortium for
- Informatics and Mathematics, Keio University). All Rights Reserved. This
- work is distributed under the W3C® Software License [1] in the hope that
- it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-
- $Id$
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="http://www.w3.org/2005/08/addressing"
- targetNamespace="http://www.w3.org/2005/08/addressing"
- blockDefault="#all" elementFormDefault="qualified"
- finalDefault="" attributeFormDefault="unqualified">
-
- <!-- Constructs from the WS-Addressing Core -->
-
- <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/>
- <xs:complexType name="EndpointReferenceType" mixed="false">
- <xs:sequence>
- <xs:element name="Address" type="xs:anyURI"/>
-
- <!-- [hb] was not working
- xs:element name="Address" type="tns:AttributedURIType"/-->
- <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType" minOccurs="0"/>
- <xs:element ref="tns:Metadata" minOccurs="0"/>
- <!--xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/-->
- </xs:sequence>
- <!--xs:anyAttribute namespace="##other" processContents="lax"/-->
- </xs:complexType>
-
- <xs:complexType name="ReferenceParametersType" mixed="false">
- <xs:sequence>
- <!--xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/-->
- <!--
- [hb] workaround for missing wilcard support
- -->
- <xs:element name="Identifier" type="xs:anyURI" minOccurs="0"/>
- </xs:sequence>
- <!--xs:anyAttribute namespace="##other" processContents="lax"/-->
- </xs:complexType>
-
- <xs:element name="Metadata" type="tns:MetadataType"/>
- <xs:complexType name="MetadataType" mixed="false">
- <xs:sequence>
- <!--xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/-->
- </xs:sequence>
- <!--xs:anyAttribute namespace="##other" processContents="lax"/-->
- </xs:complexType>
-
- <xs:element name="MessageID" type="tns:AttributedURIType"/>
- <xs:element name="RelatesTo" type="tns:RelatesToType"/>
- <xs:complexType name="RelatesToType" mixed="false">
- <xs:simpleContent>
- <xs:extension base="xs:anyURI">
- <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional"
- default="http://www.w3.org/2005/08/addressing/reply"/>
- <!--xs:anyAttribute namespace="##other" processContents="lax"/-->
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:simpleType name="RelationshipTypeOpenEnum">
- <xs:union memberTypes="tns:RelationshipType xs:anyURI"/>
- </xs:simpleType>
-
- <xs:simpleType name="RelationshipType">
- <xs:restriction base="xs:anyURI">
- <xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:element name="ReplyTo" type="tns:EndpointReferenceType"/>
- <xs:element name="From" type="tns:EndpointReferenceType"/>
- <xs:element name="FaultTo" type="tns:EndpointReferenceType"/>
- <xs:element name="To" type="tns:AttributedURIType"/>
- <xs:element name="Action" type="tns:AttributedURIType"/>
-
- <xs:complexType name="AttributedURIType" mixed="false">
- <xs:simpleContent>
- <xs:extension base="xs:anyURI">
- <!--xs:anyAttribute namespace="##other" processContents="lax"/-->
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <!-- Constructs from the WS-Addressing SOAP binding -->
-
- <xs:attribute name="IsReferenceParameter" type="xs:boolean"/>
-
- <xs:simpleType name="FaultCodesOpenEnumType">
- <xs:union memberTypes="tns:FaultCodesType xs:QName"/>
- </xs:simpleType>
-
- <xs:simpleType name="FaultCodesType">
- <xs:restriction base="xs:QName">
- <xs:enumeration value="tns:InvalidAddressingHeader"/>
- <xs:enumeration value="tns:InvalidAddress"/>
- <xs:enumeration value="tns:InvalidEPR"/>
- <xs:enumeration value="tns:InvalidCardinality"/>
- <xs:enumeration value="tns:MissingAddressInEPR"/>
- <xs:enumeration value="tns:DuplicateMessageID"/>
- <xs:enumeration value="tns:ActionMismatch"/>
- <xs:enumeration value="tns:MessageAddressingHeaderRequired"/>
- <xs:enumeration value="tns:DestinationUnreachable"/>
- <xs:enumeration value="tns:ActionNotSupported"/>
- <xs:enumeration value="tns:EndpointUnavailable"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/>
- <xs:complexType name="AttributedUnsignedLongType" mixed="false">
- <xs:simpleContent>
- <xs:extension base="xs:unsignedLong">
- <!--xs:anyAttribute namespace="##other" processContents="lax"/-->
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/>
- <xs:complexType name="AttributedQNameType" mixed="false">
- <xs:simpleContent>
- <xs:extension base="xs:QName">
- <!--xs:anyAttribute namespace="##other" processContents="lax"/-->
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:element name="ProblemHeader" type="tns:AttributedAnyType"/>
- <xs:complexType name="AttributedAnyType" mixed="false">
- <xs:sequence>
- <!--xs:any namespace="##any" processContents="lax" minOccurs="1" maxOccurs="1"/-->
- </xs:sequence>
- <!--xs:anyAttribute namespace="##other" processContents="lax"/-->
- </xs:complexType>
-
- <xs:element name="ProblemIRI" type="tns:AttributedURIType"/>
-
- <xs:element name="ProblemAction" type="tns:ProblemActionType"/>
- <xs:complexType name="ProblemActionType" mixed="false">
- <xs:sequence>
- <xs:element ref="tns:Action" minOccurs="0"/>
- <xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/>
- </xs:sequence>
- <!--xs:anyAttribute namespace="##other" processContents="lax"/-->
- </xs:complexType>
-
-</xs:schema>
More information about the jboss-svn-commits
mailing list