cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r772662 - in /cxf/branches/2.1.x-fixes: ./ parent/pom.xml systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
Date Thu, 07 May 2009 14:35:07 GMT
Author: dkulp
Date: Thu May  7 14:35:07 2009
New Revision: 772662

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

........
  r771416 | dkulp | 2009-05-04 15:47:40 -0400 (Mon, 04 May 2009) | 2 lines
  
  Update jetty version, add a test.
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/parent/pom.xml
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  7 14:35:07 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,766962-766963,767159,767191,767927,772143
+/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-766963,767159,767191,767927,771416,772143

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=772662&r1=772661&r2=772662&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/parent/pom.xml Thu May  7 14:35:07 2009
@@ -52,7 +52,7 @@
         <jaxb.version>2.1</jaxb.version>
         <jaxb.impl.version>2.1.9</jaxb.impl.version>
         <jaxb.xjc.version>2.1.9</jaxb.xjc.version>
-        <jetty.version>6.1.15</jetty.version>
+        <jetty.version>6.1.17</jetty.version>
         <saaj.version>1.3</saaj.version>
         <spring.version>2.0.8</spring.version>
         <spring.mock>spring-mock</spring.mock>

Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java?rev=772662&r1=772661&r2=772662&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
(original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
Thu May  7 14:35:07 2009
@@ -544,8 +544,11 @@
             buffer2.append((char)('A' + (x % 26)));
         }
 
-        String valueSets[][] = {{"hello", "world"}, {"is pi > 3 ?", " is pi < 4\\\""},
-                                {"<illegal_tag/>", ""}, {buffer.toString(), buffer2.toString()}};
+        String valueSets[][] = {{"hello", "world"},
+                                {"is pi > 3 ?", " is pi < 4\\\""},
+                                {"<illegal_tag/>", ""},
+                                {buffer.toString(), buffer2.toString()},
+                                {"jon&marry", "marry&john"}};
 
         for (int i = 0; i < valueSets.length; i++) {
             String x = valueSets[i][0];



Mime
View raw message