Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 16476 invoked from network); 4 Sep 2009 01:21:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Sep 2009 01:21:13 -0000 Received: (qmail 87334 invoked by uid 500); 4 Sep 2009 01:21:12 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 87254 invoked by uid 500); 4 Sep 2009 01:21:12 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 87245 invoked by uid 99); 4 Sep 2009 01:21:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Sep 2009 01:21:12 +0000 X-ASF-Spam-Status: No, hits=-1998.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Sep 2009 01:21:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A2D382388896; Fri, 4 Sep 2009 01:20:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r811197 - in /cxf/branches/2.1.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/ testutils/src/main/resources/wsdl/ Date: Fri, 04 Sep 2009 01:20:50 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090904012050.A2D382388896@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Sep 4 01:20:49 2009 New Revision: 811197 URL: http://svn.apache.org/viewvc?rev=811197&view=rev Log: Merged revisions 811191 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes ................ r811191 | dkulp | 2009-09-03 20:44:45 -0400 (Thu, 03 Sep 2009) | 9 lines Merged revisions 811148 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r811148 | dkulp | 2009-09-03 17:56:08 -0400 (Thu, 03 Sep 2009) | 1 line [CXF-2419] Fix runtime problems with mismatch wsdl and jaxws frontend ........ ................ Added: cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/hello_world_ref-options - copied unchanged from r811191, cxf/branches/2.2.x-fixes/testutils/src/main/resources/wsdl/hello_world_ref-options cxf/branches/2.1.x-fixes/testutils/src/main/resources/wsdl/hello_world_ref.wsdl - copied unchanged from r811191, cxf/branches/2.2.x-fixes/testutils/src/main/resources/wsdl/hello_world_ref.wsdl Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/Server.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 4 01:20:49 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,797452-797453,797460,797463-797464,797521-797522,797584-797585,797645,797652,797701,797884,797886,798348-798350,798568,798574-798575,798577-798578,798586,798608,798655,798752,798942,799444,799449,799738,799740,800514-800516,801382-801384,803960,803962,803979,804005,805925-805927,805929,806606,806612,806617,806662,808478,808484,808491,808495,808505,808527,808533-808534,808536,808539,809693,809717,809748,809784,809787-809801,810203-810224,810231,810236,810509-810510,810515,810527,810970,811016,811045 -/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,797231-797233,797442,797505,797517,797581-797582,797640,797651,797699,797882-797883,798344-798346,798479,798533,798551,798557,798561-798562,798570,798573,798584,798654,798749,798929,799439,799448,799637,799724,799792,800453,800497,801380-801381,802892,803129,803689,804002,804276,805784,805907,805909,806020-806021,806405,806576,806603-806604,806631,806633,806922,807748,807807,808035,808069,808085,808731,809083,809162,809417-809626,809631,809663,809706,809738,809962,810349,810376,810513,810526,810927,811013 +/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-797453,797460,797463-797464,797521-797522,797584-797585,797645,797652,797701,797884,797886,798348-798350,798568,798574-798575,798577-798578,798586,798608,798655,798752,798942,799444,799449,799738,799740,800514-800516,801382-801384,803960,803962,803979,804005,805925-805927,805929,806606,806612,806617,806662,808478,808484,808491,808495,808505,808527,808533-808534,808536,808539,809693,809717,809748,809784,809787-809801,810203-810224,810231,810236,810509-810510,810515,810527,810970,811016,811045,811191 +/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,797231-797233,797442,797505,797517,797581-797582,797640,797651,797699,797882-797883,798344-798346,798479,798533,798551,798557,798561-798562,798570,798573,798584,798654,798749,798929,799439,799448,799637,799724,799792,800453,800497,801380-801381,802892,803129,803689,804002,804276,805784,805907,805909,806020-806021,806405,806576,806603-806604,806631,806633,806922,807748,807807,808035,808069,808085,808731,809083,809162,809417-809626,809631,809663,809706,809738,809962,810349,810376,810513,810526,810927,811013,811148 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=811197&r1=811196&r2=811197&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Fri Sep 4 01:20:49 2009 @@ -210,13 +210,13 @@ o.setProperty(METHOD, method); initializeWrapping(o, method); - bindOperation(o, method); - // rpc out-message-part-info class mapping Operation op = (Operation)o.getProperty(WSDLServiceBuilder.WSDL_OPERATION); initializeClassInfo(o, method, op == null ? null : CastUtils.cast(op.getParameterOrdering(), String.class)); + + bindOperation(o, method); } protected void bindOperation(OperationInfo op, Method method) { Modified: cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java?rev=811197&r1=811196&r2=811197&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java (original) +++ cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java Fri Sep 4 01:20:49 2009 @@ -103,7 +103,13 @@ assertTrue("server did not launch correctly", launchServer(Server.class)); } - + @Test + public void testCXF2419() { + org.apache.cxf.hello_world.elrefs.SOAPService serv + = new org.apache.cxf.hello_world.elrefs.SOAPService(); + assertEquals("Hello CXF", serv.getSoapPort().greetMe("CXF")); + } + @Test public void testBase64() throws URISyntaxException { URL wsdl = getClass().getResource("/wsdl/others/dynamic_client_base64.wsdl"); Modified: cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/Server.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/Server.java?rev=811197&r1=811196&r2=811197&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/Server.java (original) +++ cxf/branches/2.1.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/Server.java Fri Sep 4 01:20:49 2009 @@ -51,6 +51,10 @@ address = "http://localhost:9000/SoapContext/SoapPort"; Endpoint.publish(address, implementor); + implementor = new RefGreeterImpl(); + address = "http://localhost:9000/SoapContext/SoapPort2"; + Endpoint.publish(address, implementor); + //publish port with soap12 binding address = "http://localhost:9009/SoapContext/SoapPort"; @@ -68,6 +72,7 @@ address = "http://localhost:9015/SoapContext/SoapPort"; Endpoint.publish(address, implementor); } + @WebService(endpointInterface = "org.apache.hello_world_soap_http.Greeter", targetNamespace = "http://apache.org/hello_world_soap_http") public class Greeter12Impl extends BaseGreeterImpl { @@ -86,7 +91,21 @@ } } - + @WebService(serviceName = "SOAPService", + portName = "SoapPort", + endpointInterface = "org.apache.cxf.hello_world.elrefs.Greeter", + targetNamespace = "http://apache.org/hello_world_soap_http", + wsdlLocation = "testutils/hello_world_ref.wsdl") + public class RefGreeterImpl implements org.apache.cxf.hello_world.elrefs.Greeter { + public String greetMe(String requestType) { + return "Hello " + requestType; + } + + public String sayHi() { + return "hi"; + } + } + @WebService(serviceName = "SOAPServiceBogusAddressTest", portName = "SoapPort", endpointInterface = "org.apache.hello_world_soap_http.Greeter",