You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2013/07/28 22:07:34 UTC
svn commit: r1507833 - in /jspwiki/trunk: ChangeLog
jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki-war/src/main/java/org/apache/wiki/util/UtilJ2eeCompat.java
Author: metskem
Date: Sun Jul 28 20:07:34 2013
New Revision: 1507833
URL: http://svn.apache.org/r1507833
Log:
2013-07-28 Harry Metske (metskem@apache.org)
* 2.10.0-svn-23
* fixed JSPWIKI-784 UTF-8 chars not correctly rendered if served by JBoss
(JBoss now also uses response.getOutputStream)
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/UtilJ2eeCompat.java
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1507833&r1=1507832&r2=1507833&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sun Jul 28 20:07:34 2013
@@ -1,3 +1,10 @@
+2013-07-28 Harry Metske (metskem@apache.org)
+
+ * 2.10.0-svn-23
+
+ * fixed JSPWIKI-784 UTF-8 chars not correctly rendered if served by JBoss
+ (JBoss now also uses response.getOutputStream)
+
2013-07-19 Glen Mazza (gmazza AT apache DOT org)
* 2.10.0-svn-22
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1507833&r1=1507832&r2=1507833&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Sun Jul 28 20:07:34 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 = "22";
+ public static final String BUILD = "23";
/**
* This is the generic version string you should use
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/UtilJ2eeCompat.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/UtilJ2eeCompat.java?rev=1507833&r1=1507832&r2=1507833&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/UtilJ2eeCompat.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/UtilJ2eeCompat.java Sun Jul 28 20:07:34 2013
@@ -47,6 +47,8 @@ public class UtilJ2eeCompat
public static final String GLASSFISH = "Sun Java System Application Server";
+ public static final String JBOSS = "JBoss";
+
/**
*
*/
@@ -146,6 +148,12 @@ public class UtilJ2eeCompat
// use response.getOutputStream instead of response.getWriter
useStream = true;
}
+ else if( serverInfo.indexOf( JBOSS ) >= 0 )
+ {
+ log.info( JBOSS + " detected" );
+ // use response.getOutputStream instead of response.getWriter
+ useStream = true;
+ }
useOutputStreamValue = new Boolean( useStream );
}