Author: veithen
Date: Fri Oct 19 09:12:55 2012
New Revision: 1400008
URL: http://svn.apache.org/viewvc?rev=1400008&view=rev
Log:
Ensure that WSDLs that import the http://www.w3.org/XML/1998/namespace and
http://schemas.xmlsoap.org/soap/encoding/ namespaces and that specify a
schemaLocation for these namespaces can be processed successfully without
network connection.
Added:
axis/axis1/java/trunk/axis-rt-core/src/main/resources/org/apache/axis/wsdl/
axis/axis1/java/trunk/axis-rt-core/src/main/resources/org/apache/axis/wsdl/symbolTable/
axis/axis1/java/trunk/axis-rt-core/src/main/resources/org/apache/axis/wsdl/symbolTable/soap-encoding.xsd
axis/axis1/java/trunk/axis-rt-core/src/main/resources/org/apache/axis/wsdl/symbolTable/xml.xsd
- copied unchanged from r1399984,
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/xml.xsd
Removed:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/xml.xsd
Modified:
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/WSDLLocatorAdapter.java
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/catalog.xml
Modified:
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/WSDLLocatorAdapter.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/WSDLLocatorAdapter.java?rev=1400008&r1=1400007&r2=1400008&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/WSDLLocatorAdapter.java
(original)
+++
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/WSDLLocatorAdapter.java
Fri Oct 19 09:12:55 2012
@@ -21,6 +21,9 @@ package org.apache.axis.wsdl.symbolTable
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
import javax.wsdl.xml.WSDLLocator;
@@ -29,23 +32,52 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
class WSDLLocatorAdapter implements WSDLLocator {
+ /**
+ * Contains a set of schemas that are always resolved locally. {@link
SymbolTable} actually
+ * doesn't need to read these schemas, and it will not read them if they
are imported without
+ * specifying a <tt>schemaLocation</tt> (see {@link
SymbolTable#isKnownNamespace(String)}).
+ * However, WSDL4J insists on loading them whenever they are references by
a
+ * <tt>schemaLocation</tt>.
+ */
+ private final static Map/*<String,URL>*/ localSchemas;
+
private final String baseURI;
private final EntityResolver entityResolver;
private String latestImportURI;
+ static {
+ localSchemas = new HashMap();
+ localSchemas.put("http://www.w3.org/2001/xml.xsd";,
+ WSDLLocatorAdapter.class.getResource("xml.xsd"));
+ localSchemas.put("http://schemas.xmlsoap.org/soap/encoding/";,
+ WSDLLocatorAdapter.class.getResource("soap-encoding.xsd"));
+ }
+
WSDLLocatorAdapter(String baseURI, EntityResolver entityResolver) {
this.baseURI = baseURI;
this.entityResolver = entityResolver;
}
private InputSource getInputSource(String uri) {
- try {
- InputSource is = entityResolver.resolveEntity(null, uri);
- return is != null ? is : new InputSource(uri);
- } catch (SAXException ex) {
- return null;
- } catch (IOException ex) {
- return null;
+ URL localSchema = (URL)localSchemas.get(uri);
+ if (localSchema != null) {
+ InputSource is;
+ try {
+ is = new InputSource(localSchema.openStream());
+ } catch (IOException ex) {
+ return null;
+ }
+ is.setSystemId(uri);
+ return is;
+ } else {
+ try {
+ InputSource is = entityResolver.resolveEntity(null, uri);
+ return is != null ? is : new InputSource(uri);
+ } catch (SAXException ex) {
+ return null;
+ } catch (IOException ex) {
+ return null;
+ }
}
}
Added:
axis/axis1/java/trunk/axis-rt-core/src/main/resources/org/apache/axis/wsdl/symbolTable/soap-encoding.xsd
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/resources/org/apache/axis/wsdl/symbolTable/soap-encoding.xsd?rev=1400008&view=auto
==============================================================================
---
axis/axis1/java/trunk/axis-rt-core/src/main/resources/org/apache/axis/wsdl/symbolTable/soap-encoding.xsd
(added)
+++
axis/axis1/java/trunk/axis-rt-core/src/main/resources/org/apache/axis/wsdl/symbolTable/soap-encoding.xsd
Fri Oct 19 09:12:55 2012
@@ -0,0 +1,536 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!-- Schema for the SOAP/1.1 encoding
+
+Portions © 2001 DevelopMentor.
+© 2001 W3C (Massachusetts Institute of Technology, Institut National de
Recherche en Informatique et en Automatique, Keio University). All Rights
Reserved.
+
+This document is governed by the W3C Software License [1] as described in the
FAQ [2].
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+By obtaining, using and/or copying this work, you (the licensee) agree that
you have read, understood, and will comply with the following terms and
conditions:
+
+Permission to use, copy, modify, and distribute this software and its
documentation, with or without modification, for any purpose and without fee
or royalty is hereby granted, provided that you include the following on ALL
copies of the software and documentation or portions thereof, including
modifications, that you make:
+
+1. The full text of this NOTICE in a location viewable to users of the
redistributed or derivative work.
+
+2. Any pre-existing intellectual property disclaimers, notices, or terms and
conditions. If none exist, a short notice of the following form (hypertext is
preferred, text is permitted) should be used within the body of any
redistributed or derivative code: "Copyright © 2001 World Wide Web Consortium,
(Massachusetts Institute of Technology, Institut National de Recherche en
Informatique et en Automatique, Keio University). All Rights Reserved.
http://www.w3.org/Consortium/Legal/";
+
+3. Notice of any changes or modifications to the W3C files, including the
date changes were made. (We recommend you provide URIs to the location from
which the code is derived.)
+
+Original W3C files; http://www.w3.org/2001/06/soap-encoding
+Changes made:
+ - reverted namespace to http://schemas.xmlsoap.org/soap/encoding/
+ - reverted root to only allow 0 and 1 as lexical values
+ - removed default value from root attribute declaration
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE
OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
publicity pertaining to the software without specific, written prior
permission. Title to copyright in this software and any associated
documentation will at all times remain with copyright holders.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
+ xmlns:tns="http://schemas.xmlsoap.org/soap/encoding/";
+ targetNamespace="http://schemas.xmlsoap.org/soap/encoding/"; >
+
+ <xs:attribute name="root" >
+ <xs:annotation>
+ <xs:documentation>
+ 'root' can be used to distinguish serialization roots from other
+ elements that are present in a serialization but are not roots of
+ a serialized value graph
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base='xs:boolean'>
+ <xs:pattern value='0|1' />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attributeGroup name="commonAttributes" >
+ <xs:annotation>
+ <xs:documentation>
+ Attributes common to all elements that function as accessors or
+ represent independent (multi-ref) values. The href attribute is
+ intended to be used in a manner like CONREF. That is, the element
+ content should be empty iff the href attribute appears
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="id" type="xs:ID" />
+ <xs:attribute name="href" type="xs:anyURI" />
+ <xs:anyAttribute namespace="##other" processContents="lax" />
+ </xs:attributeGroup>
+
+ <!-- Global Attributes. The following attributes are intended to be usable
via qualified attribute names on any complex type referencing them. -->
+
+ <!-- Array attributes. Needed to give the type and dimensions of an array's
contents, and the offset for partially-transmitted arrays. -->
+
+ <xs:simpleType name="arrayCoordinate" >
+ <xs:restriction base="xs:string" />
+ </xs:simpleType>
+
+ <xs:attribute name="arrayType" type="xs:string" />
+ <xs:attribute name="offset" type="tns:arrayCoordinate" />
+
+ <xs:attributeGroup name="arrayAttributes" >
+ <xs:attribute ref="tns:arrayType" />
+ <xs:attribute ref="tns:offset" />
+ </xs:attributeGroup>
+
+ <xs:attribute name="position" type="tns:arrayCoordinate" />
+
+ <xs:attributeGroup name="arrayMemberAttributes" >
+ <xs:attribute ref="tns:position" />
+ </xs:attributeGroup>
+
+ <xs:group name="Array" >
+ <xs:sequence>
+ <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded"
processContents="lax" />
+ </xs:sequence>
+ </xs:group>
+
+ <xs:element name="Array" type="tns:Array" />
+ <xs:complexType name="Array" >
+ <xs:annotation>
+ <xs:documentation>
+ 'Array' is a complex type for accessors identified by position
+ </xs:documentation>
+ </xs:annotation>
+ <xs:group ref="tns:Array" minOccurs="0" />
+ <xs:attributeGroup ref="tns:arrayAttributes" />
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:complexType>
+
+ <!-- 'Struct' is a complex type for accessors identified by name.
+ Constraint: No element may be have the same name as any other,
+ nor may any element have a maxOccurs > 1. -->
+
+ <xs:element name="Struct" type="tns:Struct" />
+
+ <xs:group name="Struct" >
+ <xs:sequence>
+ <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded"
processContents="lax" />
+ </xs:sequence>
+ </xs:group>
+
+ <xs:complexType name="Struct" >
+ <xs:group ref="tns:Struct" minOccurs="0" />
+ <xs:attributeGroup ref="tns:commonAttributes"/>
+ </xs:complexType>
+
+ <!-- 'Base64' can be used to serialize binary data using base64 encoding
+ as defined in RFC2045 but without the MIME line length limitation. -->
+
+ <xs:simpleType name="base64" >
+ <xs:restriction base="xs:base64Binary" />
+ </xs:simpleType>
+
+ <!-- Element declarations corresponding to each of the simple types in the
+ XML Schemas Specification. -->
+
+ <xs:element name="duration" type="tns:duration" />
+ <xs:complexType name="duration" >
+ <xs:simpleContent>
+ <xs:extension base="xs:duration" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="dateTime" type="tns:dateTime" />
+ <xs:complexType name="dateTime" >
+ <xs:simpleContent>
+ <xs:extension base="xs:dateTime" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+
+
+ <xs:element name="NOTATION" type="tns:NOTATION" />
+ <xs:complexType name="NOTATION" >
+ <xs:simpleContent>
+ <xs:extension base="xs:QName" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+
+ <xs:element name="time" type="tns:time" />
+ <xs:complexType name="time" >
+ <xs:simpleContent>
+ <xs:extension base="xs:time" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="date" type="tns:date" />
+ <xs:complexType name="date" >
+ <xs:simpleContent>
+ <xs:extension base="xs:date" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="gYearMonth" type="tns:gYearMonth" />
+ <xs:complexType name="gYearMonth" >
+ <xs:simpleContent>
+ <xs:extension base="xs:gYearMonth" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="gYear" type="tns:gYear" />
+ <xs:complexType name="gYear" >
+ <xs:simpleContent>
+ <xs:extension base="xs:gYear" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="gMonthDay" type="tns:gMonthDay" />
+ <xs:complexType name="gMonthDay" >
+ <xs:simpleContent>
+ <xs:extension base="xs:gMonthDay" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="gDay" type="tns:gDay" />
+ <xs:complexType name="gDay" >
+ <xs:simpleContent>
+ <xs:extension base="xs:gDay" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="gMonth" type="tns:gMonth" />
+ <xs:complexType name="gMonth" >
+ <xs:simpleContent>
+ <xs:extension base="xs:gMonth" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="boolean" type="tns:boolean" />
+ <xs:complexType name="boolean" >
+ <xs:simpleContent>
+ <xs:extension base="xs:boolean" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="base64Binary" type="tns:base64Binary" />
+ <xs:complexType name="base64Binary" >
+ <xs:simpleContent>
+ <xs:extension base="xs:base64Binary" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="hexBinary" type="tns:hexBinary" />
+ <xs:complexType name="hexBinary" >
+ <xs:simpleContent>
+ <xs:extension base="xs:hexBinary" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="float" type="tns:float" />
+ <xs:complexType name="float" >
+ <xs:simpleContent>
+ <xs:extension base="xs:float" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="double" type="tns:double" />
+ <xs:complexType name="double" >
+ <xs:simpleContent>
+ <xs:extension base="xs:double" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="anyURI" type="tns:anyURI" />
+ <xs:complexType name="anyURI" >
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="QName" type="tns:QName" />
+ <xs:complexType name="QName" >
+ <xs:simpleContent>
+ <xs:extension base="xs:QName" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+
+ <xs:element name="string" type="tns:string" />
+ <xs:complexType name="string" >
+ <xs:simpleContent>
+ <xs:extension base="xs:string" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="normalizedString" type="tns:normalizedString" />
+ <xs:complexType name="normalizedString" >
+ <xs:simpleContent>
+ <xs:extension base="xs:normalizedString" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="token" type="tns:token" />
+ <xs:complexType name="token" >
+ <xs:simpleContent>
+ <xs:extension base="xs:token" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="language" type="tns:language" />
+ <xs:complexType name="language" >
+ <xs:simpleContent>
+ <xs:extension base="xs:language" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="Name" type="tns:Name" />
+ <xs:complexType name="Name" >
+ <xs:simpleContent>
+ <xs:extension base="xs:Name" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="NMTOKEN" type="tns:NMTOKEN" />
+ <xs:complexType name="NMTOKEN" >
+ <xs:simpleContent>
+ <xs:extension base="xs:NMTOKEN" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="NCName" type="tns:NCName" />
+ <xs:complexType name="NCName" >
+ <xs:simpleContent>
+ <xs:extension base="xs:NCName" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="NMTOKENS" type="tns:NMTOKENS" />
+ <xs:complexType name="NMTOKENS" >
+ <xs:simpleContent>
+ <xs:extension base="xs:NMTOKENS" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="ID" type="tns:ID" />
+ <xs:complexType name="ID" >
+ <xs:simpleContent>
+ <xs:extension base="xs:ID" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="IDREF" type="tns:IDREF" />
+ <xs:complexType name="IDREF" >
+ <xs:simpleContent>
+ <xs:extension base="xs:IDREF" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="ENTITY" type="tns:ENTITY" />
+ <xs:complexType name="ENTITY" >
+ <xs:simpleContent>
+ <xs:extension base="xs:ENTITY" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="IDREFS" type="tns:IDREFS" />
+ <xs:complexType name="IDREFS" >
+ <xs:simpleContent>
+ <xs:extension base="xs:IDREFS" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="ENTITIES" type="tns:ENTITIES" />
+ <xs:complexType name="ENTITIES" >
+ <xs:simpleContent>
+ <xs:extension base="xs:ENTITIES" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="decimal" type="tns:decimal" />
+ <xs:complexType name="decimal" >
+ <xs:simpleContent>
+ <xs:extension base="xs:decimal" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="integer" type="tns:integer" />
+ <xs:complexType name="integer" >
+ <xs:simpleContent>
+ <xs:extension base="xs:integer" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="nonPositiveInteger" type="tns:nonPositiveInteger" />
+ <xs:complexType name="nonPositiveInteger" >
+ <xs:simpleContent>
+ <xs:extension base="xs:nonPositiveInteger" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="negativeInteger" type="tns:negativeInteger" />
+ <xs:complexType name="negativeInteger" >
+ <xs:simpleContent>
+ <xs:extension base="xs:negativeInteger" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="long" type="tns:long" />
+ <xs:complexType name="long" >
+ <xs:simpleContent>
+ <xs:extension base="xs:long" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="int" type="tns:int" />
+ <xs:complexType name="int" >
+ <xs:simpleContent>
+ <xs:extension base="xs:int" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="short" type="tns:short" />
+ <xs:complexType name="short" >
+ <xs:simpleContent>
+ <xs:extension base="xs:short" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="byte" type="tns:byte" />
+ <xs:complexType name="byte" >
+ <xs:simpleContent>
+ <xs:extension base="xs:byte" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="nonNegativeInteger" type="tns:nonNegativeInteger" />
+ <xs:complexType name="nonNegativeInteger" >
+ <xs:simpleContent>
+ <xs:extension base="xs:nonNegativeInteger" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="unsignedLong" type="tns:unsignedLong" />
+ <xs:complexType name="unsignedLong" >
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedLong" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="unsignedInt" type="tns:unsignedInt" />
+ <xs:complexType name="unsignedInt" >
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedInt" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="unsignedShort" type="tns:unsignedShort" />
+ <xs:complexType name="unsignedShort" >
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedShort" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="unsignedByte" type="tns:unsignedByte" />
+ <xs:complexType name="unsignedByte" >
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedByte" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="positiveInteger" type="tns:positiveInteger" />
+ <xs:complexType name="positiveInteger" >
+ <xs:simpleContent>
+ <xs:extension base="xs:positiveInteger" >
+ <xs:attributeGroup ref="tns:commonAttributes" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="anyType" />
+</xs:schema>
+
Modified:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/catalog.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/catalog.xml?rev=1400008&r1=1400007&r2=1400008&view=diff
==============================================================================
---
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/catalog.xml
(original)
+++
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/catalog.xml
Fri Oct 19 09:12:55 2012
@@ -4,5 +4,4 @@
<system
systemId="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl";
uri="wsrf-WS-ResourceProperties-1.2-draft-01.wsdl"/>
<system
systemId="http://docs.oasis-open.org/wsrf/2004/06/wsrf-WS-ResourceProperties-1.2-draft-01.xsd";
uri="wsrf-WS-ResourceProperties-1.2-draft-01.xsd"/>
<system systemId="http://schemas.xmlsoap.org/ws/2003/03/addressing";
uri="addressing.xsd"/>
- <system systemId="http://www.w3.org/2001/xml.xsd"; uri="xml.xsd"/>
</catalog>
