Author: dkulp Date: Fri Jul 24 14:19:14 2009 New Revision: 797472 URL: http://svn.apache.org/viewvc?rev=797472&view=rev Log: Merged revisions 797452 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r797452 | dkulp | 2009-07-24 09:48:17 -0400 (Fri, 24 Jul 2009) | 10 lines 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.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java cxf/branches/2.1.x-fixes/systests/src/test/resources/wsdl/mtom.wsdl cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/others/hello.wsdl Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 24 14:19:14 2009 @@ -1,2 +1,2 @@ -/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449 -/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780 +/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452 +/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194 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/jaxws/ClientServerRPCLitDefatulAnnoTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java?rev=797472&r1=797471&r2=797472&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java (original) +++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java Fri Jul 24 14:19:14 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.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java?rev=797472&r1=797471&r2=797472&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java (original) +++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java Fri Jul 24 14:19:14 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.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java?rev=797472&r1=797471&r2=797472&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java (original) +++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java Fri Jul 24 14:19:14 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.1.x-fixes/systests/src/test/resources/wsdl/mtom.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/resources/wsdl/mtom.wsdl?rev=797472&r1=797471&r2=797472&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/src/test/resources/wsdl/mtom.wsdl (original) +++ cxf/branches/2.1.x-fixes/systests/src/test/resources/wsdl/mtom.wsdl Fri Jul 24 14:19:14 2009 @@ -98,7 +98,7 @@ <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> Modified: cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/others/hello.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/others/hello.wsdl?rev=797472&r1=797471&r2=797472&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/others/hello.wsdl (original) +++ cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/others/hello.wsdl Fri Jul 24 14:19:14 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>
