ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sag...@apache.org
Subject svn commit: r1161982 [3/3] - in /webservices/woden/branches/woden-20: ./ woden-commons/ woden-commons/src/main/java/org/apache/woden/internal/ woden-commons/src/main/java/org/apache/woden/internal/resolver/ woden-commons/src/main/resources/ woden-commo...
Date Fri, 26 Aug 2011 03:48:04 GMT
Propchange: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/XMLSchema.xsd
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/datatypes.dtd
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/datatypes.dtd?rev=1161982&view=auto
==============================================================================
--- webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/datatypes.dtd (added)
+++ webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/datatypes.dtd Fri Aug 26 03:48:03 2011
@@ -0,0 +1,203 @@
+<!--
+        DTD for XML Schemas: Part 2: Datatypes
+        $Id: datatypes.dtd,v 1.23 2001/03/16 17:36:30 ht Exp $
+        Note this DTD is NOT normative, or even definitive. - - the
+        prose copy in the datatypes REC is the definitive version
+        (which shouldn't differ from this one except for this comment
+        and entity expansions, but just in case)
+  -->
+
+<!--
+        This DTD cannot be used on its own, it is intended
+        only for incorporation in XMLSchema.dtd, q.v.
+  -->
+
+<!-- Define all the element names, with optional prefix -->
+<!ENTITY % simpleType "%p;simpleType">
+<!ENTITY % restriction "%p;restriction">
+<!ENTITY % list "%p;list">
+<!ENTITY % union "%p;union">
+<!ENTITY % maxExclusive "%p;maxExclusive">
+<!ENTITY % minExclusive "%p;minExclusive">
+<!ENTITY % maxInclusive "%p;maxInclusive">
+<!ENTITY % minInclusive "%p;minInclusive">
+<!ENTITY % totalDigits "%p;totalDigits">
+<!ENTITY % fractionDigits "%p;fractionDigits">
+<!ENTITY % length "%p;length">
+<!ENTITY % minLength "%p;minLength">
+<!ENTITY % maxLength "%p;maxLength">
+<!ENTITY % enumeration "%p;enumeration">
+<!ENTITY % whiteSpace "%p;whiteSpace">
+<!ENTITY % pattern "%p;pattern">
+
+<!--
+        Customisation entities for the ATTLIST of each element
+        type. Define one of these if your schema takes advantage
+        of the anyAttribute='##other' in the schema for schemas
+  -->
+
+<!ENTITY % simpleTypeAttrs "">
+<!ENTITY % restrictionAttrs "">
+<!ENTITY % listAttrs "">
+<!ENTITY % unionAttrs "">
+<!ENTITY % maxExclusiveAttrs "">
+<!ENTITY % minExclusiveAttrs "">
+<!ENTITY % maxInclusiveAttrs "">
+<!ENTITY % minInclusiveAttrs "">
+<!ENTITY % totalDigitsAttrs "">
+<!ENTITY % fractionDigitsAttrs "">
+<!ENTITY % lengthAttrs "">
+<!ENTITY % minLengthAttrs "">
+<!ENTITY % maxLengthAttrs "">
+<!ENTITY % enumerationAttrs "">
+<!ENTITY % whiteSpaceAttrs "">
+<!ENTITY % patternAttrs "">
+
+<!-- Define some entities for informative use as attribute
+        types -->
+<!ENTITY % URIref "CDATA">
+<!ENTITY % XPathExpr "CDATA">
+<!ENTITY % QName "NMTOKEN">
+<!ENTITY % QNames "NMTOKENS">
+<!ENTITY % NCName "NMTOKEN">
+<!ENTITY % nonNegativeInteger "NMTOKEN">
+<!ENTITY % boolean "(true|false)">
+<!ENTITY % simpleDerivationSet "CDATA">
+<!--
+        #all or space-separated list drawn from derivationChoice
+  -->
+
+<!--
+        Note that the use of 'facet' below is less restrictive
+        than is really intended:  There should in fact be no
+        more than one of each of minInclusive, minExclusive,
+        maxInclusive, maxExclusive, totalDigits, fractionDigits,
+        length, maxLength, minLength within datatype,
+        and the min- and max- variants of Inclusive and Exclusive
+        are mutually exclusive. On the other hand,  pattern and
+        enumeration may repeat.
+  -->
+<!ENTITY % minBound "(%minInclusive; | %minExclusive;)">
+<!ENTITY % maxBound "(%maxInclusive; | %maxExclusive;)">
+<!ENTITY % bounds "%minBound; | %maxBound;">
+<!ENTITY % numeric "%totalDigits; | %fractionDigits;">
+<!ENTITY % ordered "%bounds; | %numeric;">
+<!ENTITY % unordered
+   "%pattern; | %enumeration; | %whiteSpace; | %length; |
+   %maxLength; | %minLength;">
+<!ENTITY % facet "%ordered; | %unordered;">
+<!ENTITY % facetAttr 
+        "value CDATA #REQUIRED
+        id ID #IMPLIED">
+<!ENTITY % fixedAttr "fixed %boolean; #IMPLIED">
+<!ENTITY % facetModel "(%annotation;)?">
+<!ELEMENT %simpleType;
+        ((%annotation;)?, (%restriction; | %list; | %union;))>
+<!ATTLIST %simpleType;
+    name      %NCName; #IMPLIED
+    final     %simpleDerivationSet; #IMPLIED
+    id        ID       #IMPLIED
+    %simpleTypeAttrs;>
+<!-- name is required at top level -->
+<!ELEMENT %restriction; ((%annotation;)?,
+                         (%restriction1; |
+                          ((%simpleType;)?,(%facet;)*)),
+                         (%attrDecls;))>
+<!ATTLIST %restriction;
+    base      %QName;                  #IMPLIED
+    id        ID       #IMPLIED
+    %restrictionAttrs;>
+<!--
+        base and simpleType child are mutually exclusive,
+        one is required.
+
+        restriction is shared between simpleType and
+        simpleContent and complexContent (in XMLSchema.xsd).
+        restriction1 is for the latter cases, when this
+        is restricting a complex type, as is attrDecls.
+  -->
+<!ELEMENT %list; ((%annotation;)?,(%simpleType;)?)>
+<!ATTLIST %list;
+    itemType      %QName;             #IMPLIED
+    id        ID       #IMPLIED
+    %listAttrs;>
+<!--
+        itemType and simpleType child are mutually exclusive,
+        one is required
+  -->
+<!ELEMENT %union; ((%annotation;)?,(%simpleType;)*)>
+<!ATTLIST %union;
+    id            ID       #IMPLIED
+    memberTypes   %QNames;            #IMPLIED
+    %unionAttrs;>
+<!--
+        At least one item in memberTypes or one simpleType
+        child is required
+  -->
+
+<!ELEMENT %maxExclusive; %facetModel;>
+<!ATTLIST %maxExclusive;
+        %facetAttr;
+        %fixedAttr;
+        %maxExclusiveAttrs;>
+<!ELEMENT %minExclusive; %facetModel;>
+<!ATTLIST %minExclusive;
+        %facetAttr;
+        %fixedAttr;
+        %minExclusiveAttrs;>
+
+<!ELEMENT %maxInclusive; %facetModel;>
+<!ATTLIST %maxInclusive;
+        %facetAttr;
+        %fixedAttr;
+        %maxInclusiveAttrs;>
+<!ELEMENT %minInclusive; %facetModel;>
+<!ATTLIST %minInclusive;
+        %facetAttr;
+        %fixedAttr;
+        %minInclusiveAttrs;>
+
+<!ELEMENT %totalDigits; %facetModel;>
+<!ATTLIST %totalDigits;
+        %facetAttr;
+        %fixedAttr;
+        %totalDigitsAttrs;>
+<!ELEMENT %fractionDigits; %facetModel;>
+<!ATTLIST %fractionDigits;
+        %facetAttr;
+        %fixedAttr;
+        %fractionDigitsAttrs;>
+
+<!ELEMENT %length; %facetModel;>
+<!ATTLIST %length;
+        %facetAttr;
+        %fixedAttr;
+        %lengthAttrs;>
+<!ELEMENT %minLength; %facetModel;>
+<!ATTLIST %minLength;
+        %facetAttr;
+        %fixedAttr;
+        %minLengthAttrs;>
+<!ELEMENT %maxLength; %facetModel;>
+<!ATTLIST %maxLength;
+        %facetAttr;
+        %fixedAttr;
+        %maxLengthAttrs;>
+
+<!-- This one can be repeated -->
+<!ELEMENT %enumeration; %facetModel;>
+<!ATTLIST %enumeration;
+        %facetAttr;
+        %enumerationAttrs;>
+
+<!ELEMENT %whiteSpace; %facetModel;>
+<!ATTLIST %whiteSpace;
+        %facetAttr;
+        %fixedAttr;
+        %whiteSpaceAttrs;>
+
+<!-- This one can be repeated -->
+<!ELEMENT %pattern; %facetModel;>
+<!ATTLIST %pattern;
+        %facetAttr;
+        %patternAttrs;>

Propchange: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/datatypes.dtd
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-extensions.xsd
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-extensions.xsd?rev=1161982&view=auto
==============================================================================
--- webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-extensions.xsd (added)
+++ webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-extensions.xsd Fri Aug 26 03:48:03 2011
@@ -0,0 +1,53 @@
+<?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 Description (WSDL)
+    Version 2.0 specifications
+     http://www.w3.org/TR/wsdl20
+     http://www.w3.org/TR/wsdl20-adjuncts
+
+   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: wsdl20-extensions.xsd,v 1.1 2007/03/14 19:45:33 plehegar Exp $
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdlx="http://www.w3.org/ns/wsdl-extensions" targetNamespace="http://www.w3.org/ns/wsdl-extensions" attributeFormDefault="qualified" elementFormDefault="qualified" finalDefault="" blockDefault="">
+
+  <xs:attribute name="safe" type="xs:boolean">
+  	<xs:annotation>
+  		<xs:documentation>
+  			This attribute may be used to annotate an
+			interface operation to indicate that it
+			provides a safe interaction.
+  		</xs:documentation>
+  	</xs:annotation>
+  </xs:attribute>
+  
+  <xs:attribute name="interface" type="xs:QName">
+  	<xs:annotation>
+  		<xs:documentation>
+  			This attribute may be used to annotate element or
+  			attribute definitions to indicate that the content refers
+  			to Web service that implements the specified interface.
+  		</xs:documentation>
+  	</xs:annotation>
+  </xs:attribute>
+
+  <xs:attribute name="binding" type="xs:QName">
+  	<xs:annotation>
+  		<xs:documentation>
+  			This attribute may be used to annotate element or
+  			attribute definitions to indicate that the content refers
+  			to Web service that implements the specified binding.
+  		</xs:documentation>
+  	</xs:annotation>
+  </xs:attribute>
+
+</xs:schema>

Propchange: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-extensions.xsd
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-http.xsd
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-http.xsd?rev=1161982&view=auto
==============================================================================
--- webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-http.xsd (added)
+++ webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-http.xsd Fri Aug 26 03:48:03 2011
@@ -0,0 +1,97 @@
+<?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 Description (WSDL)
+    Version 2.0 Part 2: Adjuncts specification
+     http://www.w3.org/TR/wsdl20-adjuncts
+
+   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: http.xsd,v 1.1 2007/03/14 19:59:24 plehegar Exp $
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://www.w3.org/ns/wsdl" xmlns:whttp="http://www.w3.org/ns/wsdl/http" targetNamespace="http://www.w3.org/ns/wsdl/http" elementFormDefault="qualified" attributeFormDefault="unqualified" finalDefault="" blockDefault="">
+
+  <xs:import namespace="http://www.w3.org/ns/wsdl" schemaLocation="wsdl20.xsd"/>
+
+  <xs:attribute name="methodDefault" type="xs:string"/>
+  <xs:attribute name="method" type="xs:string"/>
+
+  <xs:attribute name="version" type="whttp:versionType"/>
+
+  <xs:attribute name="location" type="xs:anyURI"/>
+
+  <xs:attribute name="code">
+    <xs:simpleType>
+      <xs:union memberTypes="xs:int">
+	<xs:simpleType>
+	  <xs:restriction base="xs:token">
+	    <xs:enumeration value="#any"/>
+	  </xs:restriction>
+	</xs:simpleType>
+      </xs:union>
+    </xs:simpleType>
+  </xs:attribute>
+
+  <xs:attribute name="inputSerialization" type="xs:string"/>
+  <xs:attribute name="outputSerialization" type="xs:string"/>
+  <xs:attribute name="faultSerialization" type="xs:string"/>
+
+  <xs:attribute name="ignoreUncited" type="xs:boolean"/>
+
+  <xs:simpleType name="queryParameterType">
+    <xs:restriction base="xs:string">
+      <xs:length value="1"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:attribute name="queryParameterSeparatorDefault" type="whttp:queryParameterType"/>
+  <xs:attribute name="queryParameterSeparator" type="whttp:queryParameterType"/>
+
+  <xs:attribute name="defaultTransferCoding" type="xs:string"/>
+  <xs:attribute name="transferCoding" type="xs:string"/>
+
+  <xs:attribute name="cookies" type="xs:boolean"/>
+
+  <xs:attribute name="authenticationScheme">
+    <xs:simpleType>
+      <xs:restriction base="xs:token">
+	<xs:enumeration value="basic"/>
+	<xs:enumeration value="digest"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
+  <xs:attribute name="authenticationRealm" type="xs:string"/>
+
+  <xs:simpleType name="versionType">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[0-9]+\.[0-9]+"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="httpTokenType">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[!#-'*+\-.0-9A-Z^-z|~]+"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="header">
+    <xs:complexType mixed="false">
+      <xs:complexContent>
+	<xs:extension base="wsdl:ExtensibleDocumentedType">
+	  <xs:attribute name="name" type="whttp:httpTokenType" use="required"/>
+	  <xs:attribute name="type" type="xs:QName" use="required"/>
+	  <xs:attribute name="required" type="xs:boolean"/>
+	</xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+</xs:schema>

Propchange: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-http.xsd
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-instance.xsd
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-instance.xsd?rev=1161982&view=auto
==============================================================================
--- webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-instance.xsd (added)
+++ webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-instance.xsd Fri Aug 26 03:48:03 2011
@@ -0,0 +1,35 @@
+<?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 Description (WSDL)
+    Version 2.0 specification
+     http://www.w3.org/TR/wsdl20
+
+   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: wsdl20-instance.xsd,v 1.1 2007/03/14 19:45:33 plehegar Exp $
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdli="http://www.w3.org/ns/wsdl-instance" targetNamespace="http://www.w3.org/ns/wsdl-instance" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified">
+
+  <xs:attribute name="wsdlLocation">
+    <xs:annotation>
+      <xs:documentation>
+      This attribute can be used to provide some hints on where
+      additional WSDL information for a given namespace can be
+      found in order to help with QName resolution
+      </xs:documentation>
+    </xs:annotation>
+    <xs:simpleType>
+      <xs:list itemType="xs:anyURI"/>
+    </xs:simpleType>
+  </xs:attribute>
+
+</xs:schema>

Propchange: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-instance.xsd
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-rpc.xsd
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-rpc.xsd?rev=1161982&view=auto
==============================================================================
--- webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-rpc.xsd (added)
+++ webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-rpc.xsd Fri Aug 26 03:48:03 2011
@@ -0,0 +1,49 @@
+<?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 Description (WSDL)
+    Version 2.0 Adjuncts specification
+     http://www.w3.org/TR/wsdl20-adjuncts
+
+   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: rpc.xsd,v 1.1 2007/03/14 19:59:24 plehegar Exp $
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wrpc="http://www.w3.org/ns/wsdl/rpc" targetNamespace="http://www.w3.org/ns/wsdl/rpc" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified">
+
+	<xs:attribute name="signature" type="wrpc:signatureType">
+		<xs:annotation>
+			<xs:documentation>
+				This attribute can be used as an extension to describe
+				the RPC signature associated with an operation that uses
+				the RPC style.
+			</xs:documentation>
+		</xs:annotation>
+	</xs:attribute>
+
+	<xs:simpleType name="signatureType">
+		<xs:list itemType="wrpc:signatureItemType"/>
+	</xs:simpleType>
+
+	<xs:simpleType name="signatureItemType">
+		<xs:union memberTypes="xs:QName wrpc:directionToken"/>
+	</xs:simpleType>
+
+	<xs:simpleType name="directionToken">
+		<xs:restriction base="xs:token">
+			<xs:enumeration value="#in"/>
+			<xs:enumeration value="#out"/>
+			<xs:enumeration value="#inout"/>
+			<xs:enumeration value="#return"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+</xs:schema>

Propchange: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-rpc.xsd
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-soap.xsd
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-soap.xsd?rev=1161982&view=auto
==============================================================================
--- webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-soap.xsd (added)
+++ webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-soap.xsd Fri Aug 26 03:48:03 2011
@@ -0,0 +1,77 @@
+<?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 Description Language
+   (WSDL) Version 2.0 Part 2: Adjuncts specification
+     http://www.w3.org/TR/wsdl20-adjuncts
+
+   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: soap.xsd,v 1.1 2007/03/14 19:59:24 plehegar Exp $
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsoap="http://www.w3.org/ns/wsdl/soap" xmlns:wsdl="http://www.w3.org/ns/wsdl" targetNamespace="http://www.w3.org/ns/wsdl/soap" elementFormDefault="qualified" attributeFormDefault="unqualified" finalDefault="" blockDefault="">
+
+	<xs:import namespace="http://www.w3.org/ns/wsdl" schemaLocation="wsdl20.xsd"/>
+
+	<xs:attribute name="version" type="xs:string"/>
+	<xs:attribute name="protocol" type="xs:anyURI"/>
+
+	<xs:attribute name="mepDefault" type="xs:anyURI"/>
+	<xs:attribute name="mep" type="xs:anyURI"/>
+
+	<xs:attribute name="action" type="xs:anyURI"/>
+
+	<xs:element name="module">
+		<xs:complexType mixed="false">
+			<xs:complexContent>
+				<xs:extension base="wsdl:ExtensibleDocumentedType">
+					<xs:attribute name="ref" type="xs:anyURI" use="required"/>
+					<xs:attribute name="required" type="xs:boolean"/>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:element name="header">
+		<xs:complexType mixed="false">
+			<xs:complexContent>
+				<xs:extension base="wsdl:ExtensibleDocumentedType">
+					<xs:attribute name="element" type="xs:QName" use="required"/>
+					<xs:attribute name="mustUnderstand" type="xs:boolean"/>
+					<xs:attribute name="required" type="xs:boolean"/>
+				</xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+
+	<xs:simpleType name="TokenAny">
+	  <xs:restriction base="xs:token">
+	    <xs:enumeration value="#any"/>
+	  </xs:restriction>
+	</xs:simpleType>
+
+	<xs:attribute name="code">
+	  <xs:simpleType>
+	    <xs:union memberTypes="xs:QName wsoap:TokenAny"/>
+	  </xs:simpleType>
+	</xs:attribute>
+
+	<xs:attribute name="subcodes">
+	  <xs:simpleType>
+	    <xs:union memberTypes="wsoap:TokenAny">
+		<xs:simpleType>
+			<xs:list itemType="xs:QName"/>
+		</xs:simpleType>
+	    </xs:union>
+	  </xs:simpleType>
+	</xs:attribute>
+
+</xs:schema>

Propchange: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20-soap.xsd
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20.xsd
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20.xsd?rev=1161982&view=auto
==============================================================================
--- webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20.xsd (added)
+++ webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20.xsd Fri Aug 26 03:48:03 2011
@@ -0,0 +1,362 @@
+<?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 Description (WSDL)
+    Version 2.0 specification
+     http://www.w3.org/TR/wsdl20
+
+   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: wsdl20.xsd,v 1.1 2007/03/14 19:45:33 plehegar Exp $
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://www.w3.org/ns/wsdl" targetNamespace="http://www.w3.org/ns/wsdl" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified">
+
+  <xs:element name="documentation" type="wsdl:DocumentationType"/>
+  <xs:complexType name="DocumentationType" mixed="true">
+    <xs:sequence>
+      <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded" namespace="##any"/>
+    </xs:sequence>
+    <xs:anyAttribute namespace="##other" processContents="lax"/>
+  </xs:complexType>
+
+  <xs:complexType name="DocumentedType" mixed="false">
+    <xs:annotation>
+      <xs:documentation>
+      This type is extended by component types to allow them to be documented.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element ref="wsdl:documentation" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="ExtensibleDocumentedType" abstract="true" mixed="false">
+    <xs:annotation>
+      <xs:documentation>
+      This type is extended by component types to allow 
+      attributes from other namespaces to be added.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="wsdl:DocumentedType">
+	    <xs:anyAttribute namespace="##other" processContents="lax"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <!-- description element decl and type def -->
+  <xs:element name="description" type="wsdl:DescriptionType">
+    <xs:unique name="interface">
+      <xs:selector xpath="wsdl:interface"/>
+      <xs:field xpath="@name"/>
+    </xs:unique>
+    <xs:unique name="binding">
+      <xs:selector xpath="wsdl:binding"/>
+      <xs:field xpath="@name"/>
+    </xs:unique>
+    <xs:unique name="service">
+      <xs:selector xpath="wsdl:service"/>
+      <xs:field xpath="@name"/>
+    </xs:unique>
+  </xs:element>
+
+  <xs:complexType name="DescriptionType" mixed="false">
+    <xs:annotation>
+      <xs:documentation>
+        Although correct, this type declaration does not capture
+        all the constraints on the contents of the wsdl:description
+        element as defined by the WSDL 2.0 specification.
+
+        In particular, the ordering constraints wrt elements preceding
+        and following the wsdl:types child element are not captured, as
+        attempts to incorporate such restrictions in the schema
+        ran afoul of the UPA (Unique Particle Attribution) rule
+        in the XML Schema language.
+
+        Please refer to the WSDL 2.0 specification for
+	additional information on the contents of this type.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="wsdl:import"/>
+          <xs:element ref="wsdl:include"/>
+          <xs:element ref="wsdl:types"/>
+          <xs:element ref="wsdl:interface"/>
+	      <xs:element ref="wsdl:binding"/>
+	      <xs:element ref="wsdl:service"/>
+          <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/>
+        </xs:choice>
+	<xs:attribute name="targetNamespace" type="xs:anyURI" use="required"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <!-- types for import and include elements -->
+  <xs:element name="import" type="wsdl:ImportType"/>
+  <xs:complexType name="ImportType" mixed="false">
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+	    <xs:sequence>
+	      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="strict"/>
+	    </xs:sequence>
+        <xs:attribute name="namespace" type="xs:anyURI" use="required"/>
+        <xs:attribute name="location" type="xs:anyURI" use="optional"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="include" type="wsdl:IncludeType"/>
+  <xs:complexType name="IncludeType" mixed="false">
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+	    <xs:sequence>
+	      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="strict"/>
+	    </xs:sequence>
+        <xs:attribute name="location" type="xs:anyURI" use="required"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="types" type="wsdl:TypesType"/>
+  <xs:complexType name="TypesType" mixed="false">
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+	    <xs:sequence>
+	      <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="strict"/>
+	    </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <!-- parts related to wsdl:interface -->
+  <xs:element name="interface" type="wsdl:InterfaceType">
+	<xs:unique name="operation">
+	  <xs:selector xpath="wsdl:operation"/>
+	  <xs:field xpath="@name"/>
+	</xs:unique>
+	<xs:unique name="fault">
+	  <xs:selector xpath="wsdl:fault"/>
+	  <xs:field xpath="@name"/>
+	</xs:unique>
+  </xs:element>
+  <xs:complexType name="InterfaceType" mixed="false">
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="operation" type="wsdl:InterfaceOperationType"/>
+          <xs:element name="fault" type="wsdl:InterfaceFaultType"/>
+          <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/>
+        </xs:choice>
+        <xs:attribute name="name" type="xs:NCName" use="required"/>
+        <xs:attribute name="extends" use="optional">
+		  <xs:simpleType>
+		    <xs:list itemType="xs:QName"/>
+		  </xs:simpleType>
+	</xs:attribute>
+        <xs:attribute name="styleDefault" use="optional">
+		  <xs:simpleType>
+		    <xs:list itemType="xs:anyURI"/>
+		  </xs:simpleType>
+	</xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="InterfaceOperationType" mixed="false">
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="input" type="wsdl:MessageRefType"/>
+          <xs:element name="output" type="wsdl:MessageRefType"/>
+          <xs:element name="infault" type="wsdl:MessageRefFaultType"/>
+          <xs:element name="outfault" type="wsdl:MessageRefFaultType"/>
+          <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/>
+        </xs:choice>
+        <xs:attribute name="name" type="xs:NCName" use="required"/>
+        <xs:attribute name="pattern" type="xs:anyURI" use="optional"/>
+        <xs:attribute name="safe" type="xs:boolean" use="optional"/>
+        <xs:attribute name="style" type="xs:anyURI" use="optional"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="MessageRefType" mixed="false">
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/>
+        </xs:choice>
+        <xs:attribute name="messageLabel" type="xs:NCName" use="optional"/>
+        <xs:attribute name="element" type="wsdl:ElementReferenceType" use="optional"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:simpleType name="ElementReferenceType">
+    <xs:annotation>
+      <xs:documentation>
+      Use the QName of a GED that describes the content, 
+      #any for any content, 
+      #none for empty content, or 
+      #other for content described by some other extension attribute that references a declaration in a non-XML extension type system.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:union memberTypes="xs:QName">
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="#any"/>
+          <xs:enumeration value="#none"/>
+          <xs:enumeration value="#other"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:union>
+  </xs:simpleType>
+
+  <xs:complexType name="MessageRefFaultType" mixed="false">
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/>
+        </xs:choice>
+        <xs:attribute name="ref" type="xs:QName" use="required"/>
+        <xs:attribute name="messageLabel" type="xs:NCName" use="optional"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="InterfaceFaultType" mixed="false">
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/>
+        </xs:choice>
+        <xs:attribute name="name" type="xs:NCName" use="required"/>
+        <xs:attribute name="element" type="xs:QName" use="optional"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <!-- types related to wsdl:binding -->
+  <xs:element name="binding" type="wsdl:BindingType"/>
+  <xs:complexType name="BindingType" mixed="false">
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="operation" type="wsdl:BindingOperationType"/>
+          <xs:element name="fault" type="wsdl:BindingFaultType"/>
+          <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/>
+        </xs:choice>
+        <xs:attribute name="name" type="xs:NCName" use="required"/>
+        <xs:attribute name="type" type="xs:anyURI" use="required"/>
+        <xs:attribute name="interface" type="xs:QName" use="optional"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="BindingOperationType" mixed="false">
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="input" type="wsdl:BindingOperationMessageType"/>
+          <xs:element name="output" type="wsdl:BindingOperationMessageType"/>
+          <xs:element name="infault" type="wsdl:BindingOperationFaultType"/>
+          <xs:element name="outfault" type="wsdl:BindingOperationFaultType"/>
+          <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/>
+        </xs:choice>
+        <xs:attribute name="ref" type="xs:QName" use="required"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="BindingOperationMessageType" mixed="false">
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/>
+        </xs:choice>
+        <xs:attribute name="messageLabel" type="xs:NCName" use="optional"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="BindingOperationFaultType" mixed="false">
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/>
+        </xs:choice>
+        <xs:attribute name="ref" type="xs:QName" use="required"/>
+        <xs:attribute name="messageLabel" type="xs:NCName" use="optional"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="BindingFaultType" mixed="false">
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/>
+        </xs:choice>
+        <xs:attribute name="ref" type="xs:QName" use="required"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <!-- types related to service -->
+  <xs:element name="service" type="wsdl:ServiceType">
+	<xs:unique name="endpoint">
+	  <xs:selector xpath="wsdl:endpoint"/>
+	  <xs:field xpath="@name"/>
+	</xs:unique>
+  </xs:element>
+  <xs:complexType name="ServiceType" mixed="false">
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+        <xs:choice minOccurs="1" maxOccurs="unbounded">
+          <xs:element ref="wsdl:endpoint"/>
+          <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/>
+        </xs:choice>
+        <xs:attribute name="name" type="xs:NCName" use="required"/>
+        <xs:attribute name="interface" type="xs:QName" use="required"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:element name="endpoint" type="wsdl:EndpointType"/>
+  <xs:complexType name="EndpointType" mixed="false">
+    <xs:complexContent>
+      <xs:extension base="wsdl:ExtensibleDocumentedType">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:any namespace="##other" processContents="lax" minOccurs="1" maxOccurs="1"/>
+        </xs:choice>
+        <xs:attribute name="name" type="xs:NCName" use="required"/>
+        <xs:attribute name="binding" type="xs:QName" use="required"/>
+        <xs:attribute name="address" type="xs:anyURI" use="optional"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:attribute name="required" type="xs:boolean"/>
+
+  <xs:complexType name="ExtensionElement" abstract="true" mixed="false">
+    <xs:annotation>
+	  <xs:documentation>
+	  This abstract type is intended to serve as the base type for
+      extension elements. It includes the wsdl:required attribute
+      which it is anticipated will be used by most extension elements
+	  </xs:documentation>
+	</xs:annotation>
+    <xs:attribute ref="wsdl:required" use="optional"/>
+  </xs:complexType>
+
+</xs:schema>

Propchange: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/wsdl20.xsd
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/xml.xsd
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/xml.xsd?rev=1161982&view=auto
==============================================================================
--- webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/xml.xsd (added)
+++ webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/xml.xsd Fri Aug 26 03:48:03 2011
@@ -0,0 +1,146 @@
+<?xml version='1.0'?>
+<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:
+        &lt;schema . . .>
+         . . .
+         &lt;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.
+
+        &lt;type . . .>
+         . . .
+         &lt;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>

Propchange: webservices/woden/branches/woden-20/woden-commons/src/main/resources/org/apache/woden/resolver/xml.xsd
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/woden/branches/woden-20/woden-commons/src/main/resources/schema.xml
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-commons/src/main/resources/schema.xml?rev=1161982&view=auto
==============================================================================
--- webservices/woden/branches/woden-20/woden-commons/src/main/resources/schema.xml (added)
+++ webservices/woden/branches/woden-20/woden-commons/src/main/resources/schema.xml Fri Aug 26 03:48:03 2011
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+  
+  <public publicId="http://www.w3.org/2001/XMLSchema" uri="org/apache/woden/resolver/XMLSchema.xsd"/>
+  <system systemId="http://www.w3.org/2001/XMLSchema.xsd" uri="org/apache/woden/resolver/XMLSchema.xsd"/>
+
+
+  
+
+</catalog>
\ No newline at end of file

Modified: webservices/woden/branches/woden-20/woden-dom/src/main/java/org/apache/woden/internal/DOMWSDLReader.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-dom/src/main/java/org/apache/woden/internal/DOMWSDLReader.java?rev=1161982&r1=1161981&r2=1161982&view=diff
==============================================================================
--- webservices/woden/branches/woden-20/woden-dom/src/main/java/org/apache/woden/internal/DOMWSDLReader.java (original)
+++ webservices/woden/branches/woden-20/woden-dom/src/main/java/org/apache/woden/internal/DOMWSDLReader.java Fri Aug 26 03:48:03 2011
@@ -36,6 +36,8 @@ import org.apache.woden.WSDLSource;
 import org.apache.woden.XMLElement;
 import org.apache.woden.internal.resolver.DOMSchemaResolverAdapter;
 import org.apache.woden.internal.resolver.EntityResolverAdapter;
+import org.apache.woden.internal.resolver.OASISEntityResolverAdapter;
+import org.apache.woden.internal.resolver.OASISEntitySchemaResolverAdapter;
 import org.apache.woden.internal.schema.ImportedSchemaImpl;
 import org.apache.woden.internal.schema.InlinedSchemaImpl;
 import org.apache.woden.internal.schema.SchemaConstants;
@@ -147,7 +149,7 @@ public class DOMWSDLReader extends BaseW
         } catch (MalformedURLException e) {
             
             String msg = getErrorReporter().getFormattedMessage(
-                            "WSDL502", new Object[] {null, wsdlURI});
+                            "WSDL516", new Object[] {wsdlURI});
             throw new WSDLException(WSDLException.PARSER_ERROR, msg, e);
         }
         String wsdlURL = url.toString();
@@ -178,7 +180,7 @@ public class DOMWSDLReader extends BaseW
             } catch (MalformedURLException e) {
                 
                 String msg = getErrorReporter().getFormattedMessage(
-                        "WSDL502", new Object[] {null, baseURI.toString()});
+                        "WSDL516", new Object[] {baseURI.toString()});
                 throw new WSDLException(WSDLException.PARSER_ERROR, msg, e);
             }
             wsdlURL = url.toString();
@@ -333,7 +335,8 @@ public class DOMWSDLReader extends BaseW
             xsc.setBaseUri(baseURI);
             
             // Plug in the selected woden URI Resolver
-            xsc.setSchemaResolver(new DOMSchemaResolverAdapter(getURIResolver(), schemaEl));         
+            xsc.setSchemaResolver(new OASISEntitySchemaResolverAdapter()); 
+            //xsc.setSchemaResolver(new DOMSchemaResolverAdapter(getURIResolver(), schemaEl));    
             schemaDef = xsc.read(domSchemaEl, baseURI);
         } 
         catch (XmlSchemaException e) 
@@ -680,7 +683,7 @@ public class DOMWSDLReader extends BaseW
                 xsc.setBaseUri(resolvedLoc);
                 
                 // Plug in the selected woden URI Resolver
-                xsc.setSchemaResolver(new DOMSchemaResolverAdapter(getURIResolver(), contextElement));   
+                xsc.setSchemaResolver(new OASISEntitySchemaResolverAdapter());   
                 
                 schemaDef = xsc.read(schemaEl, baseLoc);
                 fImportedSchemas.put(schemaURL, schemaDef);
@@ -790,7 +793,7 @@ public class DOMWSDLReader extends BaseW
         Document doc = null;
         try {
             DocumentBuilderFactory factory = createDocumentBuilderFactory(true);
-            EntityResolverAdapter entityResolver = new EntityResolverAdapter(getURIResolver());
+            OASISEntityResolverAdapter entityResolver = new OASISEntityResolverAdapter();
             ErrorHandler errorHandler = new ErrorHandlerWrapper(getErrorReporter());
             DocumentBuilder builder = createDocumentBuilder(factory, entityResolver, errorHandler);
             doc = builder.parse(inputSource);

Modified: webservices/woden/branches/woden-20/woden-tests/src/test/java/org/apache/woden/internal/wsdl20/assertions/TestDescription1001.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-tests/src/test/java/org/apache/woden/internal/wsdl20/assertions/TestDescription1001.java?rev=1161982&r1=1161981&r2=1161982&view=diff
==============================================================================
--- webservices/woden/branches/woden-20/woden-tests/src/test/java/org/apache/woden/internal/wsdl20/assertions/TestDescription1001.java (original)
+++ webservices/woden/branches/woden-20/woden-tests/src/test/java/org/apache/woden/internal/wsdl20/assertions/TestDescription1001.java Fri Aug 26 03:48:03 2011
@@ -24,7 +24,7 @@ import org.apache.woden.ErrorReporter;
 import org.apache.woden.WSDLException;
 import org.apache.woden.WSDLFactory;
 import org.apache.woden.WSDLReader;
-import org.apache.woden.internal.resolver.SimpleURIResolver;
+import org.apache.woden.internal.resolver.OASISCatalogURIResolver;
 import org.apache.woden.tests.TestErrorHandler;
 import org.apache.woden.wsdl20.validation.WodenContext;
 import org.apache.woden.wsdl20.xml.DescriptionElement;
@@ -54,7 +54,7 @@ public class TestDescription1001 extends
 	    reporter = reader.getErrorReporter();
         handler = new TestErrorHandler();
 	    reporter.setErrorHandler(handler);
-		wodenContext = new WodenContextImpl(reporter, new SimpleURIResolver());
+		wodenContext = new WodenContextImpl(reporter, new OASISCatalogURIResolver());
 	}
 	
 	protected void tearDown() throws Exception {

Modified: webservices/woden/branches/woden-20/woden-tests/src/test/java/org/apache/woden/resolver/SimpleURIResolverTest.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-tests/src/test/java/org/apache/woden/resolver/SimpleURIResolverTest.java?rev=1161982&r1=1161981&r2=1161982&view=diff
==============================================================================
--- webservices/woden/branches/woden-20/woden-tests/src/test/java/org/apache/woden/resolver/SimpleURIResolverTest.java (original)
+++ webservices/woden/branches/woden-20/woden-tests/src/test/java/org/apache/woden/resolver/SimpleURIResolverTest.java Fri Aug 26 03:48:03 2011
@@ -30,7 +30,7 @@ import junit.framework.TestSuite;
 import org.apache.woden.ErrorHandler;
 import org.apache.woden.WSDLFactory;
 import org.apache.woden.WSDLReader;
-import org.apache.woden.internal.resolver.SimpleURIResolver;
+import org.apache.woden.internal.resolver.OASISCatalogURIResolver;
 import org.apache.woden.schema.ImportedSchema;
 import org.apache.woden.schema.InlinedSchema;
 import org.apache.woden.schema.Schema;
@@ -120,7 +120,7 @@ public class SimpleURIResolverTest exten
         //assertNotNull("Failed to find the Base URL document on the classpath using the path: " + fResources + ".", 
         //        wsdlURL);
         //System.setProperty(fCatalogBaseProperty, rootURL.toString());
-		reader.setURIResolver(new SimpleURIResolver());
+		reader.setURIResolver(new OASISCatalogURIResolver());
 		
 		Description descComp = reader.readWSDL(wsdlURL.toString());
         assertNotNull("The reader did not return a WSDL description.", descComp);

Modified: webservices/woden/branches/woden-20/woden-tests/src/test/java/testcase/resolver/schemaloc/SchemaLocationTest.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-tests/src/test/java/testcase/resolver/schemaloc/SchemaLocationTest.java?rev=1161982&r1=1161981&r2=1161982&view=diff
==============================================================================
--- webservices/woden/branches/woden-20/woden-tests/src/test/java/testcase/resolver/schemaloc/SchemaLocationTest.java (original)
+++ webservices/woden/branches/woden-20/woden-tests/src/test/java/testcase/resolver/schemaloc/SchemaLocationTest.java Fri Aug 26 03:48:03 2011
@@ -10,7 +10,7 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 import org.apache.woden.internal.resolver.SchemaResolverAdapter;
-import org.apache.woden.internal.resolver.SimpleURIResolver;
+import org.apache.woden.internal.resolver.OASISCatalogURIResolver;
 import org.apache.woden.resolver.URIResolver;
 import org.apache.woden.XMLElement;
 import org.xml.sax.InputSource;
@@ -49,14 +49,14 @@ public class SchemaLocationTest extends 
                     "org.apache.woden.internal.resolver.DOMSchemaResolverAdapter").getConstructor(
                     new Class[] { URIResolver.class, XMLElement.class });
             fResolver = (SchemaResolverAdapter) cons.newInstance(new Object[] {
-                    new SimpleURIResolver(), null });
+                    new OASISCatalogURIResolver(), null });
 
         } else if ("org.apache.woden.internal.OMWSDLFactory".equals(factory)) {
             Constructor cons = Class.forName(
                     "org.apache.woden.internal.resolver.OMSchemaResolverAdapter").getConstructor(
                     new Class[] { URIResolver.class, XMLElement.class });
             fResolver = (SchemaResolverAdapter) cons.newInstance(new Object[] {
-                    new SimpleURIResolver(), null });
+                    new OASISCatalogURIResolver(), null });
 
         }
         

Added: webservices/woden/branches/woden-20/woden-tests/src/test/resources/W3Ctests.xml
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-tests/src/test/resources/W3Ctests.xml?rev=1161982&view=auto
==============================================================================
--- webservices/woden/branches/woden-20/woden-tests/src/test/resources/W3Ctests.xml (added)
+++ webservices/woden/branches/woden-20/woden-tests/src/test/resources/W3Ctests.xml Fri Aug 26 03:48:03 2011
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <system systemId="http://www.w3.org/2001/XMLSchema.xsd" uri="org/apache/woden/resolver/XMLSchema.xsd"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Chameleon-1B/accountInfo.xsd" uri="documents/bad/Chameleon-1B/accountInfo.xsd"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Chameleon-1B/customerInfo.xsd" uri="documents/bad/Chameleon-1B/customerInfo.xsd"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Chameleon-1B/getBalance.wsdl" uri="documents/bad/Chameleon-1B/getBalance.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Chameleon-2B/getBalance.wsdl" uri="documents/bad/Chameleon-2B/getBalance.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Import-1B/XSDImport.wsdl" uri="documents/bad/Import-1B/XSDImport.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Import-2B/XSDImportInWSDL.wsdl" uri="documents/bad/Import-2B/XSDImportInWSDL.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Import-3B/XSDImport2.wsdl" uri="documents/bad/Import-3B/XSDImport2.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Interface-1B/Interface.wsdl" uri="documents/bad/Interface-1B/Interface.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Interface-2B/Interface.wsdl" uri="documents/bad/Interface-2B/Interface.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Interface-3B/Interface.wsdl" uri="documents/bad/Interface-3B/Interface.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-1B/Service.wsdl" uri="documents/bad/Service-1B/Service.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-2B/Service.wsdl" uri="documents/bad/Service-2B/Service.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-12B/Service.wsdl" uri="documents/bad/Service-12B/Service.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-13B/Service.wsdl" uri="documents/bad/Service-13B/Service.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-14B/Service.wsdl" uri="documents/bad/Service-14B/Service.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/Service-15B/Service.wsdl" uri="documents/bad/Service-15B/Service.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/bad/TicketAgent-1B/TicketAgent-bad.wsdl" uri="documents/bad/TicketAgent-1B/TicketAgent-bad.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-1G/getBalance.wsdl" uri="documents/good/Chameleon-1G/getBalance.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-2G/getBalance.wsdl" uri="documents/good/Chameleon-2G/getBalance.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-3G/getBalance.wsdl" uri="documents/good/Chameleon-3G/getBalance.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Chameleon-4G/getBalance.wsdl" uri="documents/good/Chameleon-4G/getBalance.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Compound1-1G/compound1.wsdl" uri="documents/good/Compound1-1G/compound1.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/CreditCardFaults-1G/use-credit-card-faults.wsdl" uri="documents/good/CreditCardFaults-1G/use-credit-card-faults.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/CreditCardFaults-1G/resSvc.xsd" uri="documents/good/CreditCardFaults-1G/resSvc.xsd"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Echo-1G/echo.wsdl" uri="documents/good/Echo-1G/echo.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Echo-2G/echo.wsdl" uri="documents/good/Echo-2G/echo.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/EchoComplexDocLit-1G/Axis2SampleDocLit.wsdl" uri="documents/good/EchoComplexDocLit-1G/Axis2SampleDocLit.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/FlickrHTTP-1G/flickr.wsdl" uri="documents/good/FlickrHTTP-1G/flickr.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/GreatH-1G/primer-hotelReservationService.wsdl" uri="documents/good/GreatH-1G/primer-hotelReservationService.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/GreatH-2G/primer-hotelReservationService.wsdl" uri="documents/good/GreatH-2G/primer-hotelReservationService.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/GreatH-3G/primer-hotelReservationService.wsdl" uri="documents/good/GreatH-3G/primer-hotelReservationService.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/HTTPBinding-1G/Echo.wsdl" uri="documents/good/HTTPBinding-1G/Echo.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/HTTPBinding-2G/Echo.wsdl" uri="documents/good/HTTPBinding-2G/Echo.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Import-1G/XSDImport.wsdl" uri="documents/good/Import-1G/XSDImport.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Import-1G/name.xsd" uri="documents/good/Import-1G/name.xsd"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Import-2G/XSDImport2.wsdl" uri="documents/good/Import-2G/XSDImport2.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Import-2G/name.xsd" uri="documents/good/Import-2G/name.xsd"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ImportedWSDL-1G/updateDetails.wsdl" uri="documents/good/ImportedWSDL-1G/updateDetails.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Include-1G/EchoImpl.wsdl" uri="documents/good/Include-1G/EchoImpl.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/InOnlyMEP-1G/Oneway.wsdl" uri="documents/good/InOnlyMEP-1G/Oneway.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-1G/Interface.wsdl" uri="documents/good/Interface-1G/Interface.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-2G/Interface.wsdl" uri="documents/good/Interface-2G/Interface.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-3G/Interface.wsdl" uri="documents/good/Interface-3G/Interface.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-4G/Interface.wsdl" uri="documents/good/Interface-4G/Interface.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-5G/Interface.wsdl" uri="documents/good/Interface-5G/Interface.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-6G/Interface.wsdl" uri="documents/good/Interface-6G/Interface.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Interface-7G/Interface.wsdl" uri="documents/good/Interface-7G/Interface.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/IRI-1G/iristyleinout.wsdl" uri="documents/good/IRI-1G/iristyleinout.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/IRI-2G/iristyleinonly.wsdl" uri="documents/good/IRI-2G/iristyleinonly.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/IRI-3G/iristyleinout.wsdl" uri="documents/good/IRI-3G/iristyleinout.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/LocationTemplate-1G/SOAPservice.wsdl" uri="documents/good/LocationTemplate-1G/SOAPservice.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/MessageMultipart-1G/HTTPservice.wsdl" uri="documents/good/MessageMultipart-1G/HTTPservice.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/MessageTest-1G/SOAPservice.wsdl" uri="documents/good/MessageTest-1G/SOAPservice.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/MessageTest-2G/HTTPservice.wsdl" uri="documents/good/MessageTest-2G/HTTPservice.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/MessageTest-3G/HTTPservice.wsdl" uri="documents/good/MessageTest-3G/HTTPservice.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/MessageTest-4G/SOAPservice.wsdl" uri="documents/good/MessageTest-4G/SOAPservice.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/MessageTest-5G/SOAPservice.wsdl" uri="documents/good/MessageTest-5G/SOAPservice.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/MessageTest-6G/SOAPservice.wsdl" uri="documents/good/MessageTest-6G/SOAPservice.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ModuleComposition-1G/SOAPservice.wsdl" uri="documents/good/ModuleComposition-1G/SOAPservice.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Multipart-1G/multipartstyleinout.wsdl" uri="documents/good/Multipart-1G/multipartstyleinout.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Multipart-2G/multipartstyleinonly.wsdl" uri="documents/good/Multipart-2G/multipartstyleinonly.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Multipart-3G/multipartstyleinout.wsdl" uri="documents/good/Multipart-3G/multipartstyleinout.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/MultipleInlineSchemas-1G/retrieveItems.wsdl" uri="documents/good/MultipleInlineSchemas-1G/retrieveItems.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/RPC-1G/rpcstyleinout.wsdl" uri="documents/good/RPC-1G/rpcstyleinout.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/RPC-2G/rpcstyleinonly.wsdl" uri="documents/good/RPC-2G/rpcstyleinonly.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/RPC-3G/rpcstyleinout.wsdl" uri="documents/good/RPC-3G/rpcstyleinout.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/RPC-4G/rpcstyleinout.wsdl" uri="documents/good/RPC-4G/rpcstyleinout.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/RPC-5G/rpcstyleinout.wsdl" uri="documents/good/RPC-5G/rpcstyleinout.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/RPC-6G/rpcstyleinout.wsdl" uri="documents/good/RPC-6G/rpcstyleinout.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Schema-1G/string.wsdl" uri="documents/good/Schema-1G/string.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/SchemaId-1G/schemaIds.wsdl" uri="documents/good/SchemaId-1G/schemaIds.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/SchemaLocationFragment-1G/Items.wsdl" uri="documents/good/SchemaLocationFragment-1G/Items.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Service-1G/Service.wsdl" uri="documents/good/Service-1G/Service.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Service-2G/Service.wsdl" uri="documents/good/Service-2G/Service.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Service-3G/Service.wsdl" uri="documents/good/Service-3G/Service.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationList.wsdl" uri="documents/good/ServiceReference-1G/reservationList.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationList.xsd" uri="documents/good/ServiceReference-1G/reservationList.xsd"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationDetails.wsdl" uri="documents/good/ServiceReference-1G/reservationDetails.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/ServiceReference-1G/reservationDetails.xsd" uri="documents/good/ServiceReference-1G/reservationDetails.xsd"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/SOAPHeader-1G/SOAPservice.wsdl" uri="documents/good/SOAPHeader-1G/SOAPservice.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/SparqlQuery-1G/sparql-protocol-query.wsdl" uri="documents/good/SparqlQuery-1G/sparql-protocol-query.wsdl"/>
+ <system systemId="http://www.w3.org/2005/09/sparql-protocol-types/#" uri="documents/good/SparqlQuery-1G/sparql-protocol-types.xsd"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/SparqlQuerySimplified-1G/sparql-protocol-query.wsdl" uri="documents/good/SparqlQuerySimplified-1G/sparql-protocol-query.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Storage-1G/storage.wsdl" uri="documents/good/Storage-1G/storage.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Storage-2G/storage.wsdl" uri="documents/good/Storage-2G/storage.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Storage-3G/storage.wsdl" uri="documents/good/Storage-3G/storage.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Storage-4G/storage.wsdl" uri="documents/good/Storage-4G/storage.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/Storage-5G/storage.wsdl" uri="documents/good/Storage-5G/storage.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/TicketAgent-1G/TicketAgent.wsdl" uri="documents/good/TicketAgent-1G/TicketAgent.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/TicketAgent-1G/TicketAgent.xsd" uri="documents/good/TicketAgent-1G/TicketAgent.xsd"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/UnknownExtension-1G/Interface.wsdl" uri="documents/good/UnknownExtension-1G/Interface.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/UnknownExtension-2G/Interface.wsdl" uri="documents/good/UnknownExtension-2G/Interface.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/WeathSvc-1G/WeathSvc.wsdl" uri="documents/good/WeathSvc-1G/WeathSvc.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/WSAddressing-1G/wsaTestService2.wsdl" uri="documents/good/WSAddressing-1G/wsaTestService2.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/XsImport-1G/reservation.wsdl" uri="documents/good/XsImport-1G/reservation.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/XsImport-2G/reservationDetails.wsdl" uri="documents/good/XsImport-2G/reservationDetails.wsdl"/>
+ <system systemId="http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/documents/good/XsImport-3G/reservationDetails.wsdl" uri="documents/good/XsImport-3G/reservationDetails.wsdl"/>
+ </catalog> 
+

Added: webservices/woden/branches/woden-20/woden-tests/src/test/resources/Woden-CatalogManager.properties
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-tests/src/test/resources/Woden-CatalogManager.properties?rev=1161982&view=auto
==============================================================================
--- webservices/woden/branches/woden-20/woden-tests/src/test/resources/Woden-CatalogManager.properties (added)
+++ webservices/woden/branches/woden-20/woden-tests/src/test/resources/Woden-CatalogManager.properties Fri Aug 26 03:48:03 2011
@@ -0,0 +1,25 @@
+#
+# 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.
+#
+
+# Catalogs are relative to this properties file
+relative-catalogs=false
+# Catalog list
+catalogs=W3Ctests.xml,simpleresolver.xml
+# Make the verbosity bigger to get more debug information
+verbosity=1
\ No newline at end of file

Added: webservices/woden/branches/woden-20/woden-tests/src/test/resources/simpleresolver.xml
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden-20/woden-tests/src/test/resources/simpleresolver.xml?rev=1161982&view=auto
==============================================================================
--- webservices/woden/branches/woden-20/woden-tests/src/test/resources/simpleresolver.xml (added)
+++ webservices/woden/branches/woden-20/woden-tests/src/test/resources/simpleresolver.xml Fri Aug 26 03:48:03 2011
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+  
+  <public publicId="http://www.w3.org/2001/XMLSchema" uri="org/apache/woden/resolver/XMLSchema.xsd"/>
+  <system systemId="http://www.w3.org/2001/XMLSchema.xsd" uri="org/apache/woden/resolver/XMLSchema.xsd"/>
+
+
+ <!--  (1) wsdl import / include -->
+ <public publicId="http://test.com/importinterface.wsdl" uri="org/apache/woden/resolver/resources/interface.wsdl"/>
+ <system systemId="http://test.com/importinterface.wsdl" uri="org/apache/woden/resolver/resources/interface.wsdl"/>
+ <public publicId="http://test.com/includebinding.wsdl" uri="org/apache/woden/resolver/resources/binding.wsdl"/>
+ <system systemId="http://test.com/includebinding.wsdl" uri="org/apache/woden/resolver/resources/binding.wsdl"/>
+
+<!-- (2)XML schema import/include: -->
+ <public publicId="http://test.com/getBalance.xsd" uri="org/apache/woden/resolver/resources/schemaInclude.xsd"/>
+ <system systemId="http://test.com/getBalance.xsd" uri="org/apache/woden/resolver/resources/schemaInclude.xsd"/>
+ <public publicId="http://test.com/getOverdraft.xsd" uri="org/apache/woden/resolver/resources/schemaImport.xsd"/>
+ <system systemId="http://test.com/getOverdraft.xsd" uri="org/apache/woden/resolver/resources/schemaImport.xsd"/>
+
+</catalog>
\ No newline at end of file



Mime
View raw message