From richarddavis@example.net Mon Jun 01 01:16:01 2009 Return-Path: <richarddavis@example.net> Delivered-To: richarddavis@example.net Received: (qmail 54529 invoked from network); 1 Jun 2009 01:16:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jun 2009 01:16:00 -0000 Received: (qmail 94774 invoked by uid 500); 1 Jun 2009 01:16:12 -0000 Delivered-To: richarddavis@example.net Received: (qmail 94683 invoked by uid 500); 1 Jun 2009 01:16:12 -0000 Mailing-List: contact richarddavis@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:richarddavis@example.net> List-Unsubscribe: <mailto:richarddavis@example.net> List-Post: <mailto:richarddavis@example.net> List-Id: <commits.cxf.apache.org> Reply-To: richarddavis@example.net Delivered-To: mailing list richarddavis@example.net Received: (qmail 94674 invoked by uid 99); 1 Jun 2009 01:16:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 01:16:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 01:16:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8AC98238889B; Mon, 1 Jun 2009 01:15:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780544 - in /cxf/trunk: distribution/src/main/release/samples/aegis/ distribution/src/main/release/samples/aegis/src/demo/hw/server/ rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ rt/databinding/aegis/src/test/java/or... Date: Mon, 01 Jun 2009 01:15:50 -0000 To: richarddavis@example.net From: richarddavis@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <richarddavis@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: bimargulies Date: Mon Jun 1 01:15:49 2009 New Revision: 780544 URL: http://svn.apache.org/viewvc?rev=780544&view=rev Log: CXF-2249. Change the name of the param in the aegis sample. Modified: cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/hw/server/HelloWorld.aegis.xml cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.aegis.xml cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java Modified: cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml?rev=780544&r1=780543&r2=780544&view=diff ============================================================================== --- cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml (original) +++ cxf/trunk/distribution/src/main/release/samples/aegis/pom.xml Mon Jun 1 01:15:49 2009 @@ -26,6 +26,11 @@ <cxf.version>[2,)</cxf.version> </properties> <build> + <resources> + <resource> + <directory>src</directory> + </resource> + </resources> <sourceDirectory>src</sourceDirectory> <plugins> <plugin> Modified: cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/hw/server/HelloWorld.aegis.xml URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/hw/server/HelloWorld.aegis.xml?rev=780544&r1=780543&r2=780544&view=diff ============================================================================== --- cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/hw/server/HelloWorld.aegis.xml (original) +++ cxf/trunk/distribution/src/main/release/samples/aegis/src/demo/hw/server/HelloWorld.aegis.xml Mon Jun 1 01:15:49 2009 @@ -20,7 +20,7 @@ <mappings> <mapping name="HelloWorld"> <method name="sayHi"> - <parameter index="0" name="greeting" nillable='false' /> + <parameter index="0" mappedName="greeting" nillable='false' /> </method> </mapping> </mappings> Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java?rev=780544&r1=780543&r2=780544&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java (original) +++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java Mon Jun 1 01:15:49 2009 @@ -62,6 +62,19 @@ + "/xsd:complexType[@name='unmappedAdd']" + "/xsd:sequence" + "/xsd:element[@name='one']", doc); } + + @Test + public void testNamedParameter() throws Exception { + Node doc = getWSDLDocument("ArrayService"); + Definition def = getWSDLDefinition("ArrayService"); + StringWriter sink = new StringWriter(); + WSDLFactory.newInstance().newWSDLWriter().writeWSDL(def, sink); + assertValid("/wsdl:definitions/wsdl:types/" + + "xsd:schema[@targetNamespace= 'http://services.aegis.cxf.apache.org']" + + "/xsd:complexType[@name='verifyCustomParamName']" + + "/xsd:sequence" + + "/xsd:element[@name='custom']", doc); + } @Test public void testOccursWSDL() throws Exception { Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.aegis.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.aegis.xml?rev=780544&r1=780543&r2=780544&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.aegis.xml (original) +++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.aegis.xml Mon Jun 1 01:15:49 2009 @@ -25,5 +25,8 @@ <method name="takeNumber" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <parameter index="0" typeName="xsd:long"/> </method> + <method name="verifyCustomParamName"> + <parameter index="0" mappedName="custom"/> + </method> </mapping> </mappings> Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java?rev=780544&r1=780543&r2=780544&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java (original) +++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java Mon Jun 1 01:15:49 2009 @@ -76,6 +76,10 @@ } @WebMethod + public void verifyCustomParamName(String param) { + } + + @WebMethod public void submitJDOMArray(String before, org.jdom.Element[] anything, String after) { beforeValue = before; jdomArray = anything; From richarddavis@example.net Mon Jun 01 03:31:28 2009 Return-Path: <richarddavis@example.net> Delivered-To: richarddavis@example.net Received: (qmail 98870 invoked from network); 1 Jun 2009 03:31:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jun 2009 03:31:28 -0000 Received: (qmail 59764 invoked by uid 500); 1 Jun 2009 03:31:40 -0000 Delivered-To: richarddavis@example.net Received: (qmail 59675 invoked by uid 500); 1 Jun 2009 03:31:40 -0000 Mailing-List: contact richarddavis@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:richarddavis@example.net> List-Unsubscribe: <mailto:richarddavis@example.net> List-Post: <mailto:richarddavis@example.net> List-Id: <commits.cxf.apache.org> Reply-To: richarddavis@example.net Delivered-To: mailing list richarddavis@example.net Received: (qmail 59666 invoked by uid 99); 1 Jun 2009 03:31:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 03:31:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 03:31:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D4A2223888A2; Mon, 1 Jun 2009 03:31:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780549 - in /cxf/branches/2.1.x-fixes: ./ rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd Date: Mon, 01 Jun 2009 03:31:15 -0000 To: richarddavis@example.net From: richarddavis@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <richarddavis@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Mon Jun 1 03:31:13 2009 New Revision: 780549 URL: http://svn.apache.org/viewvc?rev=780549&view=rev Log: Merged revisions 780033 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r780033 | sergeyb | 2009-05-30 01:00:52 +0800 (Sat, 30 May 2009) | 1 line JAXRS: removing unused elements and attributes in jaxrs schema definitions ........ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 1 03:31:13 2009 @@ -1 +1 @@ -/cxf/trunk: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,780184 +/cxf/trunk: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,780033,780184 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd?rev=780549&r1=780548&r2=780549&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd Mon Jun 1 03:31:13 2009 @@ -34,7 +34,6 @@ <xsd:complexContent> <xsd:extension base="beans:identifiedType"> <xsd:all> - <xsd:element name="binding" type="xsd:anyType" minOccurs="0"/> <xsd:element name="executor" type="xsd:anyType" minOccurs="0"/> <xsd:element name="features" type="xsd:anyType" minOccurs="0"/> <xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"/> @@ -44,7 +43,6 @@ <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"/> <xsd:element name="properties" type="beans:mapType" minOccurs="0"/> <xsd:element name="serviceBeans" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="serviceFactory" type="xsd:anyType" minOccurs="0"/> <xsd:element name="providers" type="xsd:anyType" minOccurs="0"/> <xsd:element name="extensionMappings" type="xsd:anyType" minOccurs="0"/> <xsd:element name="languageMappings" type="xsd:anyType" minOccurs="0"/> @@ -52,13 +50,9 @@ </xsd:all> <xsd:attributeGroup ref="cxf-beans:beanAttributes"/> <xsd:attribute name="address" type="xsd:string" /> - <xsd:attribute name="bindingId" type="xsd:string" /> <xsd:attribute name="bus" type="xsd:string" /> <xsd:attribute name="serviceClass" type="xsd:string"/> <xsd:attribute name="serviceBeans" type="xsd:string"/> - <xsd:attribute name="transportId" type="xsd:string"/> - <xsd:attribute name="endpointName" type="xsd:QName" /> - <xsd:attribute name="serviceName" type="xsd:QName" /> <xsd:attribute name="staticSubresourceResolution" type="xsd:boolean" /> </xsd:extension> </xsd:complexContent> @@ -74,7 +68,6 @@ <xsd:element name="features" type="xsd:anyType" minOccurs="0"/> <xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"/> <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"/> - <xsd:element name="invoker" type="xsd:anyType" minOccurs="0"/> <xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0"/> <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"/> <xsd:element name="properties" type="beans:mapType" minOccurs="0"/> From richarddavis@example.net Mon Jun 01 03:37:06 2009 Return-Path: <richarddavis@example.net> Delivered-To: richarddavis@example.net Received: (qmail 1299 invoked from network); 1 Jun 2009 03:37:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jun 2009 03:37:06 -0000 Received: (qmail 63080 invoked by uid 500); 1 Jun 2009 03:37:18 -0000 Delivered-To: richarddavis@example.net Received: (qmail 62972 invoked by uid 500); 1 Jun 2009 03:37:18 -0000 Mailing-List: contact richarddavis@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:richarddavis@example.net> List-Unsubscribe: <mailto:richarddavis@example.net> List-Post: <mailto:richarddavis@example.net> List-Id: <commits.cxf.apache.org> Reply-To: richarddavis@example.net Delivered-To: mailing list richarddavis@example.net Received: (qmail 62963 invoked by uid 99); 1 Jun 2009 03:37:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 03:37:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 03:37:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 16B2823888DB; Mon, 1 Jun 2009 03:36:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780552 - in /cxf/branches/2.1.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ rt/frontend/jaxrs/src/main/resources/schemas/ Date: Mon, 01 Jun 2009 03:36:53 -0000 To: richarddavis@example.net From: richarddavis@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <richarddavis@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Mon Jun 1 03:36:53 2009 New Revision: 780552 URL: http://svn.apache.org/viewvc?rev=780552&view=rev Log: Merged revisions 780213 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r780213 | ningjiang | 2009-05-30 17:18:58 +0800 (Sat, 30 May 2009) | 1 line CXF-2247 added the support of setting the ServiceClass from <jaxrs:server> ........ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/InvocationHandlerAware.java cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 1 03:36:53 2009 @@ -1 +1 @@ -/cxf/trunk: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,780033,780184 +/cxf/trunk: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,780033,780184,780213 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java?rev=780552&r1=780551&r2=780552&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java Mon Jun 1 03:36:53 2009 @@ -144,6 +144,10 @@ public List<Class> getResourceClasses() { return serviceFactory.getResourceClasses(); } + + public void setServiceClass(Class clazz) { + serviceFactory.setResourceClasses(clazz); + } public void setResourceClasses(List<Class> classes) { serviceFactory.setResourceClasses(classes); Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/InvocationHandlerAware.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/InvocationHandlerAware.java?rev=780552&r1=780551&r2=780552&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/InvocationHandlerAware.java (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/InvocationHandlerAware.java Mon Jun 1 03:36:53 2009 @@ -19,8 +19,8 @@ package org.apache.cxf.jaxrs.client; /** - * Utiliy interface which helps to retrieve - * the invoiation handler from a CGLIB proxy + * Utility interface which helps to retrieve + * the invocation handler from a CGLIB proxy * */ public interface InvocationHandlerAware { Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd?rev=780552&r1=780551&r2=780552&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd Mon Jun 1 03:36:53 2009 @@ -42,7 +42,7 @@ <xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0"/> <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"/> <xsd:element name="properties" type="beans:mapType" minOccurs="0"/> - <xsd:element name="serviceBeans" type="xsd:anyType" minOccurs="0"/> + <xsd:element name="serviceBeans" type="xsd:anyType" minOccurs="0"/> <xsd:element name="providers" type="xsd:anyType" minOccurs="0"/> <xsd:element name="extensionMappings" type="xsd:anyType" minOccurs="0"/> <xsd:element name="languageMappings" type="xsd:anyType" minOccurs="0"/> @@ -51,8 +51,7 @@ <xsd:attributeGroup ref="cxf-beans:beanAttributes"/> <xsd:attribute name="address" type="xsd:string" /> <xsd:attribute name="bus" type="xsd:string" /> - <xsd:attribute name="serviceClass" type="xsd:string"/> - <xsd:attribute name="serviceBeans" type="xsd:string"/> + <xsd:attribute name="serviceClass" type="xsd:string"/> <xsd:attribute name="staticSubresourceResolution" type="xsd:boolean" /> </xsd:extension> </xsd:complexContent> From richarddavis@example.net Mon Jun 01 07:24:34 2009 Return-Path: <richarddavis@example.net> Delivered-To: richarddavis@example.net Received: (qmail 86628 invoked from network); 1 Jun 2009 07:24:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jun 2009 07:24:34 -0000 Received: (qmail 6054 invoked by uid 500); 1 Jun 2009 07:24:46 -0000 Delivered-To: richarddavis@example.net Received: (qmail 5971 invoked by uid 500); 1 Jun 2009 07:24:46 -0000 Mailing-List: contact richarddavis@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:richarddavis@example.net> List-Unsubscribe: <mailto:richarddavis@example.net> List-Post: <mailto:richarddavis@example.net> List-Id: <commits.cxf.apache.org> Reply-To: richarddavis@example.net Delivered-To: mailing list richarddavis@example.net Received: (qmail 5962 invoked by uid 99); 1 Jun 2009 07:24:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 07:24:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 07:24:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E704723888D2; Mon, 1 Jun 2009 07:24:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780576 - in /cxf/branches/2.1.x-fixes: ./ rt/frontend/jaxrs/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/ rt/frontend/jaxrs/src/main/resources/schemas/ rt/fronten... Date: Mon, 01 Jun 2009 07:24:11 -0000 To: richarddavis@example.net From: richarddavis@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <richarddavis@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Mon Jun 1 07:24:10 2009 New Revision: 780576 URL: http://svn.apache.org/viewvc?rev=780576&view=rev Log: Merged revisions 780421 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r780421 | ningjiang | 2009-05-31 20:33:53 +0800 (Sun, 31 May 2009) | 1 line CXF-2248 Added the unit tests for the spring configuration of JAXRSServerFactoryBean and JAXRSClientFactoryBean ........ Added: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java - copied unchanged from r780421, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/ - copied from r780421, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanTest.java - copied unchanged from r780421, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanTest.java cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java - copied, changed from r780421, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml - copied unchanged from r780421, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/resources.xml - copied unchanged from r780421, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/resources.xml cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml - copied, changed from r780421, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 1 07:24:10 2009 @@ -1 +1 @@ -/cxf/trunk: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,780033,780184,780213 +/cxf/trunk: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,780033,780184,780213,780421 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml?rev=780576&r1=780575&r2=780576&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml Mon Jun 1 07:24:10 2009 @@ -138,7 +138,13 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-local</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.xmlbeans</groupId> <artifactId>xmlbeans</artifactId> </dependency> Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java?rev=780576&r1=780575&r2=780576&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactoryBean.java Mon Jun 1 07:24:10 2009 @@ -59,7 +59,7 @@ return username; } - public void setUsername(String username) { + public void setUsername(String username) { this.username = username; } @@ -95,6 +95,10 @@ } } + public Map getHeaders() { + return headers; + } + public WebClient createWebClient() { Service service = new JAXRSServiceImpl(getAddress()); Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java?rev=780576&r1=780575&r2=780576&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSClientFactoryBeanDefinitionParser.java Mon Jun 1 07:24:10 2009 @@ -70,9 +70,7 @@ Map map = ctx.getDelegate().parseMapElement(el, bean.getBeanDefinition()); bean.addPropertyValue(name, map); } else if ("executor".equals(name)) { - setFirstChildAsProperty(el, ctx, bean, "serviceFactory.executor"); - } else if ("invoker".equals(name)) { - setFirstChildAsProperty(el, ctx, bean, "serviceFactory.invoker"); + setFirstChildAsProperty(el, ctx, bean, "serviceFactory.executor"); } else if ("binding".equals(name)) { setFirstChildAsProperty(el, ctx, bean, "bindingConfig"); } else if ("inInterceptors".equals(name) || "inFaultInterceptors".equals(name) Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java?rev=780576&r1=780575&r2=780576&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java Mon Jun 1 07:24:10 2009 @@ -21,8 +21,6 @@ import java.util.List; import java.util.Map; -import javax.xml.namespace.QName; - import org.w3c.dom.Element; import org.apache.cxf.Bus; @@ -42,7 +40,6 @@ - public class JAXRSServerFactoryBeanDefinitionParser extends AbstractBeanDefinitionParser { @@ -53,12 +50,7 @@ @Override protected void mapAttribute(BeanDefinitionBuilder bean, Element e, String name, String val) { - if ("endpointName".equals(name) || "serviceName".equals(name)) { - QName q = parseQName(e, val); - bean.addPropertyValue(name, q); - } else { - mapToProperty(bean, name, val); - } + mapToProperty(bean, name, val); } @Override Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd?rev=780576&r1=780575&r2=780576&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd Mon Jun 1 07:24:10 2009 @@ -36,6 +36,7 @@ <xsd:all> <xsd:element name="executor" type="xsd:anyType" minOccurs="0"/> <xsd:element name="features" type="xsd:anyType" minOccurs="0"/> + <xsd:element name="binding" type="xsd:anyType" minOccurs="0" /> <xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"/> <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"/> <xsd:element name="invoker" type="xsd:anyType" minOccurs="0"/> @@ -52,7 +53,9 @@ <xsd:attribute name="address" type="xsd:string" /> <xsd:attribute name="bus" type="xsd:string" /> <xsd:attribute name="serviceClass" type="xsd:string"/> - <xsd:attribute name="staticSubresourceResolution" type="xsd:boolean" /> + <xsd:attribute name="transportId" type="xsd:string"/> + <xsd:attribute name="bindingId" type="xsd:string" /> + <xsd:attribute name="staticSubresourceResolution" type="xsd:boolean" /> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -65,6 +68,7 @@ <xsd:all> <xsd:element name="executor" type="xsd:anyType" minOccurs="0"/> <xsd:element name="features" type="xsd:anyType" minOccurs="0"/> + <xsd:element name="binding" type="xsd:anyType" minOccurs="0" /> <xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0"/> <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0"/> <xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0"/> @@ -79,6 +83,8 @@ <xsd:attribute name="serviceClass" type="xsd:string"/> <xsd:attribute name="inheritHeaders" type="xsd:boolean"/> <xsd:attribute name="bus" type="xsd:string" /> + <xsd:attribute name="transportId" type="xsd:string"/> + <xsd:attribute name="bindingId" type="xsd:string" /> <xsd:attribute name="username" type="xsd:string"/> <xsd:attribute name="password" type="xsd:string"/> </xsd:extension> Copied: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java (from r780421, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java) URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java?p2=cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java&p1=cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java&r1=780421&r2=780576&rev=780576&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanTest.java Mon Jun 1 07:24:10 2009 @@ -57,10 +57,6 @@ assertNotNull("The provider should not be null", sfb.getProviders()); assertEquals("Get a wrong provider size", sfb.getProviders().size(), 2); - sfb = (JAXRSServerFactoryBean)ctx.getBean("moduleServer"); - assertNotNull("The resource classes should not be null", sfb.getResourceClasses()); - assertEquals("Get a wrong ResourceClasses size", 1, sfb.getResourceClasses().size()); - - + } } Copied: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml (from r780421, cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml) URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml?p2=cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml&p1=cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml&r1=780421&r2=780576&rev=780576&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml Mon Jun 1 07:24:10 2009 @@ -24,14 +24,15 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"> - + <import resource="classpath:META-INF/cxf/cxf.xml"/> + <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml"/> <bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false"> <property name="transportIds"> <list> <value>http://cxf.apache.org/transports/local</value> <value>http://schemas.xmlsoap.org/soap/http</value> - <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> </list> </property> </bean> @@ -62,13 +63,5 @@ <bean id="feed" class="org.apache.cxf.jaxrs.provider.AtomFeedProvider"/> <bean id="entry" class="org.apache.cxf.jaxrs.provider.AtomEntryProvider"/> - <jaxrs:server id="moduleServer" - modelRef="classpath:/org/apache/cxf/jaxrs/spring/resources.xml" - address="http://localhost:8080/simpleWithAddress" - bus="cxf" > - <jaxrs:serviceBeans> - <bean class="org.apache.cxf.jaxrs.resources.BookStoreNoAnnotations"/> - </jaxrs:serviceBeans> - </jaxrs:server> </beans> From richarddavis@example.net Mon Jun 01 14:46:13 2009 Return-Path: <richarddavis@example.net> Delivered-To: richarddavis@example.net Received: (qmail 40728 invoked from network); 1 Jun 2009 14:46:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jun 2009 14:46:09 -0000 Received: (qmail 93078 invoked by uid 500); 1 Jun 2009 14:46:21 -0000 Delivered-To: richarddavis@example.net Received: (qmail 92974 invoked by uid 500); 1 Jun 2009 14:46:21 -0000 Mailing-List: contact richarddavis@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:richarddavis@example.net> List-Unsubscribe: <mailto:richarddavis@example.net> List-Post: <mailto:richarddavis@example.net> List-Id: <commits.cxf.apache.org> Reply-To: richarddavis@example.net Delivered-To: mailing list richarddavis@example.net Received: (qmail 92965 invoked by uid 99); 1 Jun 2009 14:46:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 14:46:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 14:46:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E3AB6238889B; Mon, 1 Jun 2009 14:45:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780664 - in /cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring: clients.xml servers.xml Date: Mon, 01 Jun 2009 14:45:52 -0000 To: richarddavis@example.net From: richarddavis@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <richarddavis@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Mon Jun 1 14:45:52 2009 New Revision: 780664 URL: http://svn.apache.org/viewvc?rev=780664&view=rev Log: CAMEL-2248 Includes the minimal cxf and cxf-extension file for test Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml?rev=780664&r1=780663&r2=780664&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml (original) +++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml Mon Jun 1 14:45:52 2009 @@ -25,6 +25,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"> + <import resource="classpath:META-INF/cxf/cxf.xml"/> + <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml"/> <bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false"> <property name="transportIds"> Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml?rev=780664&r1=780663&r2=780664&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml (original) +++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml Mon Jun 1 14:45:52 2009 @@ -25,6 +25,8 @@ http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"> + <import resource="classpath:META-INF/cxf/cxf.xml"/> + <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml"/> <bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false"> <property name="transportIds"> From richarddavis@example.net Mon Jun 01 14:54:03 2009 Return-Path: <richarddavis@example.net> Delivered-To: richarddavis@example.net Received: (qmail 43544 invoked from network); 1 Jun 2009 14:54:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jun 2009 14:54:01 -0000 Received: (qmail 1732 invoked by uid 500); 1 Jun 2009 14:54:13 -0000 Delivered-To: richarddavis@example.net Received: (qmail 1641 invoked by uid 500); 1 Jun 2009 14:54:13 -0000 Mailing-List: contact richarddavis@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:richarddavis@example.net> List-Unsubscribe: <mailto:richarddavis@example.net> List-Post: <mailto:richarddavis@example.net> List-Id: <commits.cxf.apache.org> Reply-To: richarddavis@example.net Delivered-To: mailing list richarddavis@example.net Received: (qmail 1632 invoked by uid 99); 1 Jun 2009 14:54:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 14:54:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 14:54:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 14B4623888D4; Mon, 1 Jun 2009 14:53:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780670 - in /cxf/branches/2.1.x-fixes: ./ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml Date: Mon, 01 Jun 2009 14:53:41 -0000 To: richarddavis@example.net From: richarddavis@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <richarddavis@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Mon Jun 1 14:53:41 2009 New Revision: 780670 URL: http://svn.apache.org/viewvc?rev=780670&view=rev Log: Merged revisions 780664 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r780664 | ningjiang | 2009-06-01 22:45:52 +0800 (Mon, 01 Jun 2009) | 1 line CAMEL-2248 Includes the minimal cxf and cxf-extension file for test ........ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 1 14:53:41 2009 @@ -1 +1 @@ -/cxf/trunk: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,780033,780184,780213,780421 +/cxf/trunk: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,780033,780184,780213,780421,780664 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml?rev=780670&r1=780669&r2=780670&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/clients.xml Mon Jun 1 14:53:41 2009 @@ -25,6 +25,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"> + <import resource="classpath:META-INF/cxf/cxf.xml"/> + <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml"/> <bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="false"> <property name="transportIds"> Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml?rev=780670&r1=780669&r2=780670&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/spring/servers.xml Mon Jun 1 14:53:41 2009 @@ -24,6 +24,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"> + <import resource="classpath:META-INF/cxf/cxf.xml"/> <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml"/> From richarddavis@example.net Mon Jun 01 17:34:36 2009 Return-Path: <richarddavis@example.net> Delivered-To: richarddavis@example.net Received: (qmail 23026 invoked from network); 1 Jun 2009 17:34:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jun 2009 17:34:36 -0000 Received: (qmail 43950 invoked by uid 500); 1 Jun 2009 17:34:48 -0000 Delivered-To: richarddavis@example.net Received: (qmail 43890 invoked by uid 500); 1 Jun 2009 17:34:48 -0000 Mailing-List: contact richarddavis@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:richarddavis@example.net> List-Unsubscribe: <mailto:richarddavis@example.net> List-Post: <mailto:richarddavis@example.net> List-Id: <commits.cxf.apache.org> Reply-To: richarddavis@example.net Delivered-To: mailing list richarddavis@example.net Received: (qmail 43881 invoked by uid 99); 1 Jun 2009 17:34:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 17:34:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 17:34:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 180C0238888F; Mon, 1 Jun 2009 17:34:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780741 - in /cxf/trunk/rt/frontend/jaxrs/src: main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java Date: Mon, 01 Jun 2009 17:34:25 -0000 To: richarddavis@example.net From: richarddavis@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <richarddavis@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Mon Jun 1 17:34:25 2009 New Revision: 780741 URL: http://svn.apache.org/viewvc?rev=780741&view=rev Log: CXF-2242 : applying a fix proposed by Nacho G. Mac Dowell Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java?rev=780741&r1=780740&r2=780741&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java Mon Jun 1 17:34:25 2009 @@ -147,15 +147,17 @@ boolean encoded = AnnotationUtils.getAnnotation(anns, Encoded.class) != null; for (Iterator<Map.Entry<String, List<String>>> it = map.entrySet().iterator(); it.hasNext();) { Map.Entry<String, List<String>> entry = it.next(); - for (String value : entry.getValue()) { + for (Iterator<String> entryIterator = entry.getValue().iterator(); entryIterator.hasNext();) { + String value = entryIterator.next(); os.write(entry.getKey().getBytes("UTF-8")); os.write('='); - String data = encoded ? value : HttpUtils.urlEncode(value); + String data = encoded ? value : HttpUtils.urlEncode(value); os.write(data.getBytes("UTF-8")); - if (it.hasNext()) { + if (entryIterator.hasNext() || it.hasNext()) { os.write('&'); } } + } } Modified: cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java?rev=780741&r1=780740&r2=780741&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java Mon Jun 1 17:34:25 2009 @@ -20,6 +20,7 @@ package org.apache.cxf.jaxrs.provider; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.lang.annotation.Annotation; import java.util.List; @@ -126,6 +127,48 @@ } + @Test + public void testWriteMultipleValues() throws Exception { + MultivaluedMap<String, String> mvMap = new MetadataMap<String, String>(); + mvMap.add("a", "a1"); + mvMap.add("a", "a2"); + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ferp.writeTo(mvMap, MultivaluedMap.class, MultivaluedMap.class, + new Annotation[0], MediaType.APPLICATION_FORM_URLENCODED_TYPE, + new MetadataMap<String, Object>(), bos); + String result = bos.toString(); + assertEquals("Wrong value", "a=a1&a=a2", result); + } + + @Test + public void testWriteMultipleValues2() throws Exception { + MultivaluedMap<String, String> mvMap = new MetadataMap<String, String>(); + mvMap.add("a", "a1"); + mvMap.add("a", "a2"); + mvMap.add("b", "b1"); + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ferp.writeTo(mvMap, MultivaluedMap.class, MultivaluedMap.class, + new Annotation[0], MediaType.APPLICATION_FORM_URLENCODED_TYPE, + new MetadataMap<String, Object>(), bos); + String result = bos.toString(); + assertEquals("Wrong value", "a=a1&a=a2&b=b1", result); + } + + @Test + public void testWrite() throws Exception { + MultivaluedMap<String, String> mvMap = new MetadataMap<String, String>(); + mvMap.add("a", "a1"); + mvMap.add("b", "b1"); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ferp.writeTo(mvMap, MultivaluedMap.class, MultivaluedMap.class, + new Annotation[0], MediaType.APPLICATION_FORM_URLENCODED_TYPE, + new MetadataMap<String, Object>(), bos); + String result = bos.toString(); + assertEquals("Wrong value", "a=a1&b=b1", result); + } + @SuppressWarnings("unchecked") @Test public void testValidation() throws Exception { From richarddavis@example.net Mon Jun 01 19:45:39 2009 Return-Path: <richarddavis@example.net> Delivered-To: richarddavis@example.net Received: (qmail 92126 invoked from network); 1 Jun 2009 19:45:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Jun 2009 19:45:38 -0000 Received: (qmail 65938 invoked by uid 500); 1 Jun 2009 19:45:51 -0000 Delivered-To: richarddavis@example.net Received: (qmail 65854 invoked by uid 500); 1 Jun 2009 19:45:50 -0000 Mailing-List: contact richarddavis@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:richarddavis@example.net> List-Unsubscribe: <mailto:richarddavis@example.net> List-Post: <mailto:richarddavis@example.net> List-Id: <commits.cxf.apache.org> Reply-To: richarddavis@example.net Delivered-To: mailing list richarddavis@example.net Received: (qmail 65845 invoked by uid 99); 1 Jun 2009 19:45:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 19:45:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2009 19:45:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 92E04238886D; Mon, 1 Jun 2009 19:45:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780800 - in /cxf/trunk: rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java Date: Mon, 01 Jun 2009 19:45:26 -0000 To: richarddavis@example.net From: richarddavis@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <richarddavis@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Jun 1 19:45:26 2009 New Revision: 780800 URL: http://svn.apache.org/viewvc?rev=780800&view=rev Log: [CXF-2250] Fix issue of .INBOUND_MESSAGE_ATTACHMENTS not being mapped correctly on the client side. Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java cxf/trunk/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java?rev=780800&r1=780799&r2=780800&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java Mon Jun 1 19:45:26 2009 @@ -204,13 +204,22 @@ } } if (MessageContext.INBOUND_MESSAGE_ATTACHMENTS.equals(key)) { - if (isOutbound()) { - ret = reqMessage.get(key); + if (isRequestor() && isOutbound()) { + ret = null; + } else if (isOutbound()) { + ret = createAttachments(reqMessage, + MessageContext.INBOUND_MESSAGE_ATTACHMENTS); + } else { + ret = createAttachments(message, + MessageContext.INBOUND_MESSAGE_ATTACHMENTS); } - ret = createAttachments(getWrappedMessage(), MessageContext.INBOUND_MESSAGE_ATTACHMENTS); } else if (MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS.equals(key)) { - ret = createAttachments(isRequestor() ? getWrappedMessage() : createResponseMessage(), - MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS); + if (isRequestor() && !isOutbound()) { + ret = createAttachments(reqMessage, MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS); + } else { + ret = createAttachments(isRequestor() ? getWrappedMessage() : createResponseMessage(), + MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS); + } } else if (MessageContext.MESSAGE_OUTBOUND_PROPERTY.equals(key)) { ret = isOutbound(); } else if (MessageContext.HTTP_REQUEST_HEADERS.equals(key)) { @@ -283,11 +292,11 @@ } return m; } - private Object createAttachments(Message mc, String propertyName) { + private Object createAttachments(Map<String, Object> mc, String propertyName) { if (mc == null) { return null; } - Collection<Attachment> attachments = mc.getAttachments(); + Collection<Attachment> attachments = CastUtils.cast((Collection<?>)mc.get(Message.ATTACHMENTS)); Map<String, DataHandler> dataHandlers = AttachmentUtil.getDHMap(attachments); mc.put(propertyName, Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java?rev=780800&r1=780799&r2=780800&view=diff ============================================================================== --- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java (original) +++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java Mon Jun 1 19:45:26 2009 @@ -21,6 +21,7 @@ import java.awt.Image; import java.io.InputStream; import java.net.URL; +import java.util.Map; import javax.activation.DataHandler; import javax.imageio.ImageIO; @@ -32,10 +33,13 @@ import javax.xml.soap.SOAPMessage; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; +import javax.xml.ws.BindingProvider; import javax.xml.ws.Dispatch; import javax.xml.ws.Holder; import javax.xml.ws.Service; +import javax.xml.ws.handler.MessageContext; +import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.swa.SwAService; import org.apache.cxf.swa.SwAServiceInterface; @@ -218,7 +222,12 @@ VoidRequest request = new VoidRequest(); OutputResponseAll response = port.echoAllAttachmentTypes(request, attach1, attach2, attach3, attach4, attach5); + assertNotNull(response); + Map<?, ?> map = CastUtils.cast((Map<?, ?>)((BindingProvider)port).getResponseContext() + .get(MessageContext.INBOUND_MESSAGE_ATTACHMENTS)); + assertNotNull(map); + assertEquals(5, map.size()); } @Test From richarddavis@example.net Tue Jun 02 01:50:42 2009 Return-Path: <richarddavis@example.net> Delivered-To: richarddavis@example.net Received: (qmail 41648 invoked from network); 2 Jun 2009 01:50:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jun 2009 01:50:41 -0000 Received: (qmail 52398 invoked by uid 500); 2 Jun 2009 01:50:53 -0000 Delivered-To: richarddavis@example.net Received: (qmail 52320 invoked by uid 500); 2 Jun 2009 01:50:53 -0000 Mailing-List: contact richarddavis@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:richarddavis@example.net> List-Unsubscribe: <mailto:richarddavis@example.net> List-Post: <mailto:richarddavis@example.net> List-Id: <commits.cxf.apache.org> Reply-To: richarddavis@example.net Delivered-To: mailing list richarddavis@example.net Received: (qmail 52310 invoked by uid 99); 2 Jun 2009 01:50:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2009 01:50:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2009 01:50:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C92AD2388898; Tue, 2 Jun 2009 01:50:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780902 - in /cxf/trunk/rt/transports/jms/src: main/java/org/apache/cxf/transport/jms/ test/java/org/apache/cxf/transport/jms/ test/resources/ Date: Tue, 02 Jun 2009 01:50:28 -0000 To: richarddavis@example.net From: richarddavis@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <richarddavis@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Tue Jun 2 01:50:28 2009 New Revision: 780902 URL: http://svn.apache.org/viewvc?rev=780902&view=rev Log: CXF-2243 applied patch with thanks to Ron Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java cxf/trunk/rt/transports/jms/src/test/resources/jms_test_config.xml Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java?rev=780902&r1=780901&r2=780902&view=diff ============================================================================== --- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java (original) +++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java Tue Jun 2 01:50:28 2009 @@ -27,7 +27,6 @@ import org.springframework.core.task.TaskExecutor; import org.springframework.jms.connection.SingleConnectionFactory; import org.springframework.jms.connection.SingleConnectionFactory102; -import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.support.destination.DestinationResolver; import org.springframework.jndi.JndiTemplate; import org.springframework.transaction.PlatformTransactionManager; @@ -38,7 +37,7 @@ * if the setCacheLevel has been called. */ public static final int DEFAULT_VALUE = -1; - + static final boolean DEFAULT_USEJMS11 = true; private boolean usingEndpointInfo = true; @@ -54,7 +53,7 @@ private boolean messageIdEnabled = true; private boolean messageTimestampEnabled = true; private boolean pubSubNoLocal; - private long receiveTimeout = JmsTemplate.RECEIVE_TIMEOUT_INDEFINITE_WAIT; + private Long receiveTimeout; private boolean explicitQosEnabled; private int deliveryMode = Message.DEFAULT_DELIVERY_MODE; private int priority = Message.DEFAULT_PRIORITY; @@ -157,11 +156,11 @@ this.pubSubNoLocal = pubSubNoLocal; } - public long getReceiveTimeout() { + public Long getReceiveTimeout() { return receiveTimeout; } - public void setReceiveTimeout(long receiveTimeout) { + public void setReceiveTimeout(Long receiveTimeout) { this.receiveTimeout = receiveTimeout; } Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java?rev=780902&r1=780901&r2=780902&view=diff ============================================================================== --- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java (original) +++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java Tue Jun 2 01:50:28 2009 @@ -92,7 +92,9 @@ JmsTemplate jmsTemplate = jmsConfig.isUseJms11() ? new JmsTemplate() : new JmsTemplate102(); jmsTemplate.setConnectionFactory(jmsConfig.getOrCreateWrappedConnectionFactory()); jmsTemplate.setPubSubDomain(jmsConfig.isPubSubDomain()); - jmsTemplate.setReceiveTimeout(jmsConfig.getReceiveTimeout()); + if (jmsConfig.getReceiveTimeout() != null) { + jmsTemplate.setReceiveTimeout(jmsConfig.getReceiveTimeout()); + } jmsTemplate.setTimeToLive(jmsConfig.getTimeToLive()); int priority = (headers != null && headers.isSetJMSPriority()) ? headers.getJMSPriority() : jmsConfig.getPriority(); @@ -137,6 +139,9 @@ jmsListener.setSessionTransacted(jmsConfig.isSessionTransacted()); jmsListener.setTransactionManager(jmsConfig.getTransactionManager()); jmsListener.setMessageListener(listenerHandler); + if (jmsConfig.getReceiveTimeout() != null) { + jmsListener.setReceiveTimeout(jmsConfig.getReceiveTimeout()); + } if (jmsConfig.getRecoveryInterval() != JMSConfiguration.DEFAULT_VALUE) { jmsListener.setRecoveryInterval(jmsConfig.getRecoveryInterval()); } Modified: cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=780902&r1=780901&r2=780902&view=diff ============================================================================== --- cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java (original) +++ cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java Tue Jun 2 01:50:28 2009 @@ -95,9 +95,9 @@ } jmsConfig.setPubSubDomain(pubSubDomain); jmsConfig.setPubSubNoLocal(true); - //if (clientConfig.isSetClientReceiveTimeout()) { - jmsConfig.setReceiveTimeout(clientConfig.getClientReceiveTimeout()); - //} + if (clientConfig.isSetClientReceiveTimeout()) { + jmsConfig.setReceiveTimeout(clientConfig.getClientReceiveTimeout()); + } if (clientConfig.isSetUseConduitIdSelector()) { jmsConfig.setUseConduitIdSelector(clientConfig.isUseConduitIdSelector()); } Modified: cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java?rev=780902&r1=780901&r2=780902&view=diff ============================================================================== --- cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java (original) +++ cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java Tue Jun 2 01:50:28 2009 @@ -62,7 +62,7 @@ "HelloWorldQueueBinMsgService", "HelloWorldQueueBinMsgPort"); JMSConduit conduit = setupJMSConduit(false, false); assertEquals("Can't get the right ClientReceiveTimeout", 500L, conduit.getJmsConfig() - .getReceiveTimeout()); + .getReceiveTimeout().longValue()); bus.shutdown(false); BusFactory.setDefaultBus(null); conduit.close(); @@ -93,7 +93,7 @@ setupServiceInfo("http://cxf.apache.org/hello_world_jms", "/wsdl/jms_test.wsdl", "HelloWorldServiceLoop", "HelloWorldPortLoop"); JMSConduit conduit = setupJMSConduit(true, false); - conduit.getJmsConfig().setReceiveTimeout(10000); + conduit.getJmsConfig().setReceiveTimeout(Long.valueOf(10000)); try { for (int c = 0; c < 10; c++) { @@ -121,7 +121,7 @@ JMSConduit conduit = setupJMSConduit(true, false); // TODO IF the system is extremely fast. The message could still get through - conduit.getJmsConfig().setReceiveTimeout(1); + conduit.getJmsConfig().setReceiveTimeout(Long.valueOf(1)); Message message = new MessageImpl(); try { sendoutMessage(conduit, message, false); Modified: cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java?rev=780902&r1=780901&r2=780902&view=diff ============================================================================== --- cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java (original) +++ cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java Tue Jun 2 01:50:28 2009 @@ -125,6 +125,7 @@ "HelloWorldQueueBinMsgService", "HelloWorldQueueBinMsgPort"); destination = setupJMSDestination(false); jmsConfig = destination.getJmsConfig();*/ + assertEquals("The receiveTimeout should be set", jmsConfig.getReceiveTimeout().longValue(), 1500L); assertEquals("The concurrentConsumer should be set", jmsConfig.getConcurrentConsumers(), 3); assertEquals("The maxConcurrentConsumer should be set", jmsConfig.getMaxConcurrentConsumers(), 5); assertEquals("The maxSuspendedContinuations should be set", Modified: cxf/trunk/rt/transports/jms/src/test/resources/jms_test_config.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/test/resources/jms_test_config.xml?rev=780902&r1=780901&r2=780902&view=diff ============================================================================== --- cxf/trunk/rt/transports/jms/src/test/resources/jms_test_config.xml (original) +++ cxf/trunk/rt/transports/jms/src/test/resources/jms_test_config.xml Tue Jun 2 01:50:28 2009 @@ -105,6 +105,7 @@ p:replyDestination="queue:test.reply" p:pubSubDomain="false" p:usingEndpointInfo="false" + p:receiveTimeout="1500" p:concurrentConsumers="3" p:maxConcurrentConsumers="5" p:maxSuspendedContinuations="2" From richarddavis@example.net Tue Jun 02 02:42:32 2009 Return-Path: <richarddavis@example.net> Delivered-To: richarddavis@example.net Received: (qmail 63734 invoked from network); 2 Jun 2009 02:42:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jun 2009 02:42:32 -0000 Received: (qmail 81575 invoked by uid 500); 2 Jun 2009 02:42:44 -0000 Delivered-To: richarddavis@example.net Received: (qmail 81501 invoked by uid 500); 2 Jun 2009 02:42:44 -0000 Mailing-List: contact richarddavis@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:richarddavis@example.net> List-Unsubscribe: <mailto:richarddavis@example.net> List-Post: <mailto:richarddavis@example.net> List-Id: <commits.cxf.apache.org> Reply-To: richarddavis@example.net Delivered-To: mailing list richarddavis@example.net Received: (qmail 81492 invoked by uid 99); 2 Jun 2009 02:42:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2009 02:42:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2009 02:42:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A099923888BD; Tue, 2 Jun 2009 02:42:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780909 - in /cxf/branches/2.1.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java Date: Tue, 02 Jun 2009 02:42:19 -0000 To: richarddavis@example.net From: richarddavis@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <richarddavis@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Jun 2 02:42:19 2009 New Revision: 780909 URL: http://svn.apache.org/viewvc?rev=780909&view=rev Log: Merged revisions 777243 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r777243 | dkulp | 2009-05-21 16:29:56 -0400 (Thu, 21 May 2009) | 1 line Fix for swa method issue ........ 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/interceptors/SwAOutInterceptor.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 2 02:42:19 2009 @@ -1 +1 @@ -/cxf/trunk: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,780033,780184,780213,780421,780664 +/cxf/trunk: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,780033,780184,780213,780421,780664 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/interceptors/SwAOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java?rev=780909&r1=780908&r2=780909&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java Tue Jun 2 02:42:19 2009 @@ -86,10 +86,10 @@ if (m == null && !SWA_REF_METHOD.containsKey(ctx.getClass().getName())) { try { m = ctx.getClass().getMethod("hasSwaRef", new Class[0]); + SWA_REF_METHOD.put(ctx.getClass().getName(), m); } catch (Exception e) { //ignore } - SWA_REF_METHOD.put(ctx.getClass().getName(), m); } try { return (Boolean)m.invoke(ctx); From richarddavis@example.net Tue Jun 02 02:45:34 2009 Return-Path: <richarddavis@example.net> Delivered-To: richarddavis@example.net Received: (qmail 64469 invoked from network); 2 Jun 2009 02:45:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jun 2009 02:45:33 -0000 Received: (qmail 83569 invoked by uid 500); 2 Jun 2009 02:45:46 -0000 Delivered-To: richarddavis@example.net Received: (qmail 83491 invoked by uid 500); 2 Jun 2009 02:45:45 -0000 Mailing-List: contact richarddavis@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:richarddavis@example.net> List-Unsubscribe: <mailto:richarddavis@example.net> List-Post: <mailto:richarddavis@example.net> List-Id: <commits.cxf.apache.org> Reply-To: richarddavis@example.net Delivered-To: mailing list richarddavis@example.net Received: (qmail 83482 invoked by uid 99); 2 Jun 2009 02:45:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2009 02:45:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2009 02:45:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 56C6223888BD; Tue, 2 Jun 2009 02:45:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780910 - in /cxf/branches/2.1.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Date: Tue, 02 Jun 2009 02:45:14 -0000 To: richarddavis@example.net From: richarddavis@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <richarddavis@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Jun 2 02:45:13 2009 New Revision: 780910 URL: http://svn.apache.org/viewvc?rev=780910&view=rev Log: Merged revisions 777481 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r777481 | bharath | 2009-05-22 07:32:33 -0400 (Fri, 22 May 2009) | 2 lines Fix for CXF-2164. As discussed on the Jira, we now maintain a WeakHashMap for the request and response contexts. (With the Thread as the key). This would mean the contexts would get GC's when the ClientImpl gets GC'd (during undeployment). ........ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 2 02:45:13 2009 @@ -1 +1 @@ -/cxf/trunk: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,780033,780184,780213,780421,780664 +/cxf/trunk: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,780033,780184,780213,780421,780664 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=780910&r1=780909&r2=780910&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original) +++ cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Tue Jun 2 02:45:13 2009 @@ -25,6 +25,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; import java.util.logging.Level; @@ -68,29 +69,27 @@ public class ClientImpl extends AbstractBasicInterceptorProvider implements Client, Retryable, MessageObserver { - + public static final String THREAD_LOCAL_REQUEST_CONTEXT = "thread.local.request.context"; - + public static final String FINISHED = "exchange.finished"; - + private static final Logger LOG = LogUtils.getL7dLogger(ClientImpl.class); - + protected Bus bus; protected ConduitSelector conduitSelector; - protected ClientOutFaultObserver outFaultObserver; + protected ClientOutFaultObserver outFaultObserver; protected int synchronousTimeout = 60000; // default 60 second timeout - + protected PhaseChainCache outboundChainCache = new PhaseChainCache(); protected PhaseChainCache inboundChainCache = new PhaseChainCache(); - + protected Map<String, Object> currentRequestContext = new ConcurrentHashMap<String, Object>(); - protected ThreadLocal <EchoContext> requestContext = - new ThreadLocal<EchoContext>(); + protected Map<Thread, EchoContext> requestContext = new WeakHashMap<Thread, EchoContext>(); + + protected Map<Thread, Map<String, Object>> responseContext = new WeakHashMap<Thread, Map<String, Object>>(); - protected ThreadLocal <Map<String, Object>> responseContext = - new ThreadLocal<Map<String, Object>>(); - protected Executor executor; @@ -101,7 +100,7 @@ public ClientImpl(Bus b, Endpoint e, Conduit c) { this(b, e, new PreexistingConduitSelector(c)); } - + public ClientImpl(Bus b, Endpoint e, ConduitSelector sc) { bus = b; outFaultObserver = new ClientOutFaultObserver(bus); @@ -112,7 +111,7 @@ public ClientImpl(URL wsdlUrl) { this(BusFactory.getThreadDefaultBus(), wsdlUrl, null, null, SimpleEndpointImplFactory.getSingleton()); } - + public ClientImpl(URL wsdlUrl, QName port) { this(BusFactory.getThreadDefaultBus(), wsdlUrl, null, port, SimpleEndpointImplFactory.getSingleton()); } @@ -136,14 +135,14 @@ * @param port * @param endpointImplFactory */ - public ClientImpl(Bus bus, URL wsdlUrl, QName service, + public ClientImpl(Bus bus, URL wsdlUrl, QName service, QName port, EndpointImplFactory endpointImplFactory) { this.bus = bus; - + WSDLServiceFactory sf = (service == null) ? (new WSDLServiceFactory(bus, wsdlUrl)) : (new WSDLServiceFactory(bus, wsdlUrl, service)); Service svc = sf.create(); - + EndpointInfo epfo = findEndpoint(svc, port); try { @@ -153,17 +152,17 @@ } notifyLifecycleManager(); } - + public void destroy() { - + // TODO: also inform the conduit so it can shutdown any response listeners - + ClientLifeCycleManager mgr = bus.getExtension(ClientLifeCycleManager.class); if (null != mgr) { mgr.clientDestroyed(this); } } - + private void notifyLifecycleManager() { ClientLifeCycleManager mgr = bus.getExtension(ClientLifeCycleManager.class); if (null != mgr) { @@ -184,7 +183,7 @@ for (ServiceInfo svcfo : svc.getServiceInfos()) { for (EndpointInfo e : svcfo.getEndpoints()) { BindingInfo bfo = e.getBinding(); - + if (bfo.getBindingId().equals("http://schemas.xmlsoap.org/wsdl/soap/")) { for (Object o : bfo.getExtensors().get()) { if (o instanceof SOAPBindingImpl) { @@ -195,7 +194,7 @@ } } } - + } } } @@ -212,21 +211,21 @@ return getConduitSelector().getEndpoint(); } - + public Map<String, Object> getRequestContext() { if (isThreadLocalRequestContext()) { - if (null == requestContext.get()) { - requestContext.set(new EchoContext(currentRequestContext)); + if (!requestContext.containsKey(Thread.currentThread())) { + requestContext.put(Thread.currentThread(), new EchoContext(currentRequestContext)); } - return requestContext.get(); + return requestContext.get(Thread.currentThread()); } return currentRequestContext; } public Map<String, Object> getResponseContext() { - if (null == responseContext.get()) { - responseContext.set(new HashMap<String, Object>()); - } - return responseContext.get(); + if (!responseContext.containsKey(Thread.currentThread())) { + responseContext.put(Thread.currentThread(), new HashMap<String, Object>()); + } + return responseContext.get(Thread.currentThread()); } public boolean isThreadLocalRequestContext() { @@ -246,37 +245,37 @@ currentRequestContext.put(THREAD_LOCAL_REQUEST_CONTEXT, b); } - + public Object[] invoke(BindingOperationInfo oi, Object... params) throws Exception { return invoke(oi, params, null); } public Object[] invoke(String operationName, Object... params) throws Exception { QName q = new QName(getEndpoint().getService().getName().getNamespaceURI(), operationName); - + return invoke(q, params); } - + public Object[] invoke(QName operationName, Object... params) throws Exception { BindingOperationInfo op = getEndpoint().getEndpointInfo().getBinding().getOperation(operationName); if (op == null) { throw new UncheckedException( new org.apache.cxf.common.i18n.Message("NO_OPERATION", LOG, operationName)); } - + if (op.isUnwrappedCapable()) { op = op.getUnwrappedOperation(); } - + return invoke(op, params); } public Object[] invokeWrapped(String operationName, Object... params) throws Exception { QName q = new QName(getEndpoint().getService().getName().getNamespaceURI(), operationName); - + return invokeWrapped(q, params); } - + public Object[] invokeWrapped(QName operationName, Object... params) throws Exception { BindingOperationInfo op = getEndpoint().getEndpointInfo().getBinding().getOperation(operationName); if (op == null) { @@ -287,7 +286,7 @@ } public Object[] invoke(BindingOperationInfo oi, - Object[] params, + Object[] params, Exchange exchange) throws Exception { Map<String, Object> context = new HashMap<String, Object>(); Map<String, Object> resp = getResponseContext(); @@ -298,11 +297,11 @@ try { return invoke(oi, params, context, exchange); } finally { - responseContext.set(resp); + responseContext.put(Thread.currentThread(), resp); } } public Object[] invoke(BindingOperationInfo oi, - Object[] params, + Object[] params, Map<String, Object> context) throws Exception { try { return invoke(oi, params, context, (Exchange)null); @@ -310,46 +309,46 @@ if (context != null) { Map<String, Object> resp = CastUtils.cast((Map<?, ?>)context.get(RESPONSE_CONTEXT)); if (resp != null) { - responseContext.set(resp); + responseContext.put(Thread.currentThread(), resp); } } } } - - public void invoke(ClientCallback callback, - String operationName, + + public void invoke(ClientCallback callback, + String operationName, Object... params) throws Exception { QName q = new QName(getEndpoint().getService().getName().getNamespaceURI(), operationName); - invoke(callback, q, params); + invoke(callback, q, params); } - public void invoke(ClientCallback callback, - QName operationName, + public void invoke(ClientCallback callback, + QName operationName, Object... params) throws Exception { BindingOperationInfo op = getEndpoint().getEndpointInfo().getBinding().getOperation(operationName); if (op == null) { throw new UncheckedException( new org.apache.cxf.common.i18n.Message("NO_OPERATION", LOG, operationName)); } - + if (op.isUnwrappedCapable()) { op = op.getUnwrappedOperation(); } - + invoke(callback, op, params); } - public void invokeWrapped(ClientCallback callback, - String operationName, + public void invokeWrapped(ClientCallback callback, + String operationName, Object... params) throws Exception { QName q = new QName(getEndpoint().getService().getName().getNamespaceURI(), operationName); - invokeWrapped(callback, q, params); + invokeWrapped(callback, q, params); } - public void invokeWrapped(ClientCallback callback, - QName operationName, + public void invokeWrapped(ClientCallback callback, + QName operationName, Object... params) throws Exception { BindingOperationInfo op = getEndpoint().getEndpointInfo().getBinding().getOperation(operationName); @@ -360,9 +359,9 @@ invoke(callback, op, params); } - - public void invoke(ClientCallback callback, - BindingOperationInfo oi, + + public void invoke(ClientCallback callback, + BindingOperationInfo oi, Object... params) throws Exception { Bus origBus = BusFactory.getThreadDefaultBus(false); BusFactory.setThreadDefaultBus(bus); @@ -379,42 +378,42 @@ Message message = endpoint.getBinding().createMessage(); message.put(Message.INVOCATION_CONTEXT, context); - + //setup the message context setContext(reqContext, message); setParameters(params, message); - + if (null != reqContext) { exchange.putAll(reqContext); } exchange.setOneWay(oi.getOutput() == null); exchange.setOutMessage(message); exchange.put(ClientCallback.class, callback); - + setOutMessageProperties(message, oi); setExchangeProperties(exchange, endpoint, oi); - + // setup chain - + PhaseInterceptorChain chain = setupInterceptorChain(endpoint); message.setInterceptorChain(chain); - + modifyChain(chain, reqContext); chain.setFaultObserver(outFaultObserver); - + // setup conduit selector prepareConduitSelector(message); - - // execute chain + + // execute chain chain.doIntercept(message); } finally { BusFactory.setThreadDefaultBus(origBus); - } + } } - + public Object[] invoke(BindingOperationInfo oi, - Object[] params, + Object[] params, Map<String, Object> context, Exchange exchange) throws Exception { Bus origBus = BusFactory.getThreadDefaultBus(false); @@ -425,7 +424,7 @@ } exchange.setSynchronous(true); Endpoint endpoint = getEndpoint(); - + Map<String, Object> reqContext = null; Map<String, Object> resContext = null; if (LOG.isLoggable(Level.FINE)) { @@ -436,46 +435,46 @@ reqContext = CastUtils.cast((Map)context.get(REQUEST_CONTEXT)); resContext = CastUtils.cast((Map)context.get(RESPONSE_CONTEXT)); message.put(Message.INVOCATION_CONTEXT, context); - } + } //setup the message context setContext(reqContext, message); setParameters(params, message); - + if (null != reqContext) { exchange.putAll(reqContext); } - + if (null != oi) { exchange.setOneWay(oi.getOutput() == null); } - + exchange.setOutMessage(message); - + setOutMessageProperties(message, oi); setExchangeProperties(exchange, endpoint, oi); - + // setup chain - + PhaseInterceptorChain chain = setupInterceptorChain(endpoint); message.setInterceptorChain(chain); - + modifyChain(chain, reqContext); chain.setFaultObserver(outFaultObserver); - + // setup conduit selector prepareConduitSelector(message); - - // execute chain + + // execute chain chain.doIntercept(message); - + return processResult(message, exchange, oi, resContext); - + } finally { BusFactory.setThreadDefaultBus(origBus); } } - protected Object[] processResult(Message message, + protected Object[] processResult(Message message, Exchange exchange, BindingOperationInfo oi, Map<String, Object> resContext) throws Exception { @@ -496,14 +495,14 @@ } throw ex; } - + // Wait for a response if we need to if (oi != null && !oi.getOperationInfo().isOneWay()) { synchronized (exchange) { waitResponse(exchange); } } - + // leave the input stream open for the caller Boolean keepConduitAlive = (Boolean)exchange.get(Client.KEEP_CONDUIT_ALIVE); if (keepConduitAlive == null || !keepConduitAlive) { @@ -514,7 +513,7 @@ List resList = null; Message inMsg = exchange.getInMessage(); if (inMsg != null) { - if (null != resContext) { + if (null != resContext) { resContext.putAll(inMsg); if (LOG.isLoggable(Level.FINE)) { LOG.fine("set responseContext to be" + responseContext); @@ -522,18 +521,18 @@ } resList = inMsg.getContent(List.class); } - + // check for an incoming fault ex = getException(exchange); - + if (ex != null) { throw ex; } - + if (resList != null) { return resList.toArray(); } - + return null; } protected Exception getException(Exchange exchange) { @@ -541,17 +540,17 @@ return exchange.getInFaultMessage().getContent(Exception.class); } else if (exchange.getOutFaultMessage() != null) { return exchange.getOutFaultMessage().getContent(Exception.class); - } + } return null; } protected void setContext(Map<String, Object> ctx, Message message) { - if (ctx != null) { + if (ctx != null) { message.putAll(ctx); if (LOG.isLoggable(Level.FINE)) { LOG.fine("set requestContext to message be" + ctx); } - } + } } protected void waitResponse(Exchange exchange) { @@ -576,24 +575,24 @@ MessageContentsList contents = new MessageContentsList(params); message.setContent(List.class, contents); } - + public void onMessage(Message message) { Endpoint endpoint = message.getExchange().get(Endpoint.class); if (endpoint == null) { // in this case correlation will occur outside the transport, - // however there's a possibility that the endpoint may have been + // however there's a possibility that the endpoint may have been // rebased in the meantime, so that the response will be mediated // via a set of in interceptors provided by a *different* endpoint // endpoint = getConduitSelector().getEndpoint(); - message.getExchange().put(Endpoint.class, endpoint); + message.getExchange().put(Endpoint.class, endpoint); } message = endpoint.getBinding().createMessage(message); message.put(Message.REQUESTOR_ROLE, Boolean.TRUE); message.put(Message.INBOUND_MESSAGE, Boolean.TRUE); PhaseManager pm = bus.getExtension(PhaseManager.class); - + List<Interceptor> i1 = bus.getInInterceptors(); if (LOG.isLoggable(Level.FINE)) { LOG.fine("Interceptors contributed by bus: " + i1); @@ -610,12 +609,12 @@ if (LOG.isLoggable(Level.FINE)) { LOG.fine("Interceptors contributed by binding: " + i4); } - - PhaseInterceptorChain chain = inboundChainCache.get(pm.getInPhases(), i1, i2, i3, i4); + + PhaseInterceptorChain chain = inboundChainCache.get(pm.getInPhases(), i1, i2, i3, i4); message.setInterceptorChain(chain); - + chain.setFaultObserver(outFaultObserver); - + Bus origBus = BusFactory.getThreadDefaultBus(false); BusFactory.setThreadDefaultBus(bus); // execute chain @@ -628,7 +627,7 @@ } callback.start(message); } - + String startingAfterInterceptorID = (String) message.get( PhaseInterceptorChain.STARTING_AFTER_INTERCEPTOR_ID); String startingInterceptorID = (String) message.get( @@ -642,9 +641,9 @@ } else { chain.doIntercept(message); } - + callback = message.getExchange().get(ClientCallback.class); - + if (callback != null && !isPartialResponse(message)) { message.getExchange().setInMessage(message); Map<String, Object> resCtx = CastUtils.cast((Map<?, ?>)message @@ -652,11 +651,11 @@ .getOutMessage() .get(Message.INVOCATION_CONTEXT)); resCtx = CastUtils.cast((Map<?, ?>)resCtx.get(RESPONSE_CONTEXT)); - + try { Object obj[] = processResult(message, message.getExchange(), null, resCtx); - + callback.handleResponse(resCtx, obj); } catch (Throwable ex) { callback.handleException(resCtx, ex); @@ -667,7 +666,7 @@ if (!isPartialResponse(message) && callback == null) { message.getExchange().put(FINISHED, Boolean.TRUE); message.getExchange().setInMessage(message); - message.getExchange().notifyAll(); + message.getExchange().notifyAll(); } } BusFactory.setThreadDefaultBus(origBus); @@ -695,7 +694,7 @@ message.put(MessageInfo.class, boi.getOperationInfo().getInput()); } } - + protected void setExchangeProperties(Exchange exchange, Endpoint endpoint, BindingOperationInfo boi) { @@ -713,7 +712,7 @@ exchange.put(BindingOperationInfo.class, boi); exchange.put(OperationInfo.class, boi.getOperationInfo()); } - + if (exchange.isSynchronous() || executor == null) { exchange.put(MessageObserver.class, this); } else { @@ -725,7 +724,7 @@ } }); } - }); + }); } exchange.put(Retryable.class, this); exchange.put(Client.class, this); @@ -758,10 +757,10 @@ } } - protected PhaseInterceptorChain setupInterceptorChain(Endpoint endpoint) { + protected PhaseInterceptorChain setupInterceptorChain(Endpoint endpoint) { PhaseManager pm = bus.getExtension(PhaseManager.class); - + List<Interceptor> i1 = bus.getOutInterceptors(); if (LOG.isLoggable(Level.FINE)) { LOG.fine("Interceptors contributed by bus: " + i1); @@ -796,17 +795,17 @@ public void setSynchronousTimeout(int synchronousTimeout) { this.synchronousTimeout = synchronousTimeout; } - + public final ConduitSelector getConduitSelector() { return getConduitSelector(null); } - + protected final synchronized ConduitSelector getConduitSelector( ConduitSelector override ) { if (null == conduitSelector) { setConduitSelector(override != null - ? override + ? override : new UpfrontConduitSelector()); } return conduitSelector; @@ -819,13 +818,13 @@ private boolean isPartialResponse(Message in) { return Boolean.TRUE.equals(in.get(Message.PARTIAL_RESPONSE_MESSAGE)); } - - + + /* * modification are echoed back to the shared map */ public static class EchoContext extends HashMap<String, Object> { - final Map<String, Object> shared; + final Map<String, Object> shared; public EchoContext(Map<String, Object> sharedMap) { super(sharedMap); shared = sharedMap; @@ -840,12 +839,12 @@ shared.putAll(t); super.putAll(t); } - + public Object remove(Object key) { shared.remove(key); return super.remove(key); } - + public void reload() { super.clear(); super.putAll(shared); From richarddavis@example.net Tue Jun 02 02:46:17 2009 Return-Path: <richarddavis@example.net> Delivered-To: richarddavis@example.net Received: (qmail 64624 invoked from network); 2 Jun 2009 02:46:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jun 2009 02:46:17 -0000 Received: (qmail 83766 invoked by uid 500); 2 Jun 2009 02:46:29 -0000 Delivered-To: richarddavis@example.net Received: (qmail 83700 invoked by uid 500); 2 Jun 2009 02:46:28 -0000 Mailing-List: contact richarddavis@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:richarddavis@example.net> List-Unsubscribe: <mailto:richarddavis@example.net> List-Post: <mailto:richarddavis@example.net> List-Id: <commits.cxf.apache.org> Reply-To: richarddavis@example.net Delivered-To: mailing list richarddavis@example.net Received: (qmail 83691 invoked by uid 99); 2 Jun 2009 02:46:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2009 02:46:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2009 02:46:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D34E423888C5; Tue, 2 Jun 2009 02:46:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780911 - in /cxf/trunk: rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/ systests/src/test/java/org/apache/cxf/systest/jaxws/ Date: Tue, 02 Jun 2009 02:46:03 -0000 To: richarddavis@example.net From: richarddavis@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <richarddavis@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Jun 2 02:46:03 2009 New Revision: 780911 URL: http://svn.apache.org/viewvc?rev=780911&view=rev Log: Fix problems with the ASM optimized wrapper helpers with newer versions of HotSpot. Fix issue of not finding certain element names with xjc:simple. Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=780911&r1=780910&r2=780911&view=diff ============================================================================== --- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original) +++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Tue Jun 2 02:46:03 2009 @@ -816,6 +816,15 @@ } } } + if (getMethod == null && elField != null) { + getAccessor = JAXBUtils.nameToIdentifier(elField.getName(), JAXBUtils.IdentifierType.GETTER); + setAccessor = JAXBUtils.nameToIdentifier(elField.getName(), JAXBUtils.IdentifierType.SETTER); + try { + getMethod = valueClass.getMethod(getAccessor, AbstractWrapperHelper.NO_CLASSES); + } catch (NoSuchMethodException ex) { + //ignore for now + } + } String setAccessor2 = setAccessor; if ("return".equals(partName)) { //some versions of jaxb map "return" to "set_return" instead of "setReturn" @@ -911,7 +920,6 @@ jaxbMethods, fields, objectFactory); } catch (ClassNotFoundException e) { // ASM not found, just use reflection based stuff - e.printStackTrace(); } return null; } Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java?rev=780911&r1=780910&r2=780911&view=diff ============================================================================== --- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java (original) +++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java Tue Jun 2 02:46:03 2009 @@ -72,10 +72,11 @@ jaxbMethods, fields, objectFactory).compile(); + } catch (Throwable t) { // Some error - probably a bad version of ASM or similar - return null; } + return null; } @@ -115,14 +116,14 @@ Opcodes.ACC_PUBLIC | Opcodes.ACC_SUPER, newClassName, null, - periodToSlashes(WrapperHelper.class.getName()), - null); + "java/lang/Object", + new String[] {periodToSlashes(WrapperHelper.class.getName())}); addConstructor(newClassName, cw, objectFactory == null ? null : objectFactory.getClass()); boolean b = addSignature(); if (b) { - addCreateWrapperObject(newClassName, - objectFactory == null ? null : objectFactory.getClass()); + b = addCreateWrapperObject(newClassName, + objectFactory == null ? null : objectFactory.getClass()); } if (b) { b = addGetWrapperParts(newClassName, wrapperType, @@ -139,6 +140,7 @@ } } catch (Throwable e) { // ignore, we'll just fall down to reflection based + e.printStackTrace(); } return null; } @@ -165,14 +167,11 @@ MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "getSignature", "()Ljava/lang/String;", null, null); mv.visitCode(); + mv.visitLdcInsn(sig); Label l0 = new Label(); mv.visitLabel(l0); mv.visitLineNumber(100, l0); - mv.visitLdcInsn(sig); mv.visitInsn(Opcodes.ARETURN); - Label l1 = new Label(); - mv.visitLabel(l1); - mv.visitLineNumber(101, l1); mv.visitMaxs(0, 0); mv.visitEnd(); return true; @@ -196,7 +195,7 @@ mv.visitVarInsn(Opcodes.ALOAD, 0); mv.visitMethodInsn(Opcodes.INVOKESPECIAL, - periodToSlashes(WrapperHelper.class.getName()), + "java/lang/Object", "<init>", "()V"); if (objectFactory != null) { @@ -294,7 +293,6 @@ Label lEnd = new Label(); mv.visitLabel(lEnd); - mv.visitLineNumber(105, lEnd); mv.visitLocalVariable("this", "L" + newClassName + ";", null, lBegin, lEnd, 0); mv.visitLocalVariable("lst", "Ljava/util/List;", "Ljava/util/List<*>;", lBegin, lEnd, 1); mv.visitLocalVariable("ok", "L" + periodToSlashes(wrapperType.getName()) + ";", @@ -447,7 +445,6 @@ Label lEnd = new Label(); mv.visitLabel(lEnd); - mv.visitLineNumber(109, lEnd); mv.visitLocalVariable("this", "L" + newClassName + ";", null, lBegin, lEnd, 0); mv.visitLocalVariable("o", "Ljava/lang/Object;", null, lBegin, lEnd, 1); mv.visitLocalVariable("ret", "Ljava/util/List;", "Ljava/util/List<Ljava/lang/Object;>;", Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java?rev=780911&r1=780910&r2=780911&view=diff ============================================================================== --- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java (original) +++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java Tue Jun 2 02:46:03 2009 @@ -283,6 +283,8 @@ Set<Foo> fooSet = port.getFooSet(); assertEquals(2, fooSet.size()); + assertEquals("size: 2", port.doFooList(new ArrayList<Foo>(fooSet))); + assertEquals(24, port.echoIntDifferentWrapperName(24)); Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java?rev=780911&r1=780910&r2=780911&view=diff ============================================================================== --- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java (original) +++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java Tue Jun 2 02:46:03 2009 @@ -18,6 +18,7 @@ */ package org.apache.cxf.systest.jaxws; +import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.Vector; @@ -29,6 +30,10 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; import javax.xml.ws.Holder; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; @@ -136,5 +141,20 @@ } Set<Foo> getFooSet(); + + @RequestWrapper(className = "org.apache.cxf.systest.jaxws.DocLitWrappedCodeFirstService$DoFooListRequest") + @WebMethod(operationName = "doFooList") + String doFooList(@WebParam(name = "dbRef") List<Foo> fooList); + + + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "doFooList", propOrder = { "dbReves" }) + public static class DoFooListRequest { + @XmlElement(name = "dbRef", required = true) + protected List<Foo> dbReves = new ArrayList<Foo>(); + public List<Foo> getDbReves() { + return dbReves; + } + } } Modified: cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java?rev=780911&r1=780910&r2=780911&view=diff ============================================================================== --- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java (original) +++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java Tue Jun 2 02:46:03 2009 @@ -209,5 +209,9 @@ public String echoStringNotReallyAsync(String s) { return s; } + + public String doFooList(List<Foo> fooList) { + return "size: " + fooList.size(); + } } From richarddavis@example.net Tue Jun 02 02:47:24 2009 Return-Path: <richarddavis@example.net> Delivered-To: richarddavis@example.net Received: (qmail 64790 invoked from network); 2 Jun 2009 02:47:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Jun 2009 02:47:23 -0000 Received: (qmail 83980 invoked by uid 500); 2 Jun 2009 02:47:36 -0000 Delivered-To: richarddavis@example.net Received: (qmail 83908 invoked by uid 500); 2 Jun 2009 02:47:35 -0000 Mailing-List: contact richarddavis@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:richarddavis@example.net> List-Unsubscribe: <mailto:richarddavis@example.net> List-Post: <mailto:richarddavis@example.net> List-Id: <commits.cxf.apache.org> Reply-To: richarddavis@example.net Delivered-To: mailing list richarddavis@example.net Received: (qmail 83899 invoked by uid 99); 2 Jun 2009 02:47:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2009 02:47:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2009 02:47:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2218B23888BD; Tue, 2 Jun 2009 02:47:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r780912 - in /cxf/branches/2.1.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Date: Tue, 02 Jun 2009 02:47:11 -0000 To: richarddavis@example.net From: richarddavis@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <richarddavis@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Jun 2 02:47:10 2009 New Revision: 780912 URL: http://svn.apache.org/viewvc?rev=780912&view=rev Log: Merged revisions 777505 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r777505 | dkulp | 2009-05-22 09:08:25 -0400 (Fri, 22 May 2009) | 1 line WeakHashMaps aren't thread safe, wrap it with sync map. ........ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 2 02:47:10 2009 @@ -1 +1 @@ -/cxf/trunk: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,780033,780184,780213,780421,780664 +/cxf/trunk: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,780033,780184,780213,780421,780664 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=780912&r1=780911&r2=780912&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original) +++ cxf/branches/2.1.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Tue Jun 2 02:47:10 2009 @@ -22,6 +22,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -86,9 +87,11 @@ protected PhaseChainCache inboundChainCache = new PhaseChainCache(); protected Map<String, Object> currentRequestContext = new ConcurrentHashMap<String, Object>(); - protected Map<Thread, EchoContext> requestContext = new WeakHashMap<Thread, EchoContext>(); + protected Map<Thread, EchoContext> requestContext + = Collections.synchronizedMap(new
{'source': 'Apache Software Foundation Public Mail Archives'}