jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject svn commit: r1674539 - in /jspwiki/trunk: ChangeLog jspwiki-war/src/main/java/org/apache/wiki/Release.java jspwiki-war/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java jspwiki-war/src/main/java/org/apache/wiki/util/UtilJ2eeCompat.java
Date Sat, 18 Apr 2015 16:45:18 GMT
Author: metskem
Date: Sat Apr 18 16:45:18 2015
New Revision: 1674539

URL: http://svn.apache.org/r1674539
Log:
2015-04-18  Harry Metske (metskem@apache.org)

       * 2.10.2-svn-15

       * Fixed JSPWIKI-880 Glassfish 4 Wrong Chars Solution - Brasil PT, thanks to Renato
Grosz

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/ui/WikiJSPFilter.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=1674539&r1=1674538&r2=1674539&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sat Apr 18 16:45:18 2015
@@ -1,3 +1,9 @@
+2015-04-18  Harry Metske (metskem@apache.org)
+
+       * 2.10.2-svn-15
+
+       * Fixed JSPWIKI-880 Glassfish 4 Wrong Chars Solution - Brasil PT, thanks to Renato
Grosz
+
 2015-03-06  Harry Metske (metskem@apache.org)
 
        * 2.10.2-svn-14

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=1674539&r1=1674538&r2=1674539&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 Sat Apr 18 16:45:18
2015
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "14";
+    public static final String     BUILD         = "15";
 
     /**
      *  This is the generic version string you should use when printing out the version.
 It is of 

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java?rev=1674539&r1=1674538&r2=1674539&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java Sat Apr
18 16:45:18 2015
@@ -263,20 +263,14 @@ public class WikiJSPFilter extends WikiS
     private static class MyServletResponseWrapper
         extends HttpServletResponseWrapper
     {
-        private CharArrayWriter m_output;
+        ByteArrayOutputStream m_output;
         private MyServletOutputStream m_servletOut;
         private PrintWriter m_writer;
-      
-        /** 
-         *  How large the initial buffer should be.  This should be tuned to achieve
-         *  a balance in speed and memory consumption.
-         */
-        private static final int INIT_BUFFER_SIZE = 4096;
-        
+
         public MyServletResponseWrapper( HttpServletResponse r, final String wiki_encoding
)
                 throws UnsupportedEncodingException {
             super(r);
-            m_output = new CharArrayWriter( INIT_BUFFER_SIZE );
+            m_output = new ByteArrayOutputStream();
             m_servletOut = new MyServletOutputStream(m_output);
             m_writer = new PrintWriter(new OutputStreamWriter(m_servletOut, wiki_encoding),
true);
         }
@@ -303,12 +297,12 @@ public class WikiJSPFilter extends WikiS
 
         class MyServletOutputStream extends ServletOutputStream
         {
-            CharArrayWriter m_buffer;
+            ByteArrayOutputStream m_buffer;
 
-            public MyServletOutputStream(CharArrayWriter aCharArrayWriter)
+            public MyServletOutputStream(ByteArrayOutputStream byteArrayOutputStream)
             {
                 super();
-                m_buffer = aCharArrayWriter;
+                m_buffer = byteArrayOutputStream;
             }
 
             @Override

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=1674539&r1=1674538&r2=1674539&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 Sat Apr
18 16:45:18 2015
@@ -43,6 +43,8 @@ public class UtilJ2eeCompat
 
     public static final String WEBSPHERE = "websphere";
 
+    public static final String WEBSPHERE_LIBERTY = "SMF WebContainer";
+
     public static final String WEBLOGIC = "weblogic";
 
     public static final String GLASSFISH_1 = "sun java system application server";
@@ -133,6 +135,10 @@ public class UtilJ2eeCompat
         {
             log.info( WEBSPHERE + " detected" );
         }
+        else if( serverInfo.toLowerCase().indexOf( WEBSPHERE_LIBERTY ) >= 0 )
+        {
+            log.info( WEBSPHERE_LIBERTY + " detected" );
+        }
         else if( serverInfo.toLowerCase().indexOf( WEBLOGIC ) >= 0 )
         {
             log.info( WEBLOGIC + " detected" );



Mime
View raw message