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 2009/03/30 16:47:44 UTC
svn commit: r759994 - in /cxf/branches/2.1.x-fixes: ./
systests/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java
testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java
testutils/src/main/resources/wsdl/greeter_control.wsdl
Author: dkulp
Date: Mon Mar 30 14:47:44 2009
New Revision: 759994
URL: http://svn.apache.org/viewvc?rev=759994&view=rev
Log:
Merged revisions 759963 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r759963 | dkulp | 2009-03-30 09:35:53 -0400 (Mon, 30 Mar 2009) | 2 lines
Fix randomly failing test
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java
cxf/branches/2.1.x-fixes/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java
cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/greeter_control.wsdl
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 30 14:47:44 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,759961
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,759961,759963
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java?rev=759994&r1=759993&r2=759994&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java (original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/clustering/ControlImpl.java Mon Mar 30 14:47:44 2009
@@ -103,4 +103,14 @@
// never called
return null;
}
+
+ public Response<?> setFaultLocationAsync(FaultLocation in) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Future<?> setFaultLocationAsync(FaultLocation in, AsyncHandler<?> asyncHandler) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified: cxf/branches/2.1.x-fixes/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java?rev=759994&r1=759993&r2=759994&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java (original)
+++ cxf/branches/2.1.x-fixes/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java Mon Mar 30 14:47:44 2009
@@ -159,6 +159,16 @@
endpointInterface = "org.apache.cxf.greeter_control.Greeter",
targetNamespace = "http://cxf.apache.org/greeter_control")
class GreeterImpl extends AbstractGreeterImpl {
+ }
+
+ public Response<?> setFaultLocationAsync(FaultLocation in) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Future<?> setFaultLocationAsync(FaultLocation in, AsyncHandler<?> asyncHandler) {
+ // TODO Auto-generated method stub
+ return null;
}
}
Modified: cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/greeter_control.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/greeter_control.wsdl?rev=759994&r1=759993&r2=759994&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/greeter_control.wsdl (original)
+++ cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/greeter_control.wsdl Mon Mar 30 14:47:44 2009
@@ -155,6 +155,8 @@
<wsdl:message name="setFaultLocationRequest">
<wsdl:part element="x1:faultLocation" name="in"/>
</wsdl:message>
+ <wsdl:message name="setFaultLocationResponse">
+ </wsdl:message>
<wsdl:portType name="Greeter">
<wsdl:operation name="sayHi">
@@ -191,6 +193,7 @@
<wsdl:operation name="setFaultLocation">
<wsdl:input message="tns:setFaultLocationRequest" name="setFaultLocationRequest"/>
+ <wsdl:output message="tns:setFaultLocationResponse" name="setFaultLocationResponse"/>
</wsdl:operation>
</wsdl:portType>
@@ -264,6 +267,9 @@
<wsdl:input name="setFaultLocationRequest">
<soap:body use="literal"/>
</wsdl:input>
+ <wsdl:output name="setFaultLocationResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
</wsdl:operation>
</wsdl:binding>