cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
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 GMT
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 @@
         <jdom.version>1.0</jdom.version>
         <xmlbeans.version>2.4.0</xmlbeans.version>
         <abdera.version>0.4.0-incubating</abdera.version>
-        <xmlschema.version>1.4.4</xmlschema.version>
+        <xmlschema.version>1.4.5</xmlschema.version>
         <checkstyle.extension />
 
         <spring.validation.mode>VALIDATION_AUTO</spring.validation.mode>
@@ -544,7 +544,7 @@
             <dependency>
                 <groupId>org.codehaus.jettison</groupId>
                 <artifactId>jettison</artifactId>
-                <version>1.0.1</version>
+                <version>1.1</version>
                 <exclusions>
                     <exclusion>
                         <groupId>stax</groupId>

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<String, Object>(),
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<String, Object>(),
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<String, Object>(),
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 @@
         <dependency>
             <groupId>org.apache.ws.security</groupId>
             <artifactId>wss4j</artifactId>
-            <version>1.5.6</version>
+            <version>1.5.7</version>
             <exclusions>
                 <exclusion>
                     <groupId>axis</groupId>

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 @@
   </util:map> 
   
   <util:list id="jsonKeys">
-    <value>Books</value>
+    <value>books</value>
   </util:list>
   
   <bean id="jsonProvider" class="org.apache.cxf.jaxrs.provider.JSONProvider">



Mime
View raw message