Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1152200 - in /cxf/branches/2.4.x-fixes: ./
 common/common/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
 rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
Date: Fri, 29 Jul 2011 13:08:45 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
Message-Id: <20110729130845.DFDD6238890D@eris.apache.org>

Author: dkulp
Date: Fri Jul 29 13:08:45 2011
New Revision: 1152200

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

........
  r1151920 | dkulp | 2011-07-28 12:41:50 -0400 (Thu, 28 Jul 2011) | 1 line
  
  Fix build failure and remove test printlns
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
    cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java

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

Modified: cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java?rev=1152200&r1=1152199&r2=1152200&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java (original)
+++ cxf/branches/2.4.x-fixes/common/common/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java Fri Jul 29 13:08:45 2011
@@ -410,12 +410,14 @@ public class InTransformReaderTest exten
      */
     private void verifyReaders(XMLStreamReader reader, XMLStreamReader teacher, 
                                boolean eec) throws XMLStreamException {
+        /*
         if (true) {
             System.out.println(">>>>>>>>>");
             StaxUtils.copy(reader, System.out);
             System.out.println("<<<<<<<<<");
             return;
         }
+        */
         // compare the elements and attributes while ignoring comments, line breaks, etc
         for (;;) {
             int revent = getNextEvent(reader);

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java?rev=1152200&r1=1152199&r2=1152200&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java Fri Jul 29 13:08:45 2011
@@ -89,7 +89,10 @@ public class SourceProviderTest extends 
         XMLStreamReader reader = StaxUtils.createXMLStreamReader(is);
         reader = new InTransformReader(reader, 
                                        Collections.singletonMap("{http://bar}test", "test2"),
-                                       null, false);
+                                       null,
+                                       null,
+                                       null,
+                                       false);
         
         p.getMessage().setContent(XMLStreamReader.class, reader);