Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 28158 invoked from network); 21 Apr 2009 14:11:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Apr 2009 14:11:19 -0000 Received: (qmail 94984 invoked by uid 500); 21 Apr 2009 14:11:19 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 94875 invoked by uid 500); 21 Apr 2009 14:11:19 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 94866 invoked by uid 99); 21 Apr 2009 14:11:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Apr 2009 14:11:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Apr 2009 14:11:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 17C7C23889C4; Tue, 21 Apr 2009 14:10:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r767152 - in /cxf/branches/2.1.x-fixes: ./ parent/ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ rt/ws/security/ systests/src/test/java/org/apache/cxf/systest/jaxrs/ systests/src/test/resources/jaxrs/WEB-INF/ Date: Tue, 21 Apr 2009 14:10:57 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090421141058.17C7C23889C4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Apr 21 14:10:57 2009 New Revision: 767152 URL: http://svn.apache.org/viewvc?rev=767152&view=rev Log: Merged revisions 766962 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r766962 | dkulp | 2009-04-20 23:13:23 -0400 (Mon, 20 Apr 2009) | 2 lines Update XmlSchema, Jettison, WSS4J to latest versions ........ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/parent/pom.xml cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs/WEB-INF/beans.xml Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 21 14:10:57 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 +/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 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/parent/pom.xml?rev=767152&r1=767151&r2=767152&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.1.x-fixes/parent/pom.xml Tue Apr 21 14:10:57 2009 @@ -67,7 +67,7 @@ 1.0 2.4.0 0.4.0-incubating - 1.4.4 + 1.4.5 VALIDATION_AUTO @@ -544,7 +544,7 @@ org.codehaus.jettison jettison - 1.0.1 + 1.1 stax Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java?rev=767152&r1=767151&r2=767152&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java Tue Apr 21 14:10:57 2009 @@ -46,7 +46,6 @@ MediaType.APPLICATION_JSON_TYPE, new MetadataMap(), os); String s = os.toString(); - System.out.println(s); assertEquals( "{\"Tags\":{\"list\":[{\"group\":\"b\",\"name\":\"a\"},{\"group\":\"d\",\"name\":\"c\"}]}}", s); @@ -56,6 +55,7 @@ public void testWriteToListWithSingleValue() throws Exception { JSONProvider p = new JSONProvider(); p.setSerializeAsArray(true); + p.setArrayKeys(Collections.singletonList("list")); Tags tags = new Tags(); tags.addTag(createTag("a", "b")); @@ -65,7 +65,6 @@ MediaType.APPLICATION_JSON_TYPE, new MetadataMap(), os); String s = os.toString(); - System.out.println(s); assertEquals( "{\"Tags\":{\"list\":[{\"group\":\"b\",\"name\":\"a\"}]}}", s); @@ -75,7 +74,7 @@ public void testManyTags() throws Exception { JSONProvider p = new JSONProvider(); p.setSerializeAsArray(true); - p.setArrayKeys(Collections.singletonList("tags")); + p.setArrayKeys(Collections.singletonList("list")); Tags tags = new Tags(); tags.addTag(createTag("a", "b")); @@ -88,7 +87,6 @@ MediaType.APPLICATION_JSON_TYPE, new MetadataMap(), os); String s = os.toString(); - System.out.println(s); assertEquals( "{\"ManyTags\":{\"tags\":{\"list\":[{\"group\":\"b\",\"name\":\"a\"}]}}}", s); Modified: cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml?rev=767152&r1=767151&r2=767152&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml (original) +++ cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml Tue Apr 21 14:10:57 2009 @@ -60,7 +60,7 @@ org.apache.ws.security wss4j - 1.5.6 + 1.5.7 axis Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java?rev=767152&r1=767151&r2=767152&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java (original) +++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java Tue Apr 21 14:10:57 2009 @@ -39,7 +39,7 @@ @BeforeClass public static void startServers() throws Exception { assertTrue("server did not launch correctly", - launchServer(BookServerSpring.class)); + launchServer(BookServerSpring.class, true)); } @Test Modified: cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs/WEB-INF/beans.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs/WEB-INF/beans.xml?rev=767152&r1=767151&r2=767152&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs/WEB-INF/beans.xml (original) +++ cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs/WEB-INF/beans.xml Tue Apr 21 14:10:57 2009 @@ -101,7 +101,7 @@ - Books + books