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/10/29 16:31:55 UTC
svn commit: r589676 - in
/incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools:
fortest/withannotation/doc/jaxws/
java2wsdl/processor/internal/jaxws/expected/
Author: dkulp
Date: Mon Oct 29 08:31:54 2007
New Revision: 589676
URL: http://svn.apache.org/viewvc?rev=589676&view=rev
Log:
Fix failing tests on 2.0.x
Modified:
incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/jaxws/GetPrice.java
incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/jaxws/GetPriceResponse.java
incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl
incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl
Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/jaxws/GetPrice.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/jaxws/GetPrice.java?rev=589676&r1=589675&r2=589676&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/jaxws/GetPrice.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/jaxws/GetPrice.java Mon Oct 29 08:31:54 2007
@@ -23,7 +23,6 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
/**
@@ -48,7 +47,6 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {"responseType" })
@XmlRootElement(name = "getPrice")
public class GetPrice {
Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/jaxws/GetPriceResponse.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/jaxws/GetPriceResponse.java?rev=589676&r1=589675&r2=589676&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/jaxws/GetPriceResponse.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/fortest/withannotation/doc/jaxws/GetPriceResponse.java Mon Oct 29 08:31:54 2007
@@ -22,7 +22,6 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
/**
@@ -47,7 +46,6 @@
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {"responseType" })
@XmlRootElement(name = "getPriceResponse")
public class GetPriceResponse {
Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl?rev=589676&r1=589675&r2=589676&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_localName.wsdl Mon Oct 29 08:31:54 2007
@@ -2,28 +2,28 @@
<wsdl:definitions name="StockService" targetNamespace="http://doc.withannotation.fortest.tools.cxf.apache.org/" xmlns:tns="http://doc.withannotation.fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://doc.withannotation.fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://doc.withannotation.fortest.tools.cxf.apache.org/">
-<xs:element name="getPrice">
-<xs:complexType>
-<xs:sequence>
-<xs:element name="responseType" type="xs:string"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
-<xs:element name="getPriceResponse">
-<xs:complexType>
-<xs:sequence>
-<xs:element name="responseType" type="xs:float"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
+ <xs:element name="getPrice" type="getPrice"/>
+ <xs:element name="getPriceResponse" type="getPriceResponse"/>
+ <xs:complexType name="getPriceResponse">
+ <xs:sequence>
+ <xs:element name="responseType" type="xs:float"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="getPrice">
+ <xs:sequence>
+ <xs:element name="responseType" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:element name="xXx" nillable="true" type="getPrice"/>
+ <xs:element name="zZz" nillable="true" type="getPriceResponse"/>
</xs:schema>
</wsdl:types>
<wsdl:message name="getPriceResponse">
- <wsdl:part name="parameters" element="tns:getPriceResponse">
+ <wsdl:part name="parameters" element="tns:zZz">
</wsdl:part>
</wsdl:message>
<wsdl:message name="getPrice">
- <wsdl:part name="parameters" element="tns:getPrice">
+ <wsdl:part name="parameters" element="tns:xXx">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="Stock">
Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl?rev=589676&r1=589675&r2=589676&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_doc_lit_wrapped_with_wrapperclass.wsdl Mon Oct 29 08:31:54 2007
@@ -2,20 +2,18 @@
<wsdl:definitions name="StockWrappedService" targetNamespace="http://cxf.com/" xmlns:tns="http://cxf.com/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://cxf.com/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://cxf.com/">
-<xs:element name="getPrice">
-<xs:complexType>
-<xs:sequence>
-<xs:element name="responseType" type="xs:string"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
-<xs:element name="getPriceResponse">
-<xs:complexType>
-<xs:sequence>
-<xs:element name="responseType" type="xs:float"/>
-</xs:sequence>
-</xs:complexType>
-</xs:element>
+ <xs:element name="getPrice" type="getPrice"/>
+ <xs:element name="getPriceResponse" type="getPriceResponse"/>
+ <xs:complexType name="getPrice">
+ <xs:sequence>
+ <xs:element name="responseType" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="getPriceResponse">
+ <xs:sequence>
+ <xs:element name="responseType" type="xs:float"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
</wsdl:types>
<wsdl:message name="getPrice">