Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 974DB4F55 for ; Mon, 9 May 2011 07:04:57 +0000 (UTC) Received: (qmail 27785 invoked by uid 500); 9 May 2011 07:04:56 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 27682 invoked by uid 500); 9 May 2011 07:04:54 -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 27675 invoked by uid 99); 9 May 2011 07:04:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 May 2011 07:04:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Mon, 09 May 2011 07:04:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8DF9C23889E7; Mon, 9 May 2011 07:04:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@cxf.apache.org From: ema@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110509070428.8DF9C23889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ - + 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());