Author: dkulp
Date: Tue Mar 4 09:43:26 2008
New Revision: 633565
URL: http://svn.apache.org/viewvc?rev=633565&view=rev
Log:
Update to the latest versions of a BUNCH of things. (all the latest
geronimo-specs, jetty, jettison, etc...)
Modified:
incubator/cxf/trunk/common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java
incubator/cxf/trunk/integration/jca/pom.xml
incubator/cxf/trunk/parent/pom.xml
incubator/cxf/trunk/pom.xml
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AegisTest.java
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
incubator/cxf/trunk/rt/transports/jms/pom.xml
incubator/cxf/trunk/systests/pom.xml
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book123json.txt
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdjson.txt
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdsjson123.txt
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdsjson124.txt
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_add_book_json.txt
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_book123.txt
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_books.txt
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/HttpBindingServletTest.java
Modified:
incubator/cxf/trunk/common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
---
incubator/cxf/trunk/common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java
(original)
+++
incubator/cxf/trunk/common/xjc/dv-test/src/test/java/org/apache/cxf/xjc/dv/DefaultValueTest.java
Tue Mar 4 09:43:26 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/trunk/integration/jca/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/pom.xml?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
--- incubator/cxf/trunk/integration/jca/pom.xml (original)
+++ incubator/cxf/trunk/integration/jca/pom.xml Tue Mar 4 09:43:26 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/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Tue Mar 4 09:43:26 2008
@@ -47,15 +47,14 @@
<jaxb.impl.version>2.1.6</jaxb.impl.version>
<jaxb.xjc.version>2.1.6</jaxb.xjc.version>
<jaxws.version>2.1-1</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.6R7</rhino.version>
<jdom.version>1.0</jdom.version>
<xmlbeans.version>2.2.0</xmlbeans.version>
@@ -295,7 +294,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.3.1</version>
+ <version>4.4</version>
<scope>test</scope>
</dependency>
@@ -333,7 +332,7 @@
<dependency>
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
- <version>1.6.1</version>
+ <version>1.6.2</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -416,12 +415,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>
@@ -463,7 +462,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>
@@ -755,47 +754,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/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Tue Mar 4 09:43:26 2008
@@ -393,7 +393,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -437,7 +437,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/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
(original)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
Tue Mar 4 09:43:26 2008
@@ -18,6 +18,9 @@
*/
package org.apache.cxf.aegis.type.encoded;
+import java.math.BigDecimal;
+import java.util.Arrays;
+
import javax.xml.namespace.QName;
import org.apache.cxf.aegis.Context;
@@ -119,13 +122,15 @@
reader = new
ElementReader(getClass().getResourceAsStream("arrayUrType2.xml"));
objects = (Object[])
createArrayType(Object[].class).readObject(reader, context);
reader.getXMLStreamReader().close();
- assertArrayEquals(new Object[]{42, (float)42.42, "Forty Two"},
objects);
+ assertArrayEquals(Arrays.asList(objects).toString(),
+ new Object[]{42, new BigDecimal("42.42"), "Forty
Two"},
+ objects);
// round trip tests
objects = readWriteReadRef("arrayUrType1.xml", Object[].class);
- assertArrayEquals(new Object[]{42, (float)42.42, "Forty Two"},
objects);
+ assertArrayEquals(new Object[]{42, new Float(42.42f), "Forty Two"},
objects);
objects = readWriteReadRef("arrayUrType2.xml", Object[].class);
- assertArrayEquals(new Object[]{42, (float)42.42, "Forty Two"},
objects);
+ assertArrayEquals(new Object[]{42, new BigDecimal("42.42"), "Forty
Two"}, objects);
}
@Test
@@ -142,13 +147,13 @@
reader = new
ElementReader(getClass().getResourceAsStream("arrayAnyType2.xml"));
objects = (Object[])
createArrayType(Object[].class).readObject(reader, context);
reader.getXMLStreamReader().close();
- assertArrayEquals(new Object[]{42, (float)42.42, "Forty Two"},
objects);
+ assertArrayEquals(new Object[]{42, new BigDecimal("42.42"), "Forty
Two"}, objects);
// round trip tests
objects = readWriteReadRef("arrayAnyType1.xml", Object[].class);
assertArrayEquals(new Object[]{42, (float)42.42, "Forty Two"},
objects);
objects = readWriteReadRef("arrayAnyType2.xml", Object[].class);
- assertArrayEquals(new Object[]{42, (float)42.42, "Forty Two"},
objects);
+ assertArrayEquals(new Object[]{42, new BigDecimal("42.42"), "Forty
Two"}, objects);
}
@Test
Modified:
incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
(original)
+++
incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
Tue Mar 4 09:43:26 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/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
(original)
+++
incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
Tue Mar 4 09:43:26 2008
@@ -64,7 +64,7 @@
+ "<arg0>str1 str2 str3</arg0></ns2:addNumbers>";
assertTrue("Client does not use the generated wrapper class to marshal
request parameters",
strWriter.toString().indexOf(expected) > -1);
- assertEquals("Get the wrong result", 100, result.get(0));
+ assertEquals("Get the wrong result", 100, (int)result.get(0));
}
}
Modified:
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AegisTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AegisTest.java?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AegisTest.java
(original)
+++
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/AegisTest.java
Tue Mar 4 09:43:26 2008
@@ -126,7 +126,7 @@
assertEquals("aegis_fortest_javascript_cxf_apache_org_Mammal", marker);
Object intValue =
testUtilities.rhinoEvaluate("globalResponseObject._return._objects._anyType[1]");
- assertEquals(new Integer(42), intValue);
+ assertEquals(new Float(42), new Float(intValue.toString()));
return null;
}
Modified:
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
(original)
+++
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/DocLitWrappedClientTest.java
Tue Mar 4 09:43:26 2008
@@ -159,7 +159,7 @@
assertNotNull(responseObject);
// by default, for doc/lit/wrapped, we end up with a part
object with a slot named
// 'return'.
- Integer returnValue =
testUtilities.rhinoCallMethodInContext(Integer.class, responseObject,
+ int returnValue =
testUtilities.rhinoCallMethodInContext(Integer.class, responseObject,
"getReturn");
assertEquals(42, returnValue);
Modified: incubator/cxf/trunk/rt/transports/jms/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/pom.xml?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/jms/pom.xml Tue Mar 4 09:43:26 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/trunk/systests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/pom.xml (original)
+++ incubator/cxf/trunk/systests/pom.xml Tue Mar 4 09:43:26 2008
@@ -100,7 +100,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>
@@ -337,7 +337,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/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book123json.txt
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book123json.txt?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book123json.txt
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_book123json.txt
Tue Mar 4 09:43:26 2008
@@ -1 +1 @@
-{"Book":{"id":"123","name":"CXF in Action"}}
\ No newline at end of file
+{"Book":{"id":123,"name":"CXF in Action"}}
\ No newline at end of file
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdjson.txt
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdjson.txt?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdjson.txt
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdjson.txt
Tue Mar 4 09:43:26 2008
@@ -1 +1 @@
-{"CD":{"id":"123","name":"BOHEMIAN RHAPSODY"}}
\ No newline at end of file
+{"CD":{"id":123,"name":"BOHEMIAN RHAPSODY"}}
\ No newline at end of file
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdsjson123.txt
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdsjson123.txt?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdsjson123.txt
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdsjson123.txt
Tue Mar 4 09:43:26 2008
@@ -1 +1 @@
-{"id":"124","name":"BICYCLE RACE"}
\ No newline at end of file
+{"id":124,"name":"BICYCLE RACE"}
\ No newline at end of file
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdsjson124.txt
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdsjson124.txt?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdsjson124.txt
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxrs/resources/expected_get_cdsjson124.txt
Tue Mar 4 09:43:26 2008
@@ -1 +1 @@
-{"id":"123","name":"BOHEMIAN RHAPSODY"}
\ No newline at end of file
+{"id":123,"name":"BOHEMIAN RHAPSODY"}
\ No newline at end of file
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_add_book_json.txt
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_add_book_json.txt?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_add_book_json.txt
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_add_book_json.txt
Tue Mar 4 09:43:26 2008
@@ -1 +1 @@
-{"acme.book":"2"}
\ No newline at end of file
+{"acme.book":2}
\ No newline at end of file
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_book123.txt
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_book123.txt?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_book123.txt
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_book123.txt
Tue Mar 4 09:43:26 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/trunk/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_books.txt
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_books.txt?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_books.txt
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/rest/resources/expected_json_books.txt
Tue Mar 4 09:43:26 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/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/HttpBindingServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/HttpBindingServletTest.java?rev=633565&r1=633564&r2=633565&view=diff
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/HttpBindingServletTest.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/HttpBindingServletTest.java
Tue Mar 4 09:43:26 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
