You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by tl...@apache.org on 2006/11/06 03:38:35 UTC
svn commit: r471618 - in /incubator/cxf/trunk:
common/common/src/main/java/org/apache/cxf/resource/
rt/core/src/test/java/org/apache/cxf/wsdl11/
rt/core/src/test/resources/org/apache/cxf/wsdl11/
tools/wsdl2java/src/test/resources/wsdl2java_wsdl/
Author: tli
Date: Sun Nov 5 18:38:33 2006
New Revision: 471618
URL: http://svn.apache.org/viewvc?view=rev&rev=471618
Log:
CXF-178 enhance URIResolver to support multi-level relative path parser
Added:
incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl (with props)
incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema1.xsd (with props)
incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema2.xsd (with props)
incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema3.xsd (with props)
incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema4.xsd (with props)
incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema2.xsd (with props)
incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema3.xsd (with props)
incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema4.xsd (with props)
Modified:
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/XmlSchemaURIResolver.java
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema1.xsd
Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?view=diff&rev=471618&r1=471617&r2=471618
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java Sun Nov 5 18:38:33 2006
@@ -27,6 +27,7 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+import java.util.Stack;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
@@ -46,6 +47,26 @@
private InputStream is;
private Class calling;
+ private Stack<Location> history = new Stack<Location>();
+
+ private class Location {
+ private String base;
+ private String relative;
+ public Location(String base, String relative) {
+ this.base = base;
+ this.relative = relative;
+ }
+ public String getBase() {
+ return base;
+ }
+ public String getRelative() {
+ return relative;
+ }
+ }
+
+ public URIResolver() throws IOException {
+ }
+
public URIResolver(String path) throws IOException {
this("", path);
}
@@ -68,6 +89,84 @@
}
}
+
+ public void resolveStateful(String baseUriStr, String uriStr, Class callingCls) throws IOException {
+ this.calling = (callingCls != null) ? callingCls : getClass();
+
+ if (uriStr.startsWith("classpath:")) {
+ tryClasspath(uriStr);
+ } else if (baseUriStr != null && baseUriStr.startsWith("jar:")) {
+ tryJar(baseUriStr, uriStr);
+ } else if (uriStr.startsWith("jar:")) {
+ tryJar(uriStr);
+ } else {
+ tryFileSystemState(baseUriStr, uriStr);
+ }
+ }
+
+ private URI getAbsoluteFileStr(String baseUriStr, String uriStr) throws MalformedURLException {
+ URI relative;
+ URI base;
+ try {
+ File uriFile = new File(uriStr);
+ uriFile = new File(uriFile.getAbsolutePath());
+ if (uriFile.exists()) {
+ relative = uriFile.toURI();
+ } else {
+ relative = new URI(uriStr);
+ }
+ if (relative.isAbsolute()) {
+ return new URI(uriStr);
+ } else if (baseUriStr != null) {
+ base = new URI(baseUriStr);
+ if (base.isAbsolute()) {
+ return base.resolve(relative);
+ } else {
+ Location location = null;
+ // assume that the outmost element of history is parent
+ if (!history.empty()) {
+ location = history.pop();
+ }
+ if (location != null) {
+ URI result = getAbsoluteFileStr(location.base, location.relative).resolve(relative);
+ history.push(location);
+ return result;
+ } else {
+ return null;
+ }
+ }
+ }
+ } catch (URISyntaxException e) {
+ return null;
+ }
+ return null;
+ }
+
+ private void tryFileSystemState(String baseUriStr, String uriStr)
+ throws IOException, MalformedURLException {
+ if (baseUriStr == null && uriStr == null) {
+ return;
+ }
+ URI finalRelative = getAbsoluteFileStr(baseUriStr, uriStr);
+ if (finalRelative != null) {
+ history.push(new Location(baseUriStr, uriStr));
+ File targetFile = new File(finalRelative);
+ if (!targetFile.exists() && baseUriStr.startsWith("file:/")) {
+ targetFile = new File(baseUriStr.substring(6));
+ }
+ URI target;
+ if (targetFile.exists()) {
+ target = targetFile.toURI();
+ } else {
+ target = finalRelative;
+ }
+ if (target.isAbsolute()) {
+ uri = target;
+ is = target.toURL().openStream();
+ }
+ }
+ }
+
private void tryFileSystem(String baseUriStr, String uriStr) throws IOException, MalformedURLException {
try {
URI relative;
Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/XmlSchemaURIResolver.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/XmlSchemaURIResolver.java?view=diff&rev=471618&r1=471617&r2=471618
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/XmlSchemaURIResolver.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/resource/XmlSchemaURIResolver.java Sun Nov 5 18:38:33 2006
@@ -31,17 +31,26 @@
*/
public class XmlSchemaURIResolver implements URIResolver {
+ private org.apache.cxf.resource.URIResolver resolver;
+
+ public XmlSchemaURIResolver() {
+ try {
+ resolver = new org.apache.cxf.resource.URIResolver();
+ } catch (IOException e) {
+ // move on...
+ }
+ }
+
public InputSource resolveEntity(String targetNamespace, String schemaLocation, String baseUri) {
try {
- org.apache.cxf.resource.URIResolver resolver =
- new org.apache.cxf.resource.URIResolver(baseUri, schemaLocation, getClass());
- if (resolver.isResolved()) {
- InputSource source = new InputSource(resolver.getInputStream());
- source.setSystemId(schemaLocation);
- return source;
- }
+ resolver.resolveStateful(baseUri, schemaLocation, getClass());
} catch (IOException e) {
// move on...
+ }
+ if (resolver.isResolved()) {
+ InputSource source = new InputSource(resolver.getInputStream());
+ source.setSystemId(schemaLocation);
+ return source;
}
return new InputSource(schemaLocation);
Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java?view=diff&rev=471618&r1=471617&r2=471618
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java Sun Nov 5 18:38:33 2006
@@ -57,6 +57,7 @@
private static final Logger LOG = Logger.getLogger(WSDLServiceBuilderTest.class.getName());
private static final String WSDL_PATH = "hello_world.wsdl";
private static final String BARE_WSDL_PATH = "hello_world_bare.wsdl";
+ private static final String IMPORT_WSDL_PATH = "hello_world_schema_import.wsdl";
private Definition def;
private Service service;
private ServiceInfo serviceInfo;
@@ -322,6 +323,13 @@
assertNotNull(greetMe);
assertEquals("greetMe OperationInfo name error", greetMe.getName(), name);
assertFalse("greetMe should be a Unwrapped operation ", greetMe.isUnwrappedCapable());
+ }
+
+ public void testImport() throws Exception {
+ setUpWSDL(IMPORT_WSDL_PATH);
+ TypeInfo types = serviceInfo.getTypeInfo();
+ assertNotNull(types);
+ assertNotNull(types.getSchemas());
}
}
Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl?view=auto&rev=471618
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl (added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl Sun Nov 5 18:38:33 2006
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/schema_import"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://apache.org/schema_import"
+ xmlns:x1="http://apache.org/hello_world_soap_http/types"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:types>
+ <xsd:schema>
+ <xsd:import namespace="http://apache.org/hello_world_soap_http/types" schemaLocation="schema1.xsd"/>
+ </xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="sayHiRequest">
+ <wsdl:part element="x1:sayHi" name="in"/>
+ </wsdl:message>
+ <wsdl:message name="sayHiResponse">
+ <wsdl:part element="x1:sayHiResponse" name="out"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeRequest">
+ <wsdl:part element="x1:greetMe" name="in"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeResponse">
+ <wsdl:part element="x1:greetMeResponse" name="out"/>
+ </wsdl:message>
+ <wsdl:message name="greetMeOneWayRequest">
+ <wsdl:part element="x1:greetMeOneWay" name="in"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeRequest">
+ <wsdl:part name="in" element="x1:pingMe"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeResponse">
+ <wsdl:part name="out" element="x1:pingMeResponse"/>
+ </wsdl:message>
+ <wsdl:message name="pingMeFault">
+ <wsdl:part name="faultDetail" element="x1:faultDetail"/>
+ </wsdl:message>
+
+ <wsdl:portType name="Greeter">
+ <wsdl:operation name="sayHi">
+ <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
+ <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMe">
+ <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
+ <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMeOneWay">
+ <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="pingMe">
+ <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
+ <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
+ <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="sayHi">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="sayHiRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="sayHiResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMe">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="greetMeRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="greetMeResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+
+ <wsdl:operation name="greetMeOneWay">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="greetMeOneWayRequest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ </wsdl:operation>
+
+ <wsdl:operation name="pingMe">
+ <soap:operation style="document"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="pingMeFault">
+ <soap:fault name="pingMeFault" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+
+ </wsdl:binding>
+ <wsdl:service name="SOAPService">
+ <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
+ <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
+
Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/hello_world_schema_import.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema1.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema1.xsd?view=auto&rev=471618
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema1.xsd (added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema1.xsd Sun Nov 5 18:38:33 2006
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema version="1.0" targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:import namespace="http://apache.org/hello_world_soap_http/types" schemaLocation="./schema2.xsd"/>
+
+ <xs:import namespace="http://apache.org/hello_world_soap_http/types" schemaLocation="./schema3.xsd"/>
+
+ <xs:element name="pingMe">
+ <xs:complexType/>
+ </xs:element>
+
+ <xs:element name="faultDetail">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="minor" type="xs:short" form="qualified" minOccurs="0"/>
+ <xs:element name="major" type="xs:short" form="qualified" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="pingMeResponse">
+ <xs:complexType/>
+ </xs:element>
+</xs:schema>
+
Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema1.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema1.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema1.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema2.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema2.xsd?view=auto&rev=471618
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema2.xsd (added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema2.xsd Sun Nov 5 18:38:33 2006
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema version="1.0" targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:import namespace="http://apache.org/hello_world_soap_http/types" schemaLocation="./schema4.xsd"/>
+
+ <xs:element name="sayHi">
+ <xs:complexType/>
+ </xs:element>
+
+ <xs:element name="sayHiResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="responseType" type="xs:string" form="qualified" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
+
Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema2.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema2.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema2.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema3.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema3.xsd?view=auto&rev=471618
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema3.xsd (added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema3.xsd Sun Nov 5 18:38:33 2006
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema version="1.0" targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="greetMe">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="requestType" type="xs:string" form="qualified" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="greetMeResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="responseType" type="xs:string" form="qualified" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+
+</xs:schema>
+
Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema3.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema3.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema3.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema4.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema4.xsd?view=auto&rev=471618
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema4.xsd (added)
+++ incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema4.xsd Sun Nov 5 18:38:33 2006
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema version="1.0" targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="greetMeOneWay">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="requestType" type="xs:string" form="qualified" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
+
Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema4.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema4.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/core/src/test/resources/org/apache/cxf/wsdl11/schema4.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema1.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema1.xsd?view=diff&rev=471618&r1=471617&r2=471618
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema1.xsd (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema1.xsd Sun Nov 5 18:38:33 2006
@@ -19,41 +19,9 @@
-->
<xs:schema version="1.0" targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="sayHi">
- <xs:complexType/>
- </xs:element>
+ <xs:import namespace="http://apache.org/hello_world_soap_http/types" schemaLocation="./schema2.xsd"/>
- <xs:element name="sayHiResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="responseType" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="greetMe">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="requestType" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="greetMeResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="responseType" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="greetMeOneWay">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="requestType" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:import namespace="http://apache.org/hello_world_soap_http/types" schemaLocation="./schema3.xsd"/>
<xs:element name="pingMe">
<xs:complexType/>
Added: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema2.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema2.xsd?view=auto&rev=471618
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema2.xsd (added)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema2.xsd Sun Nov 5 18:38:33 2006
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema version="1.0" targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:import namespace="http://apache.org/hello_world_soap_http/types" schemaLocation="./schema4.xsd"/>
+
+ <xs:element name="sayHi">
+ <xs:complexType/>
+ </xs:element>
+
+ <xs:element name="sayHiResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="responseType" type="xs:string" form="qualified" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
+
Propchange: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema2.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema2.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema2.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema3.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema3.xsd?view=auto&rev=471618
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema3.xsd (added)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema3.xsd Sun Nov 5 18:38:33 2006
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema version="1.0" targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="greetMe">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="requestType" type="xs:string" form="qualified" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="greetMeResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="responseType" type="xs:string" form="qualified" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+
+</xs:schema>
+
Propchange: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema3.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema3.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema3.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema4.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema4.xsd?view=auto&rev=471618
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema4.xsd (added)
+++ incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema4.xsd Sun Nov 5 18:38:33 2006
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema version="1.0" targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="greetMeOneWay">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="requestType" type="xs:string" form="qualified" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
+
Propchange: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema4.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema4.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/tools/wsdl2java/src/test/resources/wsdl2java_wsdl/schema4.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml