svn commit: r965574 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/util/ modules/parent/ modules/saaj/test/org/apache/a...

Mon, 19 Jul 2010 11:24:29 -0700 

Author: veithen
Date: Mon Jul 19 18:22:59 2010
New Revision: 965574

URL: http://svn.apache.org/viewvc?rev=965574&view=rev
Log:
Merged r733539 to the 1.5 branch to fix an unpredictable test case in the SAAJ 
module.

Modified:
    axis/axis2/java/core/branches/java/1_5/   (props changed)
    axis/axis2/java/core/branches/java/1_5/modules/distribution/   (props 
changed)
    
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
   (props changed)
    
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
   (props changed)
    axis/axis2/java/core/branches/java/1_5/modules/parent/   (props changed)
    
axis/axis2/java/core/branches/java/1_5/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
    axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml   
(props changed)
    axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/   (props 
changed)
    axis/axis2/java/core/branches/java/1_5/modules/transport/local/   (props 
changed)
    
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
   (props changed)
    
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
   (props changed)

Propchange: axis/axis2/java/core/branches/java/1_5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 19 18:22:59 2010
@@ -1,2 +1,2 @@
 
/axis/axis2/java/core/trunk:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074
-/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980
+/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980

Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 19 18:22:59 2010
@@ -1,2 +1,2 @@
 
/axis/axis2/java/core/trunk/modules/distribution:922914,922983,936434,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074
-/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 19 18:22:59 2010
@@ -1,2 +1,2 @@
 
/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074
-/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,777897,777934,801630,803725,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777897,777934,801630,803725,834058,834175,904780,905980

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 19 18:22:59 2010
@@ -1,2 +1,2 @@
 
/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074
-/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,777897,777934,801630,803725,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:733539,761709,771051,777897,777934,801630,803725,834058,834175,904780,905980

Propchange: axis/axis2/java/core/branches/java/1_5/modules/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 19 18:22:59 2010
@@ -1,2 +1,2 @@
 
/axis/axis2/java/core/trunk/modules/parent:922914,922983,936434,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074
-/webservices/axis2/trunk/java/modules/parent:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/parent:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980

Modified: 
axis/axis2/java/core/branches/java/1_5/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java?rev=965574&r1=965573&r2=965574&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/java/1_5/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
 (original)
+++ 
axis/axis2/java/core/branches/java/1_5/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
 Mon Jul 19 18:22:59 2010
@@ -155,6 +155,9 @@ public class IntegrationTest extends Tes
         }
     }
 
+    // TODO: it is not clear how this method can give predictable results,
+    //       given that ByteArrayOutputStream#toString uses the platform 
default charset
+    //       encoding while SOAPMessage#writeTo may use another encoding!!!
     private String printSOAPMessage(final SOAPMessage msg) throws 
SOAPException, IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         msg.writeTo(baos);
@@ -365,7 +368,8 @@ public class IntegrationTest extends Tes
 
             printSOAPMessage(requestMessage);
             String responseStr = printSOAPMessage(response);
-            assertTrue(responseStr.indexOf("This is some text.Here are some 
special chars : öÆÚ®¤") != -1);
+            assertEquals("This is some text.Here are some special chars : 
\u00F6\u00C6\u00DA\u00AE\u00A4",
+                         
response.getSOAPBody().getElementsByTagName("something").item(0).getTextContent());
             assertTrue(responseStr.indexOf("echo") != -1);
             sCon.close();
         } catch (SOAPException e) {

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 19 18:22:59 2010
@@ -1,2 +1,2 @@
 
/axis/axis2/java/core/trunk/modules/transport/http/pom.xml:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074
-/webservices/axis2/trunk/java/modules/transport/http/pom.xml:771051,777897,777934,801630,803725,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/transport/http/pom.xml:733539,771051,777897,777934,801630,803725,834058,834175,904780,905980

Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 19 18:22:59 2010
@@ -1,2 +1,2 @@
 
/axis/axis2/java/core/trunk/modules/transport/http/src:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074
-/webservices/axis2/trunk/java/modules/transport/http/src:771051,777897,777934,801630,803725,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/transport/http/src:733539,771051,777897,777934,801630,803725,834058,834175,904780,905980

Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/local/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 19 18:22:59 2010
@@ -1,2 +1,2 @@
 
/axis/axis2/java/core/trunk/modules/transport/local:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074
-/webservices/axis2/trunk/java/modules/transport/local:771051,777897,777934,801630,803725,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/transport/local:733539,771051,777897,777934,801630,803725,834058,834175,904780,905980

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 19 18:22:59 2010
@@ -1,2 +1,2 @@
 
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:761709,771051,777897,777934,801630,803725,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:733539,761709,771051,777897,777934,801630,803725,834058,834175,904780,905980

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 19 18:22:59 2010
@@ -1,2 +1,2 @@
 
/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074
-/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:761709,771051,777897,777934,801630,803725,834058,834175,904780,905980
+/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:733539,761709,771051,777897,777934,801630,803725,834058,834175,904780,905980

Reply via email to