You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/12/18 04:55:38 UTC
svn commit: r605074 [2/2] - in /incubator/cxf/trunk:
common/common/src/main/java/org/apache/cxf/common/xmlschema/
rt/core/src/main/java/org/apache/cxf/databinding/source/
rt/core/src/main/java/org/apache/cxf/test/ rt/databinding/xmlbeans/
rt/databindin...
Added: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/SetWeatherData.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/SetWeatherData.xml?rev=605074&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/SetWeatherData.xml (added)
+++ incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/SetWeatherData.xml Mon Dec 17 19:55:35 2007
@@ -0,0 +1,9 @@
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
+ <env:Body xmlns:x="http://www.webservicex.net">
+ <x:setWeatherData>
+ <data>
+ <x:MinTemperatureF>1</x:MinTemperatureF>
+ </data>
+ </x:setWeatherData>
+ </env:Body>
+</env:Envelope>
\ No newline at end of file
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/SetWeatherData.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/SetWeatherData.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/SetWeatherData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java?rev=605074&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java (added)
+++ incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java Mon Dec 17 19:55:35 2007
@@ -0,0 +1,92 @@
+/**
+ * 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.
+ */
+package org.apache.cxf.xmlbeans.rpc;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.namespace.QName;
+
+import org.w3c.dom.Node;
+
+import net.webservicex.WeatherData;
+
+import org.apache.cxf.common.util.SOAPConstants;
+import org.apache.cxf.wsdl.WSDLConstants;
+import org.apache.cxf.xmlbeans.AbstractXmlBeansTest;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
+ */
+public class WeatherServiceRPCLitTest extends AbstractXmlBeansTest {
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+
+ //xsf.setStyle(SoapConstants.STYLE_RPC);
+ createService(RPCWeatherService.class, new RPCWeatherService(),
+ "WeatherService", new QName("http://www.webservicex.net", "WeatherService"));
+ }
+
+ @Test
+ public void testInvoke() throws Exception {
+ Node response = invoke("WeatherService", "SetWeatherData.xml");
+
+ addNamespace("w", "http://www.webservicex.net");
+ assertValid("//w:setWeatherDataResponse", response);
+
+ response = invoke("WeatherService", "GetWeatherData.xml");
+ assertValid("//w:getWeatherDataResponse/return", response);
+ assertValid("//w:getWeatherDataResponse/return/w:MaxTemperatureC[text()='1']", response);
+ assertValid("//w:getWeatherDataResponse/return/w:MaxTemperatureF[text()='1']", response);
+
+ }
+
+ @Test
+ public void testWSDL() throws Exception {
+ Node wsdl = getWSDLDocument("WeatherService");
+
+ addNamespace("w", WSDLConstants.NS_WSDL11);
+ addNamespace("xsd", SOAPConstants.XSD);
+
+ assertValid("//w:message[@name='getWeatherDataResponse']/w:part[@type='tns:WeatherData']", wsdl);
+ }
+
+ @SOAPBinding(style = SOAPBinding.Style.RPC)
+ @WebService(targetNamespace = "http://www.webservicex.net")
+ public static class RPCWeatherService {
+ @WebMethod
+ public WeatherData getWeatherData() {
+ WeatherData data = WeatherData.Factory.newInstance();
+ data.setMaxTemperatureC("1");
+ data.setMaxTemperatureF("1");
+
+ return data;
+ }
+
+ @WebMethod
+ public void setWeatherData(@WebParam(name = "data") WeatherData data) {
+
+ }
+ }
+}
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/rpc/WeatherServiceRPCLitTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/sampleRequest.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/sampleRequest.xml?rev=605074&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/sampleRequest.xml (added)
+++ incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/sampleRequest.xml Mon Dec 17 19:55:35 2007
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<s12:Envelope
+ xmlns:s12='http://www.w3.org/2003/05/soap-envelope'
+ xmlns:wsa='http://schemas.xmlsoap.org/ws/2004/08/addressing'
+ xmlns:wse='http://schemas.xmlsoap.org/ws/2004/08/eventing'
+ xmlns:ew='http://www.example.com/warnings'>
+ <s12:Header>
+ <wsa:Action>
+ http://schemas.xmlsoap.org/ws/2004/08/eventing/Subscribe
+ </wsa:Action>
+ <wsa:MessageID>
+ uuid:d7c5726b-de29-4313-b4d4-b3425b200839
+ </wsa:MessageID>
+ <wsa:ReplyTo>
+ <wsa:Address>http://www.example.com/MyEventSink</wsa:Address>
+ </wsa:ReplyTo>
+ <wsa:To>http://www.example.org/oceanwatch/EventSource</wsa:To>
+ </s12:Header>
+ <s12:Body>
+ <wse:Subscribe>
+ <wse:Delivery>
+ <wse:NotifyTo>
+ <wsa:Address>
+ http://www.example.com/MyEventSink/OnStormWarning
+ </wsa:Address>
+ <wsa:ReferenceProperties>
+ <ew:MySubscription>2597</ew:MySubscription>
+ </wsa:ReferenceProperties>
+ </wse:NotifyTo>
+ </wse:Delivery>
+ </wse:Subscribe>
+ </s12:Body>
+</s12:Envelope>
\ No newline at end of file
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/sampleRequest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/sampleRequest.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/sampleRequest.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/soap11fault.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/soap11fault.xml?rev=605074&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/soap11fault.xml (added)
+++ incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/soap11fault.xml Mon Dec 17 19:55:35 2007
@@ -0,0 +1,10 @@
+<SOAP-ENV:Fault xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+ <faultcode>SOAP-ENV:Server</faultcode>
+ <faultstring>Server Error</faultstring>
+ <detail>
+ <e:myfaultdetails xmlns:e="urn:detailsns">
+ <message> My application didn't work </message>
+ <errorcode> 1001 </errorcode>
+ </e:myfaultdetails>
+ </detail>
+</SOAP-ENV:Fault>
\ No newline at end of file
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/soap11fault.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/soap11fault.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/soap11fault.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/undeclaredns.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/undeclaredns.xml?rev=605074&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/undeclaredns.xml (added)
+++ incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/undeclaredns.xml Mon Dec 17 19:55:35 2007
@@ -0,0 +1,3 @@
+<foo xmlns="urn:bleh" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <bar xsi:type="xsd:string"/>
+</foo>
\ No newline at end of file
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/undeclaredns.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/undeclaredns.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/undeclaredns.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Base.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Base.xsd?rev=605074&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Base.xsd (added)
+++ incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Base.xsd Mon Dec 17 19:55:35 2007
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="urn:xfire:xmlbeans:nstest"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:xf="urn:xfire:xmlbeans:nstest"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified">
+ <xs:complexType name="Request">
+ <xs:attribute name="id" type="xs:long" use="required"/>
+ </xs:complexType>
+ <xs:complexType name="Response">
+ <xs:attribute name="id" type="xs:long" use="required"/>
+ </xs:complexType>
+</xs:schema>
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Base.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Base.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Base.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Request.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Request.xsd?rev=605074&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Request.xsd (added)
+++ incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Request.xsd Mon Dec 17 19:55:35 2007
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="urn:xfire:xmlbeans:nstest"
+ xmlns:xf="urn:xfire:xmlbeans:nstest"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:import namespace="urn:xfire:xmlbeans:nstest" schemaLocation="Base.xsd" />
+ <xs:element name="RequestText">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xf:Request">
+ <xs:attribute name="query" type="xs:string" use="required" />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:attribute name="foo" type="xs:string" />
+</xs:schema>
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Request.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Request.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Request.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Response.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Response.xsd?rev=605074&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Response.xsd (added)
+++ incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Response.xsd Mon Dec 17 19:55:35 2007
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="urn:xfire:xmlbeans:nstest"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:xf="urn:xfire:xmlbeans:nstest"
+ elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:import namespace="urn:xfire:xmlbeans:nstest"
+ schemaLocation="Base.xsd" />
+ <xs:element name="ResponseText">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="xf:Response">
+ <xs:attribute name="text" type="xs:string" use="required" />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Response.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Response.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/Response.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/WeatherForecast.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/WeatherForecast.xsd?rev=605074&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/WeatherForecast.xsd (added)
+++ incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/WeatherForecast.xsd Mon Dec 17 19:55:35 2007
@@ -0,0 +1,54 @@
+<s:schema elementFormDefault="qualified" targetNamespace="http://www.webservicex.net" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.webservicex.net">
+ <s:element name="GetWeatherByZipCode">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="ZipCode" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="GetWeatherByZipCodeResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="GetWeatherByZipCodeResult"
+ type="tns:WeatherForecasts" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:complexType name="WeatherForecasts">
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="Latitude" type="s:float" />
+ <s:element minOccurs="1" maxOccurs="1" name="Longitude" type="s:float" />
+ <s:element minOccurs="1" maxOccurs="1" name="AllocationFactor" type="s:float" />
+ <s:element minOccurs="0" maxOccurs="1" name="FipsCode" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="PlaceName" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="StateCode" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Status" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ <s:complexType name="WeatherData">
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="Day" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="WeatherImage" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="MaxTemperatureF" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="MinTemperatureF" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="MaxTemperatureC" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="MinTemperatureC" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ <s:element name="GetWeatherByPlaceName">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="PlaceName" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="GetWeatherByPlaceNameResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="GetWeatherByPlaceNameResult"
+ type="tns:WeatherForecasts" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="WeatherForecasts" type="tns:WeatherForecasts" />
+</s:schema>
\ No newline at end of file
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/WeatherForecast.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/WeatherForecast.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/WeatherForecast.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/anyschema.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/anyschema.xsd?rev=605074&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/anyschema.xsd (added)
+++ incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/anyschema.xsd Mon Dec 17 19:55:35 2007
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ attributeFormDefault="qualified" elementFormDefault="qualified"
+ targetNamespace="http://cxf.apache.org/xmlbeans">
+
+ <!--
+ Yes, this is a very obtuse type, the point is to have inner types
+ without names - this caused NPE's on WSDL generation at one point
+ -->
+ <xsd:element name="trouble">
+ <xsd:complexType>
+ <xsd:all>
+ <xsd:element name="inner">
+ <xsd:complexType>
+ <xsd:all>
+ <xsd:element name="wombat">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="joe"/>
+ <xsd:enumeration value="bob"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:element>
+ </xsd:all>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:all>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="request">
+ <xsd:complexType>
+ <xsd:all>
+ <xsd:element maxOccurs="1" minOccurs="1"
+ name="sessionId" type="xsd:string" />
+ </xsd:all>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="response">
+ <xsd:complexType>
+ <xsd:all>
+ <xsd:element maxOccurs="1" minOccurs="1" name="form"
+ type="xsd:anyType" />
+ </xsd:all>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema>
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/anyschema.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/anyschema.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/anyschema.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/idref.xsd
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/idref.xsd?rev=605074&view=auto
==============================================================================
--- incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/idref.xsd (added)
+++ incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/idref.xsd Mon Dec 17 19:55:35 2007
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2006 sp1 U (http://www.altova.com) by Brian Blitzer (NA) -->
+<xs:schema xmlns="http://www.alservices.com/xsd/sample" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.alservices.com/xsd/sample" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:element name="SampleElement">
+ <xs:annotation>
+ <xs:documentation>Comment describing your root element</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SampleUserInformation">
+
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="SampleFirstName" type="xs:string"/>
+ <xs:element name="SampleLastName" type="xs:string"/>
+ <xs:element name="SampleAnID" type="xs:IDREFS"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/idref.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/idref.xsd
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/rt/databinding/xmlbeans/src/test/xsd/idref.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=605074&r1=605073&r2=605074&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Mon Dec 17 19:55:35 2007
@@ -42,7 +42,6 @@
import org.apache.cxf.databinding.source.SourceDataBinding;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointException;
-import org.apache.cxf.frontend.SimpleMethodDispatcher;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.jaxws.JAXWSMethodDispatcher;
import org.apache.cxf.jaxws.WrapperClassGenerator;
@@ -52,7 +51,6 @@
import org.apache.cxf.service.factory.AbstractServiceConfiguration;
import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.factory.ServiceConstructionException;
-import org.apache.cxf.service.invoker.Invoker;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.FaultInfo;
@@ -74,8 +72,6 @@
private JaxWsImplementorInfo implInfo;
- private JAXWSMethodDispatcher methodDispatcher;
-
private List<WebServiceFeature> wsFeatures;
private boolean wrapperBeanGenerated;
@@ -106,14 +102,6 @@
return s;
}
- @Override
- protected Invoker createInvoker() {
- return null;
- }
-
- protected SimpleMethodDispatcher getMethodDispatcher() {
- return methodDispatcher;
- }
@Override
public void setServiceClass(Class<?> serviceClass) {
@@ -326,7 +314,7 @@
jaxWsConfiguration.setServiceFactory(this);
getServiceConfigurations().add(0, jaxWsConfiguration);
}
- methodDispatcher = new JAXWSMethodDispatcher(implInfo);
+ setMethodDispatcher(new JAXWSMethodDispatcher(implInfo));
}
public List<WebServiceFeature> getWsFeatures() {
Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=605074&r1=605073&r2=605074&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Mon Dec 17 19:55:35 2007
@@ -1169,8 +1169,14 @@
SchemaInfo schemaInfo = new SchemaInfo(serviceInfo, namespaceURI);
SchemaCollection col = serviceInfo.getXmlSchemaCollection();
+ XmlSchema schema = col.getSchemaByTargetNamespace(namespaceURI);
+ if (schema != null) {
+ schemaInfo.setSchema(schema);
+ serviceInfo.addSchema(schemaInfo);
+ return schemaInfo;
+ }
- XmlSchema schema = col.newXmlSchemaInCollection(namespaceURI);
+ schema = col.newXmlSchemaInCollection(namespaceURI);
if (qualified) {
schema.setElementFormDefault(new XmlSchemaForm(XmlSchemaForm.QUALIFIED));
}
@@ -1816,6 +1822,9 @@
protected SimpleMethodDispatcher getMethodDispatcher() {
return methodDispatcher;
+ }
+ protected void setMethodDispatcher(SimpleMethodDispatcher m) {
+ methodDispatcher = m;
}
public List<AbstractServiceConfiguration> getConfigurations() {