You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by em...@apache.org on 2007/03/29 11:14:29 UTC
svn commit: r523641 - in /incubator/cxf/trunk/tools:
common/src/main/java/org/apache/cxf/tools/common/
wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/
wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/ wsdl...
Author: ema
Date: Thu Mar 29 02:14:25 2007
New Revision: 523641
URL: http://svn.apache.org/viewvc?view=rev&rev=523641
Log:
Fixed issue CXF-492
Added:
incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/
incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/locator.wsdl (with props)
incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/query.xsd (with props)
incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/types.xsd (with props)
incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/wsaddressing.xsd (with props)
Modified:
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/Messages.properties
incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Modified: incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java?view=diff&rev=523641&r1=523640&r2=523641
==============================================================================
--- incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java (original)
+++ incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java Thu Mar 29 02:14:25 2007
@@ -235,4 +235,9 @@
}
return null;
}
+
+
+ public Map<String, String> getNamespacePackageMap() {
+ return namespacePackageMap;
+ }
}
Modified: incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?view=diff&rev=523641&r1=523640&r2=523641
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Thu Mar 29 02:14:25 2007
@@ -19,6 +19,7 @@
package org.apache.cxf.tools.wsdlto.databinding.jaxb;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -49,12 +50,13 @@
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.helpers.DOMUtils;
+import org.apache.cxf.helpers.FileUtils;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.common.ToolException;
import org.apache.cxf.tools.util.ClassCollector;
-import org.apache.cxf.tools.util.JAXBUtils;
import org.apache.cxf.tools.util.URIParserUtil;
import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
@@ -71,7 +73,6 @@
def = (Definition)env.get(Definition.class);
SchemaCompilerImpl schemaCompiler = (SchemaCompilerImpl)XJC.createSchemaCompiler();
-
ClassCollector classCollector = env.get(ClassCollector.class);
ClassNameAllocatorImpl allocator = new ClassNameAllocatorImpl(classCollector);
@@ -94,13 +95,10 @@
Element ele = schemaLists.get(key);
this.removeImportElement(ele);
String tns = ele.getAttribute("targetNamespace");
-
if (StringUtils.isEmpty(tns)) {
continue;
}
-
String excludePkg = null;
-
if (env.hasExcludeNamespace(tns)) {
excludePkg = env.getExcludePackageName(tns);
if (excludePkg != null) {
@@ -109,28 +107,28 @@
env.getExcludePkgList().add(URIParserUtil.getPackageName(tns));
}
}
-
- String pkgName = null;
- if (env.hasNamespace(tns) || env.get(ToolConstants.CFG_PACKAGENAME) != null) {
- pkgName = env.mapPackageName(tns);
- }
-
- pkgName = pkgName != null ? pkgName : excludePkg;
-
- if (pkgName != null) {
- Node pkgNode = JAXBUtils.innerJaxbPackageBinding(ele, pkgName);
- if (pkgNode != null) {
- ele.appendChild(pkgNode);
- }
- }
schemaCompiler.parseSchema(key, ele);
}
+
-
for (InputSource binding : jaxbBindings) {
schemaCompiler.parseSchema(binding);
}
+
+
+ if (env.getPackageName() != null) {
+ schemaCompiler.forcePackageName(env.getPackageName());
+ } else {
+ Map<String, String> nsPkgMap = env.getNamespacePackageMap();
+ for (String ns : nsPkgMap.keySet()) {
+ File file = getCustomizedSchemaElement(ns, nsPkgMap.get(ns));
+ InputSource ins = new InputSource(file.toURI().toString());
+ schemaCompiler.parseSchema(ins);
+ FileUtils.delete(file);
+ }
+ }
+
rawJaxbModelGenCode = schemaCompiler.bind();
@@ -140,7 +138,7 @@
// JAXB bug. JAXB ClassNameCollector may not be invoked when generated
// class is an enum. We need to use this method to add the missed file
// to classCollector.
- private void addedEnumClassToCollector(Map<String, Element> schemaList,
+ private void addedEnumClassToCollector(Map<String, Element> schemaList,
ClassNameAllocatorImpl allocator) {
for (Element schemaElement : schemaList.values()) {
String targetNamespace = schemaElement.getAttribute("targetNamespace");
@@ -287,4 +285,42 @@
}
return clone;
}
+
+ /**
+ * Create the jaxb binding file to customize namespace to package mapping
+ *
+ * @param namespace
+ * @param pkgName
+ * @return file
+ *
+ */
+ public File getCustomizedSchemaElement(String namespace, String pkgName) {
+ Document doc = DOMUtils.createDocument();
+ Element rootElement = doc.createElement("schema");
+ rootElement.setAttribute("xmlns", ToolConstants.SCHEMA_URI);
+ rootElement.setAttribute("xmlns:jaxb", ToolConstants.NS_JAXB_BINDINGS);
+ rootElement.setAttribute("jaxb:version", "1.0");
+ rootElement.setAttribute("targetNamespace", namespace);
+ Element annoElement = doc.createElement("annotation");
+ Element appInfo = doc.createElement("appinfo");
+ Element schemaBindings = doc.createElement("jaxb:schemaBindings");
+ Element pkgElement = doc.createElement("jaxb:package");
+ pkgElement.setAttribute("name", pkgName);
+ annoElement.appendChild(appInfo);
+ appInfo.appendChild(schemaBindings);
+ schemaBindings.appendChild(pkgElement);
+ rootElement.appendChild(annoElement);
+ File tmpFile = null;
+ try {
+ tmpFile = File.createTempFile("customzied", ".xsd");
+ FileOutputStream fout = new FileOutputStream(tmpFile);
+ DOMUtils.writeXml(rootElement, fout);
+ fout.close();
+ } catch (Exception e) {
+ Message msg = new Message("FAIL_TO_CREATE_JAXBBINIDNG_FILE", LOG);
+ throw new ToolException(msg, e);
+ }
+ return tmpFile;
+ }
+
}
Modified: incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/Messages.properties?view=diff&rev=523641&r1=523640&r2=523641
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/Messages.properties (original)
+++ incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/Messages.properties Thu Mar 29 02:14:25 2007
@@ -20,6 +20,7 @@
#
GENERATE_TYPES_ERROR = Generate types error
FAIL_TO_GENERATE_TYPES = Fail to generate types
+FAIL_TO_CREATE_JAXBBINIDNG_FILE = Fail to create jaxb binding file for customizing the namepace to package mapping
Modified: incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?view=diff&rev=523641&r1=523640&r2=523641
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Thu Mar 29 02:14:25 2007
@@ -104,7 +104,6 @@
}
public void testNamespacePackageMapping1() throws Exception {
- env.put(ToolConstants.CFG_PACKAGENAME, "org.cxf");
env.addNamespacePackageMap("http://apache.org/hello_world_soap_http/types", "org.apache.types");
env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/hello_world.wsdl"));
processor.setContext(env);
@@ -118,13 +117,13 @@
assertTrue(types.exists());
File[] files = apache.listFiles();
- assertEquals(1, files.length);
+ assertEquals(2, files.length);
files = types.listFiles();
assertEquals(17, files.length);
- Class clz = classLoader.loadClass("org.cxf.Greeter");
- assertTrue("Generate " + clz.getName() + "error", clz.isInterface());
- clz = classLoader.loadClass("org.apache.types.GreetMe");
+ //Class clz = classLoader.loadClass("org.cxf.Greeter");
+ //assertTrue("Generate " + clz.getName() + "error", clz.isInterface());
+ Class clz = classLoader.loadClass("org.apache.types.GreetMe");
}
public void testNamespacePackageMapping2() throws Exception {
@@ -225,7 +224,6 @@
Class clz = classLoader.loadClass("org.cxf.Greeter");
assertTrue("Generate " + clz.getName() + "error", clz.isInterface());
- clz = classLoader.loadClass("org.apache.types.GreetMe");
}
public void testDefaultLoadNSMappingOFF() throws Exception {
@@ -356,5 +354,24 @@
Class clz = classLoader.loadClass("org.apache.cxf.no_port_or_service.types.TheComplexType");
assertNotNull(clz);
}
+ //CXF-492
+ public void testDefatultNsMap() throws Exception {
+ env.put(ToolConstants.CFG_ALL, ToolConstants.CFG_ALL);
+ env.put(ToolConstants.CFG_WSDLURL,
+ getLocation("/wsdl2java_wsdl/cxf492/locator.wsdl"));
+ processor.setContext(env);
+ processor.execute();
+ File org = new File(output, "org");
+ assertTrue("org directory is not exist", org.exists());
+ File apache = new File(org, "apache");
+ assertTrue(apache.exists());
+ File cxf = new File(apache, "cxf");
+ assertTrue(cxf.exists());
+ File ws = new File(cxf, "ws");
+ assertTrue(ws.exists());
+ File address = new File(ws, "addressing");
+ assertTrue(address.exists());
+ }
+
}
Added: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/locator.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/locator.wsdl?view=auto&rev=523641
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/locator.wsdl (added)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/locator.wsdl Thu Mar 29 02:14:25 2007
@@ -0,0 +1,203 @@
+<?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.
+-->
+
+<definitions targetNamespace="http://apache.org/locator"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ls="http://apache.org/locator"
+ xmlns:query="http://apache.org/locator/query"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://apache.org/locator/types"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <types>
+ <xs:schema targetNamespace="http://apache.org/locator/types">
+ <xs:include schemaLocation="types.xsd"/>
+ </xs:schema>
+ </types>
+ <message name="registerPeerManagerInput">
+ <part element="tns:registerPeerManager" name="parameters"/>
+ </message>
+ <message name="registerPeerManagerOutput">
+ <part element="tns:registerPeerManagerResponse" name="parameters"/>
+ </message>
+ <message name="deregisterPeerManagerInput">
+ <part element="tns:deregisterPeerManager" name="parameters"/>
+ </message>
+ <message name="deregisterPeerManagerOutput">
+ <part element="tns:deregisterPeerManagerResponse" name="parameters"/>
+ </message>
+ <message name="registerEndpointInput">
+ <part element="tns:registerEndpoint" name="parameters"/>
+ </message>
+ <message name="registerEndpointOutput">
+ <part element="tns:registerEndpointResponse" name="parameters"/>
+ </message>
+ <message name="deregisterEndpointInput">
+ <part element="tns:deregisterEndpoint" name="parameters"/>
+ </message>
+ <message name="deregisterEndpointOutput">
+ <part element="tns:deregisterEndpointResponse" name="parameters"/>
+ </message>
+ <message name="lookupEndpointInput">
+ <part element="tns:lookupEndpoint" name="parameters"/>
+ </message>
+ <message name="lookupEndpointOutput">
+ <part element="tns:lookupEndpointResponse" name="parameters"/>
+ </message>
+ <message name="listEndpointInput">
+ <part element="tns:listEndpoints" name="parameters"/>
+ </message>
+ <message name="listEndpointOutput">
+ <part element="tns:listEndpointsResponse" name="parameters"/>
+ </message>
+ <message name="queryEndpointInput">
+ <part element="tns:queryEndpoints" name="parameters"/>
+ </message>
+ <message name="queryEndpointOutput">
+ <part element="tns:queryEndpointsResponse" name="parameters"/>
+ </message>
+ <message name="endpointNotExistFault">
+ <part element="tns:EndpointNotExistFault" name="parameters"/>
+ </message>
+ <portType name="LocatorService">
+ <operation name="registerPeerManager">
+ <xs:documentation>
+ Register a peer endpoint manager with the locator service. Once registered,
+ the Locator associates the peer_id with the peer endpoint manager.
+ </xs:documentation>
+ <input message="ls:registerPeerManagerInput"/>
+ <output message="ls:registerPeerManagerOutput"/>
+ </operation>
+ <operation name="deregisterPeerManager">
+ <xs:documentation>
+ Deregister a peer endpoint manager with the locator service. Deregistering a
+ peer manager also deregisters all endpoints that were registered by it.
+ </xs:documentation>
+ <input message="ls:deregisterPeerManagerInput"/>
+ <output message="ls:deregisterPeerManagerOutput"/>
+ </operation>
+ <operation name="registerEndpoint">
+ <xs:documentation>
+ Register an endpoint to become available in the locator. Once registered, an
+ endpoint will be returned in response to the "list_endpoints" and "query_endpoints" operations.
+ </xs:documentation>
+ <input message="ls:registerEndpointInput"/>
+ <output message="ls:registerEndpointOutput"/>
+ </operation>
+ <operation name="deregisterEndpoint">
+ <xs:documentation>
+ Deregister an endpoint from the locator. Once deregistered an endpoint will
+ no longer be returned in response to the "list_endpoints" and "query_endpoints operations.
+ </xs:documentation>
+ <input message="ls:deregisterEndpointInput"/>
+ <output message="ls:deregisterEndpointOutput"/>
+ </operation>
+ <operation name="lookupEndpoint">
+ <xs:documentation>Lookup an endpoint from the locator based on a QName.</xs:documentation>
+ <input message="ls:lookupEndpointInput"/>
+ <output message="ls:lookupEndpointOutput"/>
+ <fault message="ls:endpointNotExistFault" name="fault"/>
+ </operation>
+ <operation name="listEndpoints">
+ <xs:documentation>List all endpoints available in the locator.</xs:documentation>
+ <input message="ls:listEndpointInput"/>
+ <output message="ls:listEndpointOutput"/>
+ </operation>
+ <operation name="queryEndpoints">
+ <xs:documentation>List all endpoints available in the locator based on selection filters.</xs:documentation>
+ <input message="ls:queryEndpointInput"/>
+ <output message="ls:queryEndpointOutput"/>
+ </operation>
+ </portType>
+ <binding name="LocatorServiceBinding" type="ls:LocatorService">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="registerPeerManager">
+ <soap:operation/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ <operation name="deregisterPeerManager">
+ <soap:operation/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ <operation name="registerEndpoint">
+ <soap:operation/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ <operation name="deregisterEndpoint">
+ <soap:operation/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ <operation name="lookupEndpoint">
+ <soap:operation/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ <fault name="fault">
+ <soap:fault name="fault" use="literal"/>
+ </fault>
+ </operation>
+ <operation name="listEndpoints">
+ <soap:operation/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ <operation name="queryEndpoints">
+ <soap:operation/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="LocatorService">
+ <port binding="ls:LocatorServiceBinding" name="LocatorServicePort">
+ <soap:address location="http://localhost:6006/services/LocatorService"/>
+ </port>
+ </service>
+</definitions>
Propchange: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/locator.wsdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/locator.wsdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/locator.wsdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/query.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/query.xsd?view=auto&rev=523641
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/query.xsd (added)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/query.xsd Thu Mar 29 02:14:25 2007
@@ -0,0 +1,51 @@
+
+<!--
+ 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 elementFormDefault="qualified" targetNamespace="http://apache.org/locator/query" xmlns:tns="http://apache.org/locator/query"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:simpleType name="FieldEnumeratedType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="GROUP"/>
+ <xs:enumeration value="SERVICE"/>
+ <xs:enumeration value="PORTNAME"/>
+ <xs:enumeration value="INTERFACE"/>
+ <xs:enumeration value="BINDING"/>
+ <xs:enumeration value="EXTENSOR"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="FilterFieldType">
+ <xs:union memberTypes="tns:FieldEnumeratedType xs:string"/>
+ </xs:simpleType>
+ <xs:complexType name="FilterType">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="field" type="tns:FilterFieldType"
+ use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ <xs:complexType name="QuerySelectType">
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="filter"
+ type="tns:FilterType"/>
+ <xs:any minOccurs="0" namespace="##other" processContents="lax"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:element name="select" type="tns:QuerySelectType"/>
+ </xs:schema>
\ No newline at end of file
Propchange: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/query.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/query.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/query.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/types.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/types.xsd?view=auto&rev=523641
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/types.xsd (added)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/types.xsd Thu Mar 29 02:14:25 2007
@@ -0,0 +1,167 @@
+
+ <!--
+ 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 targetNamespace="http://apache.org/locator/types" xmlns:tns="http://apache.org/locator/types"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:query="http://apache.org/locator/query"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:import schemaLocation="./wsaddressing.xsd" namespace="http://www.w3.org/2005/08/addressing"/>
+ <xs:import schemaLocation="./query.xsd" namespace="http://apache.org/locator/query"/>
+ <xs:complexType name="EmptyMessage">
+ <xs:sequence/>
+ </xs:complexType>
+ <xs:complexType name="EndpointIdentity">
+ <xs:annotation>
+ <xs:documentation>Extensible endpoint identity type.</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="node_id" type="xs:string"/>
+ <xs:element name="service_qname" type="xs:QName"/>
+ <xs:any maxOccurs="unbounded" minOccurs="0" namespace="##other"
+ processContents="lax"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:element name="registerPeerManager">
+ <xs:annotation>
+ <xs:documentation>Input message element for "registerPeerManager" operation.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="peer_manager" type="wsa:EndpointReferenceType"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="registerPeerManagerResponse">
+ <xs:annotation>
+ <xs:documentation>Output message element for "registerPeerManager" operation.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="peer_manager_reference"
+ type="wsa:EndpointReferenceType"/>
+ <xs:element name="node_id" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="deregisterPeerManager">
+ <xs:annotation>
+ <xs:documentation>Input message element for "deregisterPeerManager" operation.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="node_id" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="deregisterPeerManagerResponse" type="tns:EmptyMessage"/>
+ <xs:element name="registerEndpoint">
+ <xs:annotation>
+ <xs:documentation>Input message element for "registerEndpoint" operation.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="endpoint_id" type="tns:EndpointIdentity"/>
+ <xs:element name="endpoint_reference"
+ type="wsa:EndpointReferenceType"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="registerEndpointResponse" type="tns:EmptyMessage"/>
+ <xs:element name="deregisterEndpoint">
+ <xs:annotation>
+ <xs:documentation>Input message element for "deregisterEndpoint" operation.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="endpoint_id" type="tns:EndpointIdentity"/>
+ <xs:element name="endpoint_reference"
+ type="wsa:EndpointReferenceType"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="deregisterEndpointResponse" type="tns:EmptyMessage"/>
+ <xs:element name="lookupEndpoint">
+ <xs:annotation>
+ <xs:documentation>Input message element for "lookupEndpoint" operation.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="service_qname" type="xs:QName"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="lookupEndpointResponse">
+ <xs:annotation>
+ <xs:documentation>Output message element for "lookupEndpoint" operation.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="service_endpoint"
+ type="wsa:EndpointReferenceType"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="listEndpoints" type="tns:EmptyMessage"/>
+ <xs:element name="listEndpointsResponse">
+ <xs:annotation>
+ <xs:documentation>Output message element for "listEndpoints" operation.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="endpoint">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="endpoint_id"
+ type="tns:EndpointIdentity"/>
+ <xs:element name="endpoint_reference"
+ type="wsa:EndpointReferenceType"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="queryEndpoints">
+ <xs:annotation>
+ <xs:documentation>Input message element for "queryEndpoints" operation.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="query:select"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="queryEndpointsResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="wsa:EndpointReference"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:complexType name="EndpointNotExistFaultException">
+ <xs:annotation>
+ <xs:documentation>Fault exception when no endpoint available.</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="error" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:element name="EndpointNotExistFault"
+ type="tns:EndpointNotExistFaultException"/>
+ </xs:schema>
\ No newline at end of file
Propchange: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/types.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/types.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/types.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/wsaddressing.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/wsaddressing.xsd?view=auto&rev=523641
==============================================================================
--- incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/wsaddressing.xsd (added)
+++ incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/wsaddressing.xsd Thu Mar 29 02:14:25 2007
@@ -0,0 +1,141 @@
+<?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.
+-->
+<xs:schema attributeFormDefault="unqualified" blockDefault="#all"
+ elementFormDefault="qualified" finalDefault=""
+ targetNamespace="http://www.w3.org/2005/08/addressing"
+ xmlns:tns="http://www.w3.org/2005/08/addressing"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/>
+ <xs:complexType mixed="false" name="EndpointReferenceType">
+ <xs:sequence>
+ <xs:element name="Address" type="tns:AttributedURIType"/>
+ <xs:element minOccurs="0" name="ReferenceParameters"
+ type="tns:ReferenceParametersType"/>
+ <xs:element minOccurs="0" ref="tns:Metadata"/>
+ <xs:any maxOccurs="unbounded" minOccurs="0" namespace="##other"
+ processContents="lax"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ <xs:complexType mixed="false" name="ReferenceParametersType">
+ <xs:sequence>
+ <xs:any maxOccurs="unbounded" minOccurs="0" namespace="##any"
+ processContents="lax"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ <xs:element name="Metadata" type="tns:MetadataType"/>
+ <xs:complexType mixed="false" name="MetadataType">
+ <xs:sequence>
+ <xs:any maxOccurs="unbounded" minOccurs="0" namespace="##any"
+ processContents="lax"/>
+ </xs:sequence>
+ <!--
+ Until anyAttribute is supported, explicitly include the
+ wsdlLocation attribute definition.
+
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+-->
+ <xs:attribute name="wsdlLocation" type="xs:string" use="optional"/>
+ </xs:complexType>
+ <xs:element name="MessageID" type="tns:AttributedURIType"/>
+ <xs:element name="RelatesTo" type="tns:RelatesToType"/>
+ <xs:complexType mixed="false" name="RelatesToType">
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI">
+ <xs:attribute name="RelationshipType"
+ type="tns:RelationshipTypeOpenEnum" use="optional"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ <xs:simpleType name="RelationshipTypeOpenEnum">
+ <xs:union memberTypes="tns:RelationshipType xs:anyURI"/>
+ </xs:simpleType>
+ <xs:simpleType name="RelationshipType">
+ <xs:restriction base="xs:anyURI">
+ <xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:element name="ReplyTo" type="tns:EndpointReferenceType"/>
+ <xs:element name="From" type="tns:EndpointReferenceType"/>
+ <xs:element name="FaultTo" type="tns:EndpointReferenceType"/>
+ <xs:element name="To" type="tns:AttributedURIType"/>
+ <xs:element name="Action" type="tns:AttributedURIType"/>
+ <xs:complexType mixed="false" name="AttributedURIType">
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ <xs:attribute name="IsReferenceParameter" type="xs:boolean"/>
+ <xs:simpleType name="FaultCodesOpenEnumType">
+ <xs:union memberTypes="tns:FaultCodesType xs:QName"/>
+ </xs:simpleType>
+ <xs:simpleType name="FaultCodesType">
+ <xs:restriction base="xs:QName">
+ <xs:enumeration value="tns:InvalidAddressingHeader"/>
+ <xs:enumeration value="tns:InvalidAddress"/>
+ <xs:enumeration value="tns:InvalidEPR"/>
+ <xs:enumeration value="tns:InvalidCardinality"/>
+ <xs:enumeration value="tns:MissingAddressInEPR"/>
+ <xs:enumeration value="tns:DuplicateMessageID"/>
+ <xs:enumeration value="tns:ActionMismatch"/>
+ <xs:enumeration value="tns:MessageAddressingHeaderRequired"/>
+ <xs:enumeration value="tns:DestinationUnreachable"/>
+ <xs:enumeration value="tns:ActionNotSupported"/>
+ <xs:enumeration value="tns:EndpointUnavailable"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/>
+ <xs:complexType mixed="false" name="AttributedUnsignedLongType">
+ <xs:simpleContent>
+ <xs:extension base="xs:unsignedLong">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ <xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/>
+ <xs:complexType mixed="false" name="AttributedQNameType">
+ <xs:simpleContent>
+ <xs:extension base="xs:QName">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ <xs:element name="ProblemHeader" type="tns:AttributedAnyType"/>
+ <xs:complexType mixed="false" name="AttributedAnyType">
+ <xs:sequence>
+ <xs:any maxOccurs="1" minOccurs="1" namespace="##any"
+ processContents="lax"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ <xs:element name="ProblemIRI" type="tns:AttributedURIType"/>
+ <xs:element name="ProblemAction" type="tns:ProblemActionType"/>
+ <xs:complexType mixed="false" name="ProblemActionType">
+ <xs:sequence>
+ <xs:element minOccurs="0" ref="tns:Action"/>
+ <xs:element minOccurs="0" name="SoapAction" type="xs:anyURI"/>
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:schema>
\ No newline at end of file
Propchange: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/wsaddressing.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/wsaddressing.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf492/wsaddressing.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml