jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject svn commit: r1598256 - 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 jspwiki-war/src/test/java/org/apache/wiki/util/UtilJ2eeCompatTest.java
Date Thu, 29 May 2014 11:36:43 GMT
Author: metskem
Date: Thu May 29 11:36:42 2014
New Revision: 1598256

URL: http://svn.apache.org/r1598256
Log:
   * 2.10.2-svn-1

       * Fixed JSPWIKI-396 - by making the server signature comparison case insensitive (reported
by Jürgen Weber)

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
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/UtilJ2eeCompatTest.java

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1598256&r1=1598255&r2=1598256&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Thu May 29 11:36:42 2014
@@ -1,3 +1,15 @@
+2014-05-29  Harry Metske (metskem@apache.org)
+
+       * 2.10.2-svn-1
+
+       * Fixed JSPWIKI-396 - by making the server signature comparison case insensitive (reported
by Jürgen Weber)
+
+2014-04-23  Juan Pablo Santos (juanpablo AT apache DOT org)
+
+       * 2.10.1-svn-18
+
+       * Fixed JSPWIKI-841 - Container Managed Security Not Working
+
 2014-05-23  Harry Metske (metskem@apache.org)
 
        * 2.10.1-svn-17

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=1598256&r1=1598255&r2=1598256&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 Thu May 29 11:36:42
2014
@@ -72,7 +72,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 when printing out the version.
 It is of 

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=1598256&r1=1598255&r2=1598256&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 Thu May
29 11:36:42 2014
@@ -27,27 +27,27 @@ public class UtilJ2eeCompat
 {
     private static Logger log = Logger.getLogger( UtilJ2eeCompat.class.getName() );
 
-    public static final String TOMCAT = "Apache Tomcat";
+    public static final String TOMCAT = "apache tomcat";
 
-    public static final String ORION = "Orion";
+    public static final String ORION = "orion";
 
-    public static final String RESIN = "Resin";
+    public static final String RESIN = "resin";
 
-    public static final String REX_IP = "TradeCity";
+    public static final String REX_IP = "tradecity";
 
-    public static final String OC4J = "Oracle";
+    public static final String OC4J = "oracle";
 
-    public static final String JRUN = "JRun";
+    public static final String JRUN = "jrun";
 
-    public static final String JETTY = "Jetty";
+    public static final String JETTY = "jetty";
 
-    public static final String WEBSPHERE = "Websphere";
+    public static final String WEBSPHERE = "websphere";
 
-    public static final String WEBLOGIC = "WebLogic";
+    public static final String WEBLOGIC = "weblogic";
 
-    public static final String GLASSFISH = "Sun Java System Application Server";
+    public static final String GLASSFISH = "sun java system application server";
 
-    public static final String JBOSS = "JBoss";
+    public static final String JBOSS = "jboss";
 
     /**
      * 
@@ -100,55 +100,55 @@ public class UtilJ2eeCompat
         m_serverInfo = serverInfo;
         // response.getWriter is the default
         boolean useStream = false;
-        if( serverInfo.indexOf( RESIN ) >= 0 )
+        if( serverInfo.toLowerCase().indexOf( RESIN ) >= 0 )
         {
             log.info( RESIN + " detected" );
             // use response.getOutputStream instead of response.getWriter
             useStream = true;
         }
-        else if( serverInfo.indexOf( REX_IP ) >= 0 )
+        else if( serverInfo.toLowerCase().indexOf( REX_IP ) >= 0 )
         {
             log.info( REX_IP + " detected" );
         }
-        else if( serverInfo.indexOf( TOMCAT ) >= 0 )
+        else if( serverInfo.toLowerCase().indexOf( TOMCAT ) >= 0 )
         {
             log.info( TOMCAT + " detected" );
             // use response.getOutputStream instead of response.getWriter
             useStream = true;
         }
-        else if( serverInfo.indexOf( JRUN ) >= 0 )
+        else if( serverInfo.toLowerCase().indexOf( JRUN ) >= 0 )
         {
             log.info( JRUN + " detected" );
         }
-        else if( serverInfo.indexOf( JETTY ) >= 0 )
+        else if( serverInfo.toLowerCase().indexOf( JETTY ) >= 0 )
         {
             log.info( JETTY + " detected" );
         }
-        else if( serverInfo.indexOf( ORION ) >= 0 )
+        else if( serverInfo.toLowerCase().indexOf( ORION ) >= 0 )
         {
             log.info( ORION + " detected" );
         }
-        else if( serverInfo.indexOf( WEBSPHERE ) >= 0 )
+        else if( serverInfo.toLowerCase().indexOf( WEBSPHERE ) >= 0 )
         {
             log.info( WEBSPHERE + " detected" );
         }
-        else if( serverInfo.indexOf( WEBLOGIC ) >= 0 )
+        else if( serverInfo.toLowerCase().indexOf( WEBLOGIC ) >= 0 )
         {
             log.info( WEBLOGIC + " detected" );
             // use response.getOutputStream instead of response.getWriter
             useStream = true;
         }
-        else if( serverInfo.indexOf( GLASSFISH ) >= 0 )
+        else if( serverInfo.toLowerCase().indexOf( GLASSFISH ) >= 0 )
         {
             log.info( GLASSFISH + " detected" );
         }
-        else if( serverInfo.indexOf( OC4J ) >= 0 )
+        else if( serverInfo.toLowerCase().indexOf( OC4J ) >= 0 )
         {
             log.info( "Oracle Container for JEE detected" );
             // use response.getOutputStream instead of response.getWriter
             useStream = true;
         }
-        else if( serverInfo.indexOf( JBOSS ) >= 0 )
+        else if( serverInfo.toLowerCase().indexOf( JBOSS ) >= 0 )
         {
             log.info( JBOSS + " detected" );
             // use response.getOutputStream instead of response.getWriter

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/UtilJ2eeCompatTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/UtilJ2eeCompatTest.java?rev=1598256&r1=1598255&r2=1598256&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/UtilJ2eeCompatTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/util/UtilJ2eeCompatTest.java Thu
May 29 11:36:42 2014
@@ -54,6 +54,13 @@ public class UtilJ2eeCompatTest extends 
         assertTrue( UtilJ2eeCompat.useOutputStream( "Apache Tomcat/7.0.39", true ) );
     }
 
+    public void testWebSphere()
+    {
+        assertFalse( UtilJ2eeCompat.useOutputStream( "IBM WebSphere Application Server/8.5",
true ) );
+        // Reinitialize
+        assertFalse( UtilJ2eeCompat.useOutputStream( "IBM WebSphere Application Server/8.5",
true ) );
+    }
+
     public static Test suite()
     {
         return new TestSuite( UtilJ2eeCompatTest.class );



Mime
View raw message