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/07/24 15:48:17 UTC

svn commit: r797452 - in /cxf/branches/2.2.x-fixes: ./ systests/src/test/java/org/apache/cxf/systest/jaxws/ systests/src/test/java/org/apache/cxf/systest/mtom_bindingtype/ systests/src/test/java/org/apache/cxf/systest/mtom_feature/ systests/src/test/re...

Author: dkulp
Date: Fri Jul 24 13:48:17 2009
New Revision: 797452

URL: http://svn.apache.org/viewvc?rev=797452&view=rev
Log:
Merged revisions 797194 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r797194 | peterjones | 2009-07-23 15:16:01 -0400 (Thu, 23 Jul 2009) | 3 lines
  
  [CXF-2347] Changed port of systests which use port 9090 to port 9091.
  Port 9090 is used by the WebSM service on aix which causes a port conflict.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java
    cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java
    cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java
    cxf/branches/2.2.x-fixes/systests/src/test/resources/wsdl_systest/mtom.wsdl
    cxf/branches/2.2.x-fixes/testutils/src/main/resources/wsdl/others/hello.wsdl

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 24 13:48:17 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java?rev=797452&r1=797451&r2=797452&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java (original)
+++ cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java Fri Jul 24 13:48:17 2009
@@ -33,7 +33,7 @@
 
         protected void run() {
             Object implementor = new HelloImpl();
-            String address = "http://localhost:9090/hello";
+            String address = "http://localhost:9091/hello";
             Endpoint.publish(address, implementor);
         }
 

Modified: cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java?rev=797452&r1=797451&r2=797452&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java (original)
+++ cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java Fri Jul 24 13:48:17 2009
@@ -27,7 +27,7 @@
 
     protected void run()  {    
         Object implementor = new HelloImpl();
-        String address = "http://localhost:9090/jaxws-mtom/hello";
+        String address = "http://localhost:9091/jaxws-mtom/hello";
         Endpoint.publish(address, implementor);
     }
 

Modified: cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java?rev=797452&r1=797451&r2=797452&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java (original)
+++ cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java Fri Jul 24 13:48:17 2009
@@ -27,7 +27,7 @@
 
     protected void run()  {    
         Object implementor = new HelloImpl();
-        String address = "http://localhost:9090/jaxws-mtom/hello";
+        String address = "http://localhost:9091/jaxws-mtom/hello";
         Endpoint.publish(address, implementor);
     }
 

Modified: cxf/branches/2.2.x-fixes/systests/src/test/resources/wsdl_systest/mtom.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/src/test/resources/wsdl_systest/mtom.wsdl?rev=797452&r1=797451&r2=797452&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/src/test/resources/wsdl_systest/mtom.wsdl (original)
+++ cxf/branches/2.2.x-fixes/systests/src/test/resources/wsdl_systest/mtom.wsdl Fri Jul 24 13:48:17 2009
@@ -98,8 +98,8 @@
 
     <wsdl:service name="HelloService">
 	<wsdl:port name="HelloPort" binding="tns:HelloBinding">
-	    <soap:address location="http://localhost:9090/jaxws-mtom/hello"></soap:address>
+	    <soap:address location="http://localhost:9091/jaxws-mtom/hello"></soap:address>
 	</wsdl:port>
     </wsdl:service>
 
-</wsdl:definitions>
\ No newline at end of file
+</wsdl:definitions>

Modified: cxf/branches/2.2.x-fixes/testutils/src/main/resources/wsdl/others/hello.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/testutils/src/main/resources/wsdl/others/hello.wsdl?rev=797452&r1=797451&r2=797452&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/testutils/src/main/resources/wsdl/others/hello.wsdl (original)
+++ cxf/branches/2.2.x-fixes/testutils/src/main/resources/wsdl/others/hello.wsdl Fri Jul 24 13:48:17 2009
@@ -48,7 +48,7 @@
   </wsdl:binding>
   <wsdl:service name="HelloService">
     <wsdl:port name="HelloPort" binding="ns1:HelloServiceSoapBinding">
-      <soap:address location="http://localhost:9090/hello"/>
+      <soap:address location="http://localhost:9091/hello"/>
     </wsdl:port>
   </wsdl:service>
-</wsdl:definitions> 
\ No newline at end of file
+</wsdl:definitions>