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 2010/05/25 20:23:06 UTC
svn commit: r948150 - in /cxf/branches/2.2.x-fixes: ./
systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/
tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/
Author: dkulp
Date: Tue May 25 18:23:06 2010
New Revision: 948150
URL: http://svn.apache.org/viewvc?rev=948150&view=rev
Log:
Merged revisions 946825 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r946825 | dkulp | 2010-05-20 19:34:52 -0400 (Thu, 20 May 2010) | 1 line
Fix broken tests
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java
cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/add_numbers_expected.wsdl
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java?rev=948150&r1=948149&r2=948150&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java (original)
+++ cxf/branches/2.2.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java Tue May 25 18:23:06 2010
@@ -79,8 +79,10 @@ public class WSAFromJavaTest extends Abs
assertTrue(output.toString().indexOf("http://cxf.apache.org/input") != -1);
String expectedFault =
- "http://server.addr_fromjava.ws.systest.cxf.apache.org/AddNumberImpl/Fault/AddNumbersException";
- assertTrue(input.toString().indexOf(expectedFault) != -1);
+ "http://server.addr_fromjava.ws.systest.cxf.apache.org/AddNumberImpl/"
+ + "addNumbers/Fault/AddNumbersException";
+ assertTrue(input.toString(),
+ input.toString().indexOf(expectedFault) != -1);
}
@Test
Modified: cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/add_numbers_expected.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/add_numbers_expected.wsdl?rev=948150&r1=948149&r2=948150&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/add_numbers_expected.wsdl (original)
+++ cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/add_numbers_expected.wsdl Tue May 25 18:23:06 2010
@@ -1,74 +1,68 @@
<?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="AddNumbersImplService" targetNamespace="http://fortest.tools.cxf.apache.org/" xmlns:tns="http://fortest.tools.cxf.apache.org/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions name="AddNumbersImplService" targetNamespace="http://fortest.tools.cxf.apache.org/" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://fortest.tools.cxf.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata">
<wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://fortest.tools.cxf.apache.org/">
- <xsd:element name="AddNumbersException" type="tns:AddNumbersException"/>
- <xsd:complexType name="AddNumbersException">
- <xsd:sequence/>
- </xsd:complexType>
- <xsd:element name="addNumbers2" type="tns:addNumbers2"/>
- <xsd:complexType name="addNumbers2">
- <xsd:sequence>
- <xsd:element name="arg0" type="xsd:int"/>
- <xsd:element name="arg1" type="xsd:int"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="addNumbers2Response" type="tns:addNumbers2Response"/>
- <xsd:complexType name="addNumbers2Response">
- <xsd:sequence>
- <xsd:element name="return" type="xsd:int"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="addNumbers3" type="tns:addNumbers3"/>
- <xsd:complexType name="addNumbers3">
- <xsd:sequence>
- <xsd:element name="arg0" type="xsd:int"/>
- <xsd:element name="arg1" type="xsd:int"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="addNumbers3Response" type="tns:addNumbers3Response"/>
- <xsd:complexType name="addNumbers3Response">
- <xsd:sequence>
- <xsd:element name="return" type="xsd:int"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="addNumbers" type="tns:addNumbers"/>
- <xsd:complexType name="addNumbers">
- <xsd:sequence>
- <xsd:element name="arg0" type="xsd:int"/>
- <xsd:element name="arg1" type="xsd:int"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="addNumbersResponse" type="tns:addNumbersResponse"/>
- <xsd:complexType name="addNumbersResponse">
- <xsd:sequence>
- <xsd:element name="return" type="xsd:int"/>
- </xsd:sequence>
- </xsd:complexType>
-</xsd:schema>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://fortest.tools.cxf.apache.org/" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://fortest.tools.cxf.apache.org/">
+ <xs:element name="addNumbers" type="tns:addNumbers"/>
+ <xs:element name="addNumbers2" type="tns:addNumbers2"/>
+ <xs:element name="addNumbers2Response" type="tns:addNumbers2Response"/>
+ <xs:element name="addNumbers3" type="tns:addNumbers3"/>
+ <xs:element name="addNumbers3Response" type="tns:addNumbers3Response"/>
+ <xs:element name="addNumbersResponse" type="tns:addNumbersResponse"/>
+ <xs:complexType name="addNumbers">
+ <xs:sequence>
+ <xs:element name="arg0" type="xs:int"/>
+ <xs:element name="arg1" type="xs:int"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="addNumbersResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:int"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="addNumbers3">
+ <xs:sequence>
+ <xs:element name="arg0" type="xs:int"/>
+ <xs:element name="arg1" type="xs:int"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="addNumbers3Response">
+ <xs:sequence>
+ <xs:element name="return" type="xs:int"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="addNumbers2">
+ <xs:sequence>
+ <xs:element name="arg0" type="xs:int"/>
+ <xs:element name="arg1" type="xs:int"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="addNumbers2Response">
+ <xs:sequence>
+ <xs:element name="return" type="xs:int"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:element name="AddNumbersException" type="tns:AddNumbersException"/>
+ <xs:complexType name="AddNumbersException">
+ <xs:sequence/>
+ </xs:complexType>
+</xs:schema>
</wsdl:types>
+ <wsdl:message name="addNumbersResponse">
+ <wsdl:part name="parameters" element="tns:addNumbersResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="addNumbers2Response">
+ <wsdl:part name="parameters" element="tns:addNumbers2Response">
+ </wsdl:part>
+ </wsdl:message>
<wsdl:message name="addNumbers2">
<wsdl:part name="parameters" element="tns:addNumbers2">
</wsdl:part>
</wsdl:message>
+ <wsdl:message name="AddNumbersException">
+ <wsdl:part name="AddNumbersException" element="tns:AddNumbersException">
+ </wsdl:part>
+ </wsdl:message>
<wsdl:message name="addNumbers">
<wsdl:part name="parameters" element="tns:addNumbers">
</wsdl:part>
@@ -81,53 +75,45 @@
<wsdl:part name="parameters" element="tns:addNumbers3Response">
</wsdl:part>
</wsdl:message>
- <wsdl:message name="AddNumbersException">
- <wsdl:part name="AddNumbersException" element="tns:AddNumbersException">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="addNumbersResponse">
- <wsdl:part name="parameters" element="tns:addNumbersResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="addNumbers2Response">
- <wsdl:part name="parameters" element="tns:addNumbers2Response">
- </wsdl:part>
- </wsdl:message>
<wsdl:portType name="AddNumbersImpl">
- <wsdl:operation name="addNumbers2">
- <wsdl:input name="addNumbers2" message="tns:addNumbers2">
+ <wsdl:operation name="addNumbers">
+ <wsdl:input name="addNumbers" message="tns:addNumbers" wsam:Action="http://cxf.apache.org/input" wsaw:Action="http://cxf.apache.org/input">
</wsdl:input>
- <wsdl:output name="addNumbers2Response" message="tns:addNumbers2Response">
+ <wsdl:output name="addNumbersResponse" message="tns:addNumbersResponse" wsam:Action="http://cxf.apache.org/output" wsaw:Action="http://cxf.apache.org/output">
</wsdl:output>
+ <wsdl:fault name="AddNumbersException" message="tns:AddNumbersException" wsam:Action="http://fortest.tools.cxf.apache.org/AddNumbersImpl/addNumbers/Fault/AddNumbersException">
+ </wsdl:fault>
</wsdl:operation>
<wsdl:operation name="addNumbers3">
- <wsdl:input name="addNumbers3" message="tns:addNumbers3" wsaw:Action="http://cxf.apache.org/input3">
+ <wsdl:input name="addNumbers3" message="tns:addNumbers3" wsam:Action="http://cxf.apache.org/input3" wsaw:Action="http://cxf.apache.org/input3">
</wsdl:input>
- <wsdl:output name="addNumbers3Response" message="tns:addNumbers3Response" wsaw:Action="http://cxf.apache.org/output3">
+ <wsdl:output name="addNumbers3Response" message="tns:addNumbers3Response" wsam:Action="http://cxf.apache.org/output3" wsaw:Action="http://cxf.apache.org/output3">
</wsdl:output>
- <wsdl:fault name="AddNumbersException" message="tns:AddNumbersException" wsaw:Action="http://cxf.apache.org/fault3">
+ <wsdl:fault name="AddNumbersException" message="tns:AddNumbersException" wsam:Action="http://cxf.apache.org/fault3" wsaw:Action="http://cxf.apache.org/fault3">
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="addNumbers">
- <wsdl:input name="addNumbers" message="tns:addNumbers" wsaw:Action="http://cxf.apache.org/input">
+ <wsdl:operation name="addNumbers2">
+ <wsdl:input name="addNumbers2" message="tns:addNumbers2">
</wsdl:input>
- <wsdl:output name="addNumbersResponse" message="tns:addNumbersResponse" wsaw:Action="http://cxf.apache.org/output">
+ <wsdl:output name="addNumbers2Response" message="tns:addNumbers2Response">
</wsdl:output>
- <wsdl:fault name="AddNumbersException" message="tns:AddNumbersException">
- </wsdl:fault>
</wsdl:operation>
</wsdl:portType>
<wsdl:binding name="AddNumbersImplServiceSoapBinding" type="tns:AddNumbersImpl">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsaw:UsingAddressing wsdl:required="false" />
- <wsdl:operation name="addNumbers2">
+ <wsaw:UsingAddressing wsdl:required="false"/>
+ <wsp:PolicyReference URI="#AddNumbersImplServiceSoapBinding_WSAM_Addressing_Policy"/>
+ <wsdl:operation name="addNumbers">
<soap:operation soapAction="" style="document"/>
- <wsdl:input name="addNumbers2">
+ <wsdl:input name="addNumbers">
<soap:body use="literal"/>
</wsdl:input>
- <wsdl:output name="addNumbers2Response">
+ <wsdl:output name="addNumbersResponse">
<soap:body use="literal"/>
</wsdl:output>
+ <wsdl:fault name="AddNumbersException">
+ <soap:fault name="AddNumbersException" use="literal"/>
+ </wsdl:fault>
</wsdl:operation>
<wsdl:operation name="addNumbers3">
<soap:operation soapAction="" style="document"/>
@@ -141,17 +127,14 @@
<soap:fault name="AddNumbersException" use="literal"/>
</wsdl:fault>
</wsdl:operation>
- <wsdl:operation name="addNumbers">
+ <wsdl:operation name="addNumbers2">
<soap:operation soapAction="" style="document"/>
- <wsdl:input name="addNumbers">
+ <wsdl:input name="addNumbers2">
<soap:body use="literal"/>
</wsdl:input>
- <wsdl:output name="addNumbersResponse">
+ <wsdl:output name="addNumbers2Response">
<soap:body use="literal"/>
</wsdl:output>
- <wsdl:fault name="AddNumbersException">
- <soap:fault name="AddNumbersException" use="literal"/>
- </wsdl:fault>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="AddNumbersImplService">
@@ -159,4 +142,5 @@
<soap:address location="http://localhost:9090/AddNumbersImplPort"/>
</wsdl:port>
</wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
+ <wsp:Policy wsu:Id="AddNumbersImplServiceSoapBinding_WSAM_Addressing_Policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"><wsam:Addressing wsp:Optional="true"><wsp:Policy/></wsam:Addressing></wsp:Policy>
+</wsdl:definitions>