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 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
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 @@
<jaxb.impl.version>2.0.5</jaxb.impl.version>
<jaxb.xjc.version>2.0</jaxb.xjc.version>
<jaxws.version>2.0</jaxws.version>
- <jetty.version>6.1.6</jetty.version>
+ <jetty.version>6.1.8</jetty.version>
<saaj.version>1.3</saaj.version>
<saaj.impl.version>1.3</saaj.impl.version>
- <spring.version>2.0.6</spring.version>
+ <spring.version>2.0.8</spring.version>
<spring.mock>spring-mock</spring.mock>
<wsdl4j.version>1.6.1</wsdl4j.version>
<derby.version>10.2.2.0</derby.version>
<activemq.version>4.1.1</activemq.version>
- <geronimo.version>1.1</geronimo.version>
<rhino.version>1.6R5</rhino.version>
<jdom.version>1.0</jdom.version>
<xmlbeans.version>2.2.0</xmlbeans.version>
@@ -293,7 +292,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.3.1</version>
+ <version>4.4</version>
<scope>test</scope>
</dependency>
@@ -331,7 +330,7 @@
<dependency>
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
- <version>1.6.1</version>
+ <version>1.6.2</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -414,12 +413,12 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.0-RC2</version>
+ <version>1.0</version>
<exclusions>
<exclusion>
<groupId>stax</groupId>
@@ -431,7 +430,7 @@
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
+ <version>3.2.4</version>
<exclusions>
<exclusion>
<groupId>stax</groupId>
@@ -719,47 +718,47 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.1-M1</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
- <version>1.0-M1</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.0-M1</version>
+ <version>1.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
- <version>${geronimo.version}</version>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>${geronimo.version}</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>${geronimo.version}</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
- <version>${geronimo.version}</version>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
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 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
+ <version>2.2-beta-2</version>
</plugin>
<plugin>
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 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
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 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -327,7 +327,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
<scope>test</scope>
</dependency>
<dependency>
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
