Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 80980 invoked from network); 5 Mar 2008 17:41:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Mar 2008 17:41:55 -0000 Received: (qmail 666 invoked by uid 500); 5 Mar 2008 17:41:49 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 612 invoked by uid 500); 5 Mar 2008 17:41:49 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 587 invoked by uid 99); 5 Mar 2008 17:41:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Mar 2008 09:41:49 -0800 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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Mar 2008 17:41:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AC9F31A9832; Wed, 5 Mar 2008 09:41:20 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r633944 - in /incubator/cxf/branches/2.0.x-fixes: ./ common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/ integration/jca/ parent/ rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/ rt/transports/jms/ systests/ systests/src/test/j... Date: Wed, 05 Mar 2008 17:41:19 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080305174120.AC9F31A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Mar 5 09:41:16 2008 New Revision: 633944 URL: http://svn.apache.org/viewvc?rev=633944&view=rev Log: Merged revisions 633565 via svnmerge from https://svn.apache.org/repos/asf/incubator/cxf/trunk ........ r633565 | dkulp | 2008-03-04 12:43:26 -0500 (Tue, 04 Mar 2008) | 2 lines Update to the latest versions of a BUNCH of things. (all the latest geronimo-specs, jetty, jettison, etc...) ........ Modified: incubator/cxf/branches/2.0.x-fixes/ (props changed) incubator/cxf/branches/2.0.x-fixes/common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java incubator/cxf/branches/2.0.x-fixes/integration/jca/pom.xml incubator/cxf/branches/2.0.x-fixes/parent/pom.xml incubator/cxf/branches/2.0.x-fixes/pom.xml incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml incubator/cxf/branches/2.0.x-fixes/systests/pom.xml incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_add_book_json.txt incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_book123.txt incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_books.txt incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/HttpBindingServletTest.java Propchange: incubator/cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: incubator/cxf/branches/2.0.x-fixes/common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java?rev=633944&r1=633943&r2=633944&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java (original) +++ incubator/cxf/branches/2.0.x-fixes/common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java Wed Mar 5 09:41:16 2008 @@ -65,9 +65,9 @@ assertEquals("Unexpected value for attribute decimalAttr", new BigDecimal("115"), foo.getDecimalAttr()); assertEquals("Unexpected value for attribute floatAttr", - new Float(116F), foo.getFloatAttr()); + new Float(116F), new Float(foo.getFloatAttr())); assertEquals("Unexpected value for attribute doubleAttr", - new Double(117D), foo.getDoubleAttr()); + new Double(117D), new Double(foo.getDoubleAttr())); assertEquals("Unexpected value for attribute byteAttr", 118, foo.getByteAttr()); Modified: incubator/cxf/branches/2.0.x-fixes/integration/jca/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jca/pom.xml?rev=633944&r1=633943&r2=633944&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/integration/jca/pom.xml (original) +++ incubator/cxf/branches/2.0.x-fixes/integration/jca/pom.xml Wed Mar 5 09:41:16 2008 @@ -119,7 +119,7 @@ org.apache.geronimo.specs - geronimo-ejb_2.1_spec + geronimo-ejb_3.0_spec provided Modified: incubator/cxf/branches/2.0.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=633944&r1=633943&r2=633944&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original) +++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Wed Mar 5 09:41:16 2008 @@ -47,15 +47,14 @@ 2.0.5 2.0 2.0 - 6.1.6 + 6.1.8 1.3 1.3 - 2.0.6 + 2.0.8 spring-mock 1.6.1 10.2.2.0 4.1.1 - 1.1 1.6R5 1.0 2.2.0 @@ -293,7 +292,7 @@ junit junit - 4.3.1 + 4.4 test @@ -331,7 +330,7 @@ httpunit httpunit - 1.6.1 + 1.6.2 xerces @@ -414,12 +413,12 @@ org.apache.geronimo.specs geronimo-stax-api_1.0_spec - 1.0 + 1.0.1 org.codehaus.jettison jettison - 1.0-RC2 + 1.0 stax @@ -431,7 +430,7 @@ org.codehaus.woodstox wstx-asl - 3.2.1 + 3.2.4 stax @@ -719,47 +718,47 @@ org.apache.geronimo.specs geronimo-annotation_1.0_spec - 1.1 + 1.1.1 org.apache.geronimo.specs geronimo-servlet_2.5_spec - 1.1-M1 + 1.1.2 org.apache.geronimo.specs geronimo-javamail_1.4_spec - 1.0-M1 + 1.2 org.apache.geronimo.specs geronimo-activation_1.1_spec - 1.0-M1 + 1.0.2 org.apache.geronimo.specs - geronimo-j2ee-management_1.0_spec - ${geronimo.version} + geronimo-j2ee-management_1.1_spec + 1.0.1 org.apache.geronimo.specs geronimo-jms_1.1_spec - ${geronimo.version} + 1.1.1 org.apache.geronimo.specs geronimo-j2ee-connector_1.5_spec - ${geronimo.version} + 2.0.0 org.apache.geronimo.specs - geronimo-ejb_2.1_spec - ${geronimo.version} + geronimo-ejb_3.0_spec + 1.0.1 org.apache.geronimo.specs geronimo-ws-metadata_2.0_spec - 1.1.1 + 1.1.2 org.apache.activemq Modified: incubator/cxf/branches/2.0.x-fixes/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/pom.xml?rev=633944&r1=633943&r2=633944&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/pom.xml (original) +++ incubator/cxf/branches/2.0.x-fixes/pom.xml Wed Mar 5 09:41:16 2008 @@ -420,7 +420,7 @@ org.apache.maven.plugins maven-assembly-plugin - 2.2-beta-1 + 2.2-beta-2 Modified: incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java?rev=633944&r1=633943&r2=633944&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java (original) +++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java Wed Mar 5 09:41:16 2008 @@ -132,7 +132,7 @@ assertNotNull(val); assertTrue(val instanceof TradePriceData); assertEquals("CXF", ((TradePriceData)val).getTickerSymbol()); - assertEquals(1.0f, ((TradePriceData)val).getTickerPrice()); + assertEquals(new Float(1.0f), new Float(((TradePriceData)val).getTickerPrice())); } private JAXBDataBinding getDataBinding(Class... clz) throws Exception { Modified: incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml?rev=633944&r1=633943&r2=633944&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml (original) +++ incubator/cxf/branches/2.0.x-fixes/rt/transports/jms/pom.xml Wed Mar 5 09:41:16 2008 @@ -79,7 +79,7 @@ org.apache.geronimo.specs - geronimo-j2ee-management_1.0_spec + geronimo-j2ee-management_1.1_spec test Modified: incubator/cxf/branches/2.0.x-fixes/systests/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/pom.xml?rev=633944&r1=633943&r2=633944&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/systests/pom.xml (original) +++ incubator/cxf/branches/2.0.x-fixes/systests/pom.xml Wed Mar 5 09:41:16 2008 @@ -114,7 +114,7 @@ org.apache.geronimo.specs - geronimo-ejb_2.1_spec + geronimo-ejb_3.0_spec provided @@ -327,7 +327,7 @@ org.apache.geronimo.specs - geronimo-j2ee-management_1.0_spec + geronimo-j2ee-management_1.1_spec test Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_add_book_json.txt URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_add_book_json.txt?rev=633944&r1=633943&r2=633944&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_add_book_json.txt (original) +++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_add_book_json.txt Wed Mar 5 09:41:16 2008 @@ -1 +1 @@ -{"acme.book":"2"} \ No newline at end of file +{"acme.book":2} \ No newline at end of file Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_book123.txt URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_book123.txt?rev=633944&r1=633943&r2=633944&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_book123.txt (original) +++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_book123.txt Wed Mar 5 09:41:16 2008 @@ -1 +1 @@ -{"acme.Book":{"acme.id":"123","acme.name":"CXF in Action"}} \ No newline at end of file +{"acme.Book":{"acme.id":123,"acme.name":"CXF in Action"}} \ No newline at end of file Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_books.txt URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_books.txt?rev=633944&r1=633943&r2=633944&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_books.txt (original) +++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_books.txt Wed Mar 5 09:41:16 2008 @@ -1 +1 @@ -{"acme.Books":{"acme.books":{"acme.id":"123","acme.name":"CXF in Action"}}} \ No newline at end of file +{"acme.Books":{"acme.books":{"acme.id":123,"acme.name":"CXF in Action"}}} \ No newline at end of file Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/HttpBindingServletTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/HttpBindingServletTest.java?rev=633944&r1=633943&r2=633944&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/HttpBindingServletTest.java (original) +++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/HttpBindingServletTest.java Wed Mar 5 09:41:16 2008 @@ -37,7 +37,7 @@ public class HttpBindingServletTest extends AbstractServletTest { static final String JSON_CUSTOMER = "{\"jra.customer\":" - + "{\"jra.id\":\"123\",\"jra.name\":\"Dan Diephouse\"}}"; + + "{\"jra.id\":123,\"jra.name\":\"Dan Diephouse\"}}"; @Override