cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1090232 - in /cxf/branches/2.3.x-fixes: ./ rt/frontend/jaxrs/pom.xml rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
Date Fri, 08 Apr 2011 13:09:26 GMT
Author: sergeyb
Date: Fri Apr  8 13:09:25 2011
New Revision: 1090232

URL: http://svn.apache.org/viewvc?rev=1090232&view=rev
Log:
Merged revisions 1090225,1090227 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1090225 | sergeyb | 2011-04-08 13:53:51 +0100 (Fri, 08 Apr 2011) | 1 line
  
  [CXF-2716] Support for reading JSON collections
........
  r1090227 | sergeyb | 2011-04-08 13:55:47 +0100 (Fri, 08 Apr 2011) | 1 line
  
  [CXF-2916] Better handling of JSON nulls
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1090225-1090227

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml?rev=1090232&r1=1090231&r2=1090232&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml Fri Apr  8 13:09:25 2011
@@ -115,6 +115,7 @@
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
+            <version>1.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -197,4 +198,11 @@
             
         </plugins>
     </build>
+    <!-- will get removed immediately after Jettison 1.3 gets released and pushed into
Central-->
+    <repositories>
+       <repository>
+         <id>codehause-snapshots</id>
+         <url>http://snapshots.repository.codehaus.org</url>
+       </repository>
+    </repositories>
 </project>

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java?rev=1090232&r1=1090231&r2=1090232&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JSONProviderTest.java
Fri Apr  8 13:09:25 2011
@@ -327,7 +327,6 @@ public class JSONProviderTest extends As
     }
     
     @Test
-    @Ignore("Enable once http://jira.codehaus.org/browse/JETTISON-104 gets resolved")
     public void testReadUnqualifiedCollection() throws Exception {
         String data = "{\"Book\":[{\"id\":\"123\",\"name\":\"CXF in Action\"}"
             + ",{\"id\":\"124\",\"name\":\"CXF Rocks\"}]}";
@@ -370,7 +369,6 @@ public class JSONProviderTest extends As
     }
     
     @Test
-    @Ignore("Enable once http://jira.codehaus.org/browse/JETTISON-104 gets resolved")
     public void testReadQualifiedCollection() throws Exception {
         String data = "{\"ns1.thetag\":[{\"group\":\"b\",\"name\":\"a\"}"
             + ",{\"group\":\"d\",\"name\":\"c\"}]}";
@@ -515,7 +513,6 @@ public class JSONProviderTest extends As
     
     @SuppressWarnings("unchecked")
     @Test
-    @Ignore("Enable once http://jira.codehaus.org/browse/JETTISON-89 gets resolved")
     public void testReadListOfDerivedTypesWithNullField() throws Exception {
         JSONProvider p = new JSONProvider();
         Map<String, String> namespaceMap = new HashMap<String, String>();



Mime
View raw message