jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1470729 - in /incubator/jspwiki/branches/MVN3_BRANCH: ChangeLog jspwiki-war/src/org/apache/wiki/Release.java jspwiki-war/src/org/apache/wiki/util/UtilJ2eeCompat.java jspwiki-war/tests/org/apache/wiki/util/UtilJ2eeCompatTest.java
Date Mon, 22 Apr 2013 21:50:51 GMT
Author: juanpablo
Date: Mon Apr 22 21:50:51 2013
New Revision: 1470729

URL: http://svn.apache.org/r1470729
Log:
porting 2.9.1-incubating-1 from trunk

Modified:
    incubator/jspwiki/branches/MVN3_BRANCH/ChangeLog
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/src/org/apache/wiki/Release.java
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/src/org/apache/wiki/util/UtilJ2eeCompat.java
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/tests/org/apache/wiki/util/UtilJ2eeCompatTest.java

Modified: incubator/jspwiki/branches/MVN3_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/ChangeLog?rev=1470729&r1=1470728&r2=1470729&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/ChangeLog Mon Apr 22 21:50:51 2013
@@ -1,3 +1,9 @@
+2013-04-21  Harry Metske <metskem@apache.org>
+
+       * 2.9.1-incubating-1
+
+       * fixed JSPWIKI-396): UTF-8 characters in wiki pages incorrectly rendered if served
by Tomcat
+
 2013-04-14 Glen Mazza (glenmazza AT apache DOT org)
 
        * Start of Selenium plugin (just testing prior to it moving into its own module)

Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/src/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/src/org/apache/wiki/Release.java?rev=1470729&r1=1470728&r2=1470729&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/src/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/src/org/apache/wiki/Release.java Mon
Apr 22 21:50:51 2013
@@ -75,7 +75,7 @@ public final class Release
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "0";
+    public static final String     BUILD         = "1";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/src/org/apache/wiki/util/UtilJ2eeCompat.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/src/org/apache/wiki/util/UtilJ2eeCompat.java?rev=1470729&r1=1470728&r2=1470729&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/src/org/apache/wiki/util/UtilJ2eeCompat.java
(original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/src/org/apache/wiki/util/UtilJ2eeCompat.java
Mon Apr 22 21:50:51 2013
@@ -111,6 +111,8 @@ public class UtilJ2eeCompat
         else if( serverInfo.indexOf( TOMCAT ) >= 0 )
         {
             log.info( TOMCAT + " detected" );
+            // use response.getOutputStream instead of response.getWriter
+            useStream = true;
         }
         else if( serverInfo.indexOf( JRUN ) >= 0 )
         {

Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/tests/org/apache/wiki/util/UtilJ2eeCompatTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/tests/org/apache/wiki/util/UtilJ2eeCompatTest.java?rev=1470729&r1=1470728&r2=1470729&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/tests/org/apache/wiki/util/UtilJ2eeCompatTest.java
(original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/tests/org/apache/wiki/util/UtilJ2eeCompatTest.java
Mon Apr 22 21:50:51 2013
@@ -35,7 +35,7 @@ public class UtilJ2eeCompatTest extends 
     {
         assertTrue( UtilJ2eeCompat.useOutputStream( "Oracle Containers for J2EE 10g(10.1.3.1.0
)", true ) );
         // Do not reinitialize
-        assertTrue( UtilJ2eeCompat.useOutputStream( "Apache Tomcat/5.5.20" ) );
+        assertTrue( UtilJ2eeCompat.useOutputStream( "Apache Tomcat/7.0.39" ) );
         // Do not reinitialize
         assertTrue( UtilJ2eeCompat.useOutputStream( "Sun Java System Application Server 9.1_02"
) );
     }
@@ -49,9 +49,9 @@ public class UtilJ2eeCompatTest extends 
 
     public void testTomcat()
     {
-        assertFalse( UtilJ2eeCompat.useOutputStream( "Apache Tomcat/5.5.20", true ) );
+        assertTrue( UtilJ2eeCompat.useOutputStream( "Apache Tomcat/7.0.39", true ) );
         // Reinitialize
-        assertFalse( UtilJ2eeCompat.useOutputStream( "Apache Tomcat/5.5.20", true ) );
+        assertTrue( UtilJ2eeCompat.useOutputStream( "Apache Tomcat/7.0.39", true ) );
     }
 
     public static Test suite()



Mime
View raw message