You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by jk...@apache.org on 2007/03/22 20:26:28 UTC
svn commit: r521411 [1/2] - in /incubator/woden/trunk/java: ./ resources/
src/org/apache/woden/internal/ src/org/apache/woden/internal/resolver/
src/org/apache/woden/internal/wsdl20/
src/org/apache/woden/internal/wsdl20/extensions/ src/org/apache/woden...
Author: jkaputin
Date: Thu Mar 22 12:26:24 2007
New Revision: 521411
URL: http://svn.apache.org/viewvc?view=rev&rev=521411
Log:
WODEN-153 changed Woden code and test cases to use
the new, shorter WSDL2 namespaces as per the latest
editors copies of the WSDL 2.0 spec (e.g. /2006/01/wsdl becomes
/ns/wsdl). Also, excluded the W3C WSDL 2.0 test
cases in pom.xml pending similar updates to the
W3C WSDL 2.0 test suite.
Modified:
incubator/woden/trunk/java/pom.xml
incubator/woden/trunk/java/resources/schema.catalog
incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java
incubator/woden/trunk/java/src/org/apache/woden/internal/resolver/SimpleURIResolver.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/Constants.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/ExtensionConstants.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/rpc/RPCConstants.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java
incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-extensions.xsd
incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-http.xsd
incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-instance.xsd
incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-rpc.xsd
incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-soap.xsd
incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20.xsd
incubator/woden/trunk/java/src/org/apache/woden/tool/converter/Convert.java
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/Binding.java
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/ComponentExtensions.java
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/ExtensionElement.java
incubator/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/UnknownExtensionDeserializer.java
incubator/woden/trunk/java/test/org/apache/woden/badDescriptionTags.wsdl
incubator/woden/trunk/java/test/org/apache/woden/primer-hotelReservationService.wsdl
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/binding.wsdl
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/interface.wsdl
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/woden14.wsdl
incubator/woden/trunk/java/test/org/apache/woden/tests/AllWodenTestsDOM.java
incubator/woden/trunk/java/test/org/apache/woden/tests/AllWodenTestsOM.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingExtensionsTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingExtensions.wsdl
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingFaultExtensions.wsdl
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingMessageReferenceExtensions.wsdl
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPBindingOperationExtensions.wsdl
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPEndpointExtensions.wsdl
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/resources/SOAPBindingExtensions.wsdl
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/resources/SOAPBindingFaultExtensions.wsdl
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/resources/SOAPBindingFaultReferenceExtensions.wsdl
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/resources/SOAPBindingMessageReferenceExtensions.wsdl
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/resources/SOAPBindingOperationExtensions.wsdl
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/resources/EndpointElementTest.wsdl
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/xml/resources/ServiceElementTest.wsdl
Modified: incubator/woden/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/pom.xml?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/pom.xml (original)
+++ incubator/woden/trunk/java/pom.xml Thu Mar 22 12:26:24 2007
@@ -96,6 +96,8 @@
<excludes>
<!-- WODEN-137: 1 test in QNameTest failing on Sun JRE 1.5.0_07 to 1.5.0_11 so exclude the test class-->
<exclude>**/QNameTest.class</exclude>
+ <!-- WODEN-153: W3C WSDL 2.0 test cases will fail until they are updated to the new WSDL2 namespaces, so exclude this test class-->
+ <exclude>**/W3CTestSuiteTest.class</exclude>
</excludes>
</configuration>
</plugin>
Modified: incubator/woden/trunk/java/resources/schema.catalog
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/resources/schema.catalog?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/resources/schema.catalog (original)
+++ incubator/woden/trunk/java/resources/schema.catalog Thu Mar 22 12:26:24 2007
@@ -22,9 +22,9 @@
http\://www.w3.org/2001/xml.xsd=org/apache/woden/resolver/xml.xsd
#
# standard schema resolutions for wsdl20:
-http\://www.w3.org/2006/01/wsdl/wsdl20.xsd=org/apache/woden/resolver/wsdl20.xsd
-http\://www.w3.org/2006/01/wsdl-extensions.xsd=org/apache/woden/resolver/wsdl20-extensions.xsd
-http\://www.w3.org/2006/01/wsdl/http.xsd=org/apache/woden/resolver/wsdl20-http.xsd
-http\://www.w3.org/2006/03/wsdl-instance.xsd=org/apache/woden/resolver/wsdl20-instance.xsd
-http\://www.w3.org/2006/01/wsdl/rpc.xsd=org/apache/woden/resolver/wsdl20-rpc.xsd
-http\://www.w3.org/2006/01/wsdl/soap.xsd=org/apache/woden/resolver/wsdl20-soap.xsd
+http\://www.w3.org/2007/03/wsdl/wsdl20.xsd=org/apache/woden/resolver/wsdl20.xsd
+http\://www.w3.org/2007/03/wsdl/wsdl20-extensions.xsd=org/apache/woden/resolver/wsdl20-extensions.xsd
+http\://www.w3.org/2007/03/wsdl/http.xsd=org/apache/woden/resolver/wsdl20-http.xsd
+http\://www.w3.org/2007/03/wsdl/wsdl20-instance.xsd=org/apache/woden/resolver/wsdl20-instance.xsd
+http\://www.w3.org/2007/03/wsdl/rpc.xsd=org/apache/woden/resolver/wsdl20-rpc.xsd
+http\://www.w3.org/2007/03/wsdl/soap.xsd=org/apache/woden/resolver/wsdl20-soap.xsd
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/DOMWSDLReader.java Thu Mar 22 12:26:24 2007
@@ -693,8 +693,7 @@
// TODO: This external schema location should be removed once an URI resolution framework
// with a catalog is added to Woden.
- //parser.setProperty(org.apache.xerces.impl.Constants.XERCES_PROPERTY_PREFIX + org.apache.xerces.impl.Constants.SCHEMA_LOCATION, "http://www.w3.org/2006/01/wsdl http://www.w3.org/2006/01/wsdl/wsdl20.xsd http://www.w3.org/2006/01/wsdl-extensions http://www.w3.org/2006/01/wsdl-extensions.xsd http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd");
- parser.setProperty(org.apache.xerces.impl.Constants.XERCES_PROPERTY_PREFIX + org.apache.xerces.impl.Constants.SCHEMA_LOCATION, "http://www.w3.org/2006/01/wsdl " + resolveURI("http://www.w3.org/2006/01/wsdl/wsdl20.xsd") + " http://www.w3.org/2006/01/wsdl-extensions " + resolveURI("http://www.w3.org/2006/01/wsdl-extensions.xsd") + " http://www.w3.org/2001/XMLSchema " + resolveURI("http://www.w3.org/2001/XMLSchema.xsd"));
+ parser.setProperty(org.apache.xerces.impl.Constants.XERCES_PROPERTY_PREFIX + org.apache.xerces.impl.Constants.SCHEMA_LOCATION, "http://www.w3.org/ns/wsdl " + resolveURI("http://www.w3.org/2007/03/wsdl/wsdl20.xsd") + " http://www.w3.org/ns/wsdl-extensions " + resolveURI("http://www.w3.org/2007/03/wsdl/wsdl20-extensions.xsd") + " http://www.w3.org/2001/XMLSchema " + resolveURI("http://www.w3.org/2001/XMLSchema.xsd"));
}
catch(SAXNotRecognizedException e)
{
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/resolver/SimpleURIResolver.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/resolver/SimpleURIResolver.java?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/resolver/SimpleURIResolver.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/resolver/SimpleURIResolver.java Thu Mar 22 12:26:24 2007
@@ -60,7 +60,7 @@
* #
* http\://www.apache.org/schema/remoteSchema.xsd=file:///c:/schema/localSchema.xsd
* http\://www.apache.org/schema/myDoc=file:///c:/schema/XMLSchema.xsd
- * http\://www.w3.org/2006/01/wsdl-extensions.xsd=file:///c:/schema/wsdl-extensions.xsd
+ * http\://www.w3.org/ns/wsdl-extensions.xsd=file:///c:/schema/wsdl-extensions.xsd
* # end
*
* Note the use of backslash on the first colon of each line. This is necessary as catalog files are
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/Constants.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/Constants.java?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/Constants.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/Constants.java Thu Mar 22 12:26:24 2007
@@ -31,7 +31,7 @@
{
// Namespace URIs.
public static final String NS_URI_WSDL20 =
- "http://www.w3.org/2006/01/wsdl";
+ "http://www.w3.org/ns/wsdl";
public static final String NS_URI_XMLNS =
"http://www.w3.org/2000/xmlns/";
public static final String NS_URI_XSI =
@@ -122,11 +122,11 @@
//Message Exchange Patterns
public static final URI MEP_URI_IN_ONLY =
- URI.create("http://www.w3.org/2006/01/wsdl/in-only");
+ URI.create("http://www.w3.org/ns/wsdl/in-only");
public static final URI MEP_URI_ROBUST_IN_ONLY =
- URI.create("http://www.w3.org/2006/01/wsdl/robust-in-only");
+ URI.create("http://www.w3.org/ns/wsdl/robust-in-only");
public static final URI MEP_URI_IN_OUT =
- URI.create("http://www.w3.org/2006/01/wsdl/in-out");
+ URI.create("http://www.w3.org/ns/wsdl/in-out");
/* Constants representing the values of the properties used to
* configure the Woden runtime (i.e. different to WSDL 2.0 properties).
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/ExtensionConstants.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/ExtensionConstants.java?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/ExtensionConstants.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/ExtensionConstants.java Thu Mar 22 12:26:24 2007
@@ -27,7 +27,7 @@
// Namespace URI
- public static final String NS_URI_WSDL_EXTENSIONS = "http://www.w3.org/2006/01/wsdl-extensions";
+ public static final String NS_URI_WSDL_EXTENSIONS = "http://www.w3.org/ns/wsdl-extensions";
// Attribute name
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java Thu Mar 22 12:26:24 2007
@@ -27,7 +27,7 @@
{
// Namespace URIs.
public static final String NS_STRING_HTTP =
- "http://www.w3.org/2006/01/wsdl/http";
+ "http://www.w3.org/ns/wsdl/http";
public static final URI NS_URI_HTTP = URI.create(NS_STRING_HTTP);
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/rpc/RPCConstants.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/rpc/RPCConstants.java?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/rpc/RPCConstants.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/rpc/RPCConstants.java Thu Mar 22 12:26:24 2007
@@ -30,12 +30,12 @@
// Namespace URI
- public static final String NS_URI_RPC = "http://www.w3.org/2006/01/wsdl/rpc";
+ public static final String NS_URI_RPC = "http://www.w3.org/ns/wsdl/rpc";
// Style URI
- public static final String STYLE_URI_RPC = "http://www.w3.org/2006/01/wsdl/style/rpc";
- public static final URI URI_STYLE_RPC = URI.create("http://www.w3.org/2006/01/wsdl/style/rpc");
+ public static final String STYLE_URI_RPC = "http://www.w3.org/ns/wsdl/style/rpc";
+ public static final URI URI_STYLE_RPC = URI.create("http://www.w3.org/ns/wsdl/style/rpc");
// Attribute name
Modified: incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPConstants.java Thu Mar 22 12:26:24 2007
@@ -25,7 +25,7 @@
{
// Namespace URIs.
public static final String NS_URI_SOAP =
- "http://www.w3.org/2006/01/wsdl/soap";
+ "http://www.w3.org/ns/wsdl/soap";
// Protocol URIs.
public static final String URI_SOAP12_HTTP =
Modified: incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-extensions.xsd
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-extensions.xsd?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-extensions.xsd (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-extensions.xsd Thu Mar 22 12:26:24 2007
@@ -1,53 +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: wsdl-extensions.xsd,v 1.1 2006/03/28 07:42:26 hugo Exp $
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdlx="http://www.w3.org/2006/01/wsdl-extensions" targetNamespace="http://www.w3.org/2006/01/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>
+<?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>
Modified: incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-http.xsd
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-http.xsd?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-http.xsd (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-http.xsd Thu Mar 22 12:26:24 2007
@@ -1,97 +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 2006/03/23 13:15:57 hugo Exp $
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://www.w3.org/2006/01/wsdl" xmlns:whttp="http://www.w3.org/2006/01/wsdl/http" targetNamespace="http://www.w3.org/2006/01/wsdl/http" attributeFormDefault="qualified" finalDefault="" blockDefault="" elementFormDefault="unqualified">
-
- <xs:import namespace="http://www.w3.org/2006/01/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="authenticationType">
- <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="httpTopkenType">
- <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>
+<?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>
Modified: incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-instance.xsd
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-instance.xsd?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-instance.xsd (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-instance.xsd Thu Mar 22 12:26:24 2007
@@ -1,35 +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: wsdl-instance.xsd,v 1.1 2006/03/28 07:42:26 hugo Exp $
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" targetNamespace="http://www.w3.org/2006/01/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>
+<?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>
Modified: incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-rpc.xsd
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-rpc.xsd?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-rpc.xsd (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-rpc.xsd Thu Mar 22 12:26:24 2007
@@ -1,49 +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 2006/03/23 13:15:57 hugo Exp $
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wrpc="http://www.w3.org/2006/01/wsdl/rpc" targetNamespace="http://www.w3.org/2006/01/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>
+<?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>
Modified: incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-soap.xsd
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-soap.xsd?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-soap.xsd (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20-soap.xsd Thu Mar 22 12:26:24 2007
@@ -1,80 +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 2006/03/23 13:15:57 hugo Exp $
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsoap="http://www.w3.org/2006/01/wsdl/soap" xmlns:wsdl="http://www.w3.org/2006/01/wsdl" targetNamespace="http://www.w3.org/2006/01/wsdl/soap" elementFormDefault="qualified" attributeFormDefault="unqualified" finalDefault="" blockDefault="">
-
- <xs:import namespace="http://www.w3.org/2006/01/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:sequence>
- <xs:element ref="wsdl:property" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="uri" 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>
+<?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>
Modified: incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20.xsd
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20.xsd?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20.xsd (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/resolver/wsdl20.xsd Thu Mar 22 12:26:24 2007
@@ -1,415 +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 2006/03/23 13:15:57 hugo Exp $
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://www.w3.org/2006/01/wsdl" targetNamespace="http://www.w3.org/2006/01/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:element ref="wsdl:feature"/>
- <xs:element ref="wsdl:property"/>
- <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:element ref="wsdl:feature"/>
- <xs:element ref="wsdl:property"/>
- <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="required"/>
- <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:element ref="wsdl:feature"/>
- <xs:element ref="wsdl:property"/>
- <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:element ref="wsdl:feature"/>
- <xs:element ref="wsdl:property"/>
- <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:element ref="wsdl:feature"/>
- <xs:element ref="wsdl:property"/>
- <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>
-
- <xs:element name="feature" type="wsdl:FeatureType"/>
- <xs:complexType name="FeatureType" 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:anyURI" use="required"/>
- <xs:attribute name="required" type="xs:boolean" use="optional"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:element name="property" type="wsdl:PropertyType"/>
- <xs:complexType name="PropertyType" mixed="false">
- <xs:complexContent>
- <xs:extension base="wsdl:ExtensibleDocumentedType">
- <xs:sequence>
- <xs:choice minOccurs="0">
- <xs:element name="value" type="xs:anyType"/>
- <xs:element name="constraint" type="xs:QName"/>
- </xs:choice>
- <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="ref" type="xs:anyURI" use="required"/>
- </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:element ref="wsdl:feature"/>
- <xs:element ref="wsdl:property"/>
- <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:element ref="wsdl:feature"/>
- <xs:element ref="wsdl:property"/>
- <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:element ref="wsdl:feature"/>
- <xs:element ref="wsdl:property"/>
- <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:element ref="wsdl:feature"/>
- <xs:element ref="wsdl:property"/>
- <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:element ref="wsdl:feature"/>
- <xs:element ref="wsdl:property"/>
- <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:element ref="wsdl:feature"/>
- <xs:element ref="wsdl:property"/>
- <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:element ref="wsdl:feature"/>
- <xs:element ref="wsdl:property"/>
- <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="ExtensibilityElement" abstract="true" mixed="false">
- <xs:annotation>
- <xs:documentation>
- This abstract type is intended to serve as the base type for
- extensibility 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>
+<?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>
Modified: incubator/woden/trunk/java/src/org/apache/woden/tool/converter/Convert.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/tool/converter/Convert.java?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/tool/converter/Convert.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/tool/converter/Convert.java Thu Mar 22 12:26:24 2007
@@ -71,13 +71,13 @@
public class Convert
{
private static String NS_URI_WSDL_2_0_BASE =
- "http://www.w3.org/2006/01";
+ "http://www.w3.org/ns";
private static String NS_URI_WSDL_2_0 =
NS_URI_WSDL_2_0_BASE + "/wsdl";
private static String NS_URI_WSDL_2_0_SOAP =
NS_URI_WSDL_2_0 + "/soap";
private static String NS_URI_WSDL_2_0_SOAP_1_1_HTTP =
- NS_URI_WSDL_2_0_BASE + "/soap11/bindings/HTTP";
+ "http://www.w3.org/2006/01/soap11/bindings/HTTP";
private static String NS_URI_WSDL_2_0_SOAP_1_2_HTTP =
"http://www.w3.org/2003/05/soap/bindings/HTTP";
private static String NS_URI_WSDL_1_1 =
Modified: incubator/woden/trunk/java/src/org/apache/woden/wsdl20/Binding.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/wsdl20/Binding.java?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/wsdl20/Binding.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/wsdl20/Binding.java Thu Mar 22 12:26:24 2007
@@ -50,9 +50,9 @@
* <p>
* For example:
* <br/>
- * For a SOAP binding this will be the uri "http://www.w3.org/2006/01/wsdl/soap".
+ * For a SOAP binding this will be the uri "http://www.w3.org/ns/wsdl/soap".
* <br/>
- * For an HTTP binding this will be the uri "http://www.w3.org/2006/01/wsdl/http".
+ * For an HTTP binding this will be the uri "http://www.w3.org/ns/wsdl/http".
*
* @return URI representing the binding type
*/
Modified: incubator/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/ComponentExtensions.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/ComponentExtensions.java?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/ComponentExtensions.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/ComponentExtensions.java Thu Mar 22 12:26:24 2007
@@ -44,10 +44,10 @@
/**
* Namespace URIs for extensions defined by WSDL 2.0 Specification.
*/
- public static final URI URI_NS_SOAP = URI.create("http://www.w3.org/2006/01/wsdl/soap");
- public static final URI URI_NS_HTTP = URI.create("http://www.w3.org/2006/01/wsdl/http");
- public static final URI URI_NS_RPC = URI.create("http://www.w3.org/2006/01/wsdl/rpc");
- public static final URI URI_NS_EXTENSIONS = URI.create("http://www.w3.org/2006/01/wsdl-extensions");
+ public static final URI URI_NS_SOAP = URI.create("http://www.w3.org/ns/wsdl/soap");
+ public static final URI URI_NS_HTTP = URI.create("http://www.w3.org/ns/wsdl/http");
+ public static final URI URI_NS_RPC = URI.create("http://www.w3.org/ns/wsdl/rpc");
+ public static final URI URI_NS_EXTENSIONS = URI.create("http://www.w3.org/ns/wsdl-extensions");
/**
* @return the non-WSDL URI shared by this group of extension properties
Modified: incubator/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/ExtensionElement.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/ExtensionElement.java?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/ExtensionElement.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/ExtensionElement.java Thu Mar 22 12:26:24 2007
@@ -21,7 +21,7 @@
/**
* This interface represents WSDL 2.0 extension elements. That is, any XML element
* information items that appear as [children] of a WSDL 2.0 element and are not in
- * the WSDL 2.0 namespace (http://www.w3.org/2006/01/wsdl).
+ * the WSDL 2.0 namespace (http://www.w3.org/ns/wsdl).
* <p>
* Based on a similar interface from WSDL4J element extensibility.
*
Modified: incubator/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/UnknownExtensionDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/UnknownExtensionDeserializer.java?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/UnknownExtensionDeserializer.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/wsdl20/extensions/UnknownExtensionDeserializer.java Thu Mar 22 12:26:24 2007
@@ -53,7 +53,7 @@
// Constants.NS_URI_WSDL20,
// Constants.ATTR_REQUIRED);
String requiredStr = getAttributeNS(extEl,
- "http://www.w3.org/2006/01/wsdl",
+ "http://www.w3.org/ns/wsdl",
"required");
unknownExt.setExtensionType(extType);
Modified: incubator/woden/trunk/java/test/org/apache/woden/badDescriptionTags.wsdl
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/badDescriptionTags.wsdl?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/badDescriptionTags.wsdl (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/badDescriptionTags.wsdl Thu Mar 22 12:26:24 2007
@@ -17,7 +17,7 @@
! limitations under the License.
!-->
<xdescription
- xmlns="http://www.w3.org/2006/01/wsdl"
+ xmlns="http://www.w3.org/ns/wsdl"
targetNamespace= "http://greath.example.com/2004/wsdl/resSvc"
xmlns:tns= "http://greath.example.com/2004/wsdl/resSvc"
xmlns:ghns = "http://greath.example.com/2004/schemas/resSvc"
Modified: incubator/woden/trunk/java/test/org/apache/woden/primer-hotelReservationService.wsdl
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/primer-hotelReservationService.wsdl?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/primer-hotelReservationService.wsdl (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/primer-hotelReservationService.wsdl Thu Mar 22 12:26:24 2007
@@ -17,7 +17,7 @@
! limitations under the License.
!-->
<description
- xmlns="http://www.w3.org/2006/01/wsdl"
+ xmlns="http://www.w3.org/ns/wsdl"
targetNamespace= "http://greath.example.com/2004/wsdl/resSvc"
xmlns:tns= "http://greath.example.com/2004/wsdl/resSvc"
xmlns:ghns = "http://greath.example.com/2004/schemas/resSvc"
Modified: incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/binding.wsdl
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/binding.wsdl?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/binding.wsdl (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/binding.wsdl Thu Mar 22 12:26:24 2007
@@ -20,11 +20,11 @@
(Shares targetnamespace with master) -->
<description targetNamespace="http://example.com/bank"
- xmlns="http://www.w3.org/2006/01/wsdl"
+ xmlns="http://www.w3.org/ns/wsdl"
xmlns:tns="http://example.com/bank"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://www.w3.org/2006/01/wsdl http://www.w3.org/2006/01/wsdl/wsdl20.xsd
+ "http://www.w3.org/ns/wsdl http://www.w3.org/ns/wsdl/wsdl20.xsd
http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd">
<binding name="BankSOAPBinding" type="http://www.w3.org/2005/12/wsdl/soap">
Modified: incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/interface.wsdl
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/interface.wsdl?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/interface.wsdl (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/interface.wsdl Thu Mar 22 12:26:24 2007
@@ -19,10 +19,10 @@
<!-- this document is imported by main wsdl document -->
<description targetNamespace="http://example.com/bank"
- xmlns="http://www.w3.org/2006/01/wsdl"
+ xmlns="http://www.w3.org/ns/wsdl"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://www.w3.org/2006/01/wsdl http://www.w3.org/2006/01/wsdl/wsdl20.xsd
+ "http://www.w3.org/ns/wsdl http://www.w3.org/ns/wsdl/wsdl20.xsd
http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd">
<!-- any old interface -->
Modified: incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/woden14.wsdl
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/woden14.wsdl?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/woden14.wsdl (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/woden14.wsdl Thu Mar 22 12:26:24 2007
@@ -24,11 +24,11 @@
wsdl:types xs:include schemaLocation -->
<description targetNamespace="http://example.com/bank"
- xmlns="http://www.w3.org/2006/01/wsdl"
+ xmlns="http://www.w3.org/ns/wsdl"
xmlns:tns="http://example.com/bank"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://www.w3.org/2006/01/wsdl http://www.w3.org/2006/01/wsdl/wsdl20.xsd
+ "http://www.w3.org/ns/wsdl http://www.w3.org/ns/wsdl/wsdl20.xsd
http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd" >
<types>
Modified: incubator/woden/trunk/java/test/org/apache/woden/tests/AllWodenTestsDOM.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/tests/AllWodenTestsDOM.java?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/tests/AllWodenTestsDOM.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/tests/AllWodenTestsDOM.java Thu Mar 22 12:26:24 2007
@@ -99,7 +99,7 @@
addTest(WSDLFactoryTest.suite());
addTest(WSDLReaderTest.suite());
addTest(DOMXMLElementTest.suite());
- addTest(W3CTestSuiteTest.suite());
+ //addTest(W3CTestSuiteTest.suite()); commented out pending update of W3C WSDL 2.0 test suite to new WSDL2 namespaces WODEN-153
addTestSuite(ReaderFeaturesTest.class);
addTest(WSDLDocumentValidatorTest.suite());
addTest(WSDLComponentValidatorTest.suite());
Modified: incubator/woden/trunk/java/test/org/apache/woden/tests/AllWodenTestsOM.java
URL: http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/tests/AllWodenTestsOM.java?view=diff&rev=521411&r1=521410&r2=521411
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/tests/AllWodenTestsOM.java (original)
+++ incubator/woden/trunk/java/test/org/apache/woden/tests/AllWodenTestsOM.java Thu Mar 22 12:26:24 2007
@@ -49,7 +49,7 @@
addTest(OMWSDLFactoryTest.suite());
addTest(OMWSDLReaderTest.suite());
- addTest(OMW3CTestSuiteTest.suite());
+ //addTest(OMW3CTestSuiteTest.suite()); commented out pending update of W3C WSDL 2.0 test suite to new WSDL2 namespaces WODEN-153
addTest(OMServiceElementTest.suite());
addTest(OMEndpointElementTest.suite());
addTest(OMSimpleURIResolverTest.suite());
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org