cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r811191 - in /cxf/branches/2.2.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 00:44:45 GMT
Author: dkulp
Date: Fri Sep  4 00:44:45 2009
New Revision: 811191

URL: http://svn.apache.org/viewvc?rev=811191&view=rev
Log:
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.2.x-fixes/testutils/src/main/resources/wsdl/hello_world_ref-options
      - copied unchanged from r811148, cxf/trunk/testutils/src/main/resources/wsdl/hello_world_ref-options
    cxf/branches/2.2.x-fixes/testutils/src/main/resources/wsdl/hello_world_ref.wsdl
      - copied unchanged from r811148, cxf/trunk/testutils/src/main/resources/wsdl/hello_world_ref.wsdl
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
    cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
    cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/Server.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  4 00:44:45 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,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
 4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803174,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631,806633,806638,806687,806876,806922,806979-806982,807181,807205,807295,807748,807807,808035,808069,808085,808107,808464,808488,808731,808885,808925,809082-809083,809162,809190,809417-809626,809631,809663,809706,809738,809962,810090,810143,810349,810376,810513,810526,810927,811013
+/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,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
 4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803174,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631,806633,806638,806687,806876,806922,806979-806982,807181,807205,807295,807748,807807,808035,808069,808085,808107,808464,808488,808731,808885,808925,809082-809083,809162,809190,809417-809626,809631,809663,809706,809738,809962,810090,810143,810349,810376,810513,810526,810927,811013,811148

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

Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=811191&r1=811190&r2=811191&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
Fri Sep  4 00:44:45 2009
@@ -196,13 +196,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.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java?rev=811191&r1=811190&r2=811191&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
Fri Sep  4 00:44:45 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.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/Server.java?rev=811191&r1=811190&r2=811191&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/Server.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jaxws/Server.java
Fri Sep  4 00:44:45 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",



Mime
View raw message