cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1100899 - in /cxf/branches/2.3.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/ rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/ rt/frontend/jaxws/src/test/resources/soapheader_rpc_provider/ testutils/src/main/java...
Date Mon, 09 May 2011 07:04:28 GMT
Author: ema
Date: Mon May  9 07:04:27 2011
New Revision: 1100899

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

........
  r1100898 | ema | 2011-05-09 14:49:11 +0800 (Mon, 09 May 2011) | 1 line
  
  [CXF-3502]:Fix IllegalArgumentException: wrong number of arguments with Dispatch/Provider
service
........

Added:
    cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/ProviderHeaderClientServerTest.java
      - copied unchanged from r1100898, cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/ProviderHeaderClientServerTest.java
    cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/TestRPCHeaderProvider.java
      - copied unchanged from r1100898, cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/TestRPCHeaderProvider.java
    cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/resources/soapheader_rpc_provider/
      - copied from r1100898, cxf/trunk/rt/frontend/jaxws/src/test/resources/soapheader_rpc_provider/
    cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/resources/soapheader_rpc_provider/sayHelloMsg.xml
      - copied unchanged from r1100898, cxf/trunk/rt/frontend/jaxws/src/test/resources/soapheader_rpc_provider/sayHelloMsg.xml
    cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/resources/soapheader_rpc_provider/sayHelloResponseMsg.xml
      - copied unchanged from r1100898, cxf/trunk/rt/frontend/jaxws/src/test/resources/soapheader_rpc_provider/sayHelloResponseMsg.xml
Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
    cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java
    cxf/branches/2.3.x-fixes/testutils/src/main/java/org/apache/header_test/rpc/TestRPCHeaderImpl.java
    cxf/branches/2.3.x-fixes/testutils/src/main/resources/wsdl/soapheader_rpc.wsdl
    cxf/branches/2.3.x-fixes/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May  9 07:04:27 2011
@@ -1 +1 @@
-/cxf/trunk:1099767
+/cxf/trunk:1099767,1100898

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

Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java?rev=1100899&r1=1100898&r2=1100899&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/DocLiteralInInterceptor.java
Mon May  9 07:04:27 2011
@@ -199,7 +199,13 @@ public class DocLiteralInInterceptor ext
                     }
     
                     o = dr.read(p, xmlReader);
-                    parameters.put(p, o);
+                    if (Boolean.TRUE.equals(si.getProperty("soap.force.doclit.bare")) 
+                        && parameters.isEmpty()) {
+                        // webservice provider does not need to ensure size
+                        parameters.add(o);
+                    } else {
+                        parameters.put(p, o);
+                    }
                     
                     paramNum++;
                     if (message.getContent(XMLStreamReader.class) == null || o == xmlReader)
{

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java?rev=1100899&r1=1100898&r2=1100899&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java
Mon May  9 07:04:27 2011
@@ -259,7 +259,7 @@ public class HeaderClientServerTest exte
             header.setHeaderVal("header");
             
             for (int idx = 0; idx < 2; idx++) {
-                String returnVal = proxy.testHeader1("part", header);
+                String returnVal = proxy.testHeader1(header, "part");
                 assertNotNull(returnVal);
                 assertEquals("part/header", returnVal);
             }

Modified: cxf/branches/2.3.x-fixes/testutils/src/main/java/org/apache/header_test/rpc/TestRPCHeaderImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/testutils/src/main/java/org/apache/header_test/rpc/TestRPCHeaderImpl.java?rev=1100899&r1=1100898&r2=1100899&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/testutils/src/main/java/org/apache/header_test/rpc/TestRPCHeaderImpl.java
(original)
+++ cxf/branches/2.3.x-fixes/testutils/src/main/java/org/apache/header_test/rpc/TestRPCHeaderImpl.java
Mon May  9 07:04:27 2011
@@ -32,7 +32,7 @@ import org.apache.header_test.rpc.types.
             
 public class TestRPCHeaderImpl implements TestRPCHeader {
 
-    public String testHeader1(String in, HeaderMessage inHeader) {
+    public String testHeader1(HeaderMessage inHeader, String in) {
         if (in == null || inHeader == null) {
             throw new IllegalArgumentException("TestHeader1 part not found.");
         }

Modified: cxf/branches/2.3.x-fixes/testutils/src/main/resources/wsdl/soapheader_rpc.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/testutils/src/main/resources/wsdl/soapheader_rpc.wsdl?rev=1100899&r1=1100898&r2=1100899&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/testutils/src/main/resources/wsdl/soapheader_rpc.wsdl (original)
+++ cxf/branches/2.3.x-fixes/testutils/src/main/resources/wsdl/soapheader_rpc.wsdl Mon May
 9 07:04:27 2011
@@ -30,8 +30,8 @@
         </schema>
     </wsdl:types>
     <wsdl:message name="testHeader1Request">
-        <wsdl:part name="in" type="xsd:string"/>
         <wsdl:part name="inHeader" element="x1:headerMessage"/>
+        <wsdl:part name="in" type="xsd:string"/>       
     </wsdl:message>
     <wsdl:message name="testHeader1Response">
         <wsdl:part name="out" type="xsd:string"/>

Modified: cxf/branches/2.3.x-fixes/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java?rev=1100899&r1=1100898&r2=1100899&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java
(original)
+++ cxf/branches/2.3.x-fixes/testutils/src/test/java/org/apache/cxf/testutils/header_test/rpc/TestRPCHeaderTest.java
Mon May  9 07:04:27 2011
@@ -38,9 +38,9 @@ public class TestRPCHeaderTest extends A
             if ("testHeader1".equals(m.getName())) {
                 Annotation annotations[][] = m.getParameterAnnotations();
                 assertEquals(2, annotations.length);
-                assertEquals(1, annotations[1].length);
-                assertTrue(annotations[1][0] instanceof WebParam);
-                WebParam parm = (WebParam)annotations[1][0];
+                assertEquals(1, annotations[0].length);
+                assertTrue(annotations[0][0] instanceof WebParam);
+                WebParam parm = (WebParam)annotations[0][0];
                 assertEquals("http://apache.org/header_test/rpc/types", parm.targetNamespace());
                 assertEquals("inHeader", parm.partName());
                 assertEquals("headerMessage", parm.name());



Mime
View raw message