geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1333352 - in /geronimo/server/branches/3.0-beta: ./ plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/ plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/
Date Thu, 03 May 2012 08:15:56 GMT
Author: xiaming
Date: Thu May  3 08:15:56 2012
New Revision: 1333352

URL: http://svn.apache.org/viewvc?rev=1333352&view=rev
Log:
GERONIMO-6334 Try Tomcat 7.0.27 release

Modified:
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java
    geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java
    geronimo/server/branches/3.0-beta/pom.xml

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java?rev=1333352&r1=1333351&r2=1333352&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java
Thu May  3 08:15:56 2012
@@ -28,7 +28,7 @@ public class TomcatEngine extends Standa
     private static final long serialVersionUID = 3834312825844611385L;
 
     public Realm getRealm() {
-        if (realm != null)
+        /*if (realm != null)
             return realm;
         
         if (parent != null){
@@ -36,6 +36,7 @@ public class TomcatEngine extends Standa
             if (configured != null)
                 return configured;
         }
-        return null;
+        return null;*/
+        return super.getRealm();
     }
 }

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java?rev=1333352&r1=1333351&r2=1333352&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java
Thu May  3 08:15:56 2012
@@ -127,6 +127,12 @@ public class SecurityValve extends Valve
         return session == null? null: (UserIdentity)session.getNote(CACHED_IDENTITY_KEY);
 
     }
+    
+    @Override
+    public boolean authenticate(Request request, HttpServletResponse response)
+            throws IOException {        
+        return authenticate(request, response, null);
+    }
 
     @Override
     public boolean authenticate(Request request, HttpServletResponse response, LoginConfig
config) throws IOException {

Modified: geronimo/server/branches/3.0-beta/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/pom.xml?rev=1333352&r1=1333351&r2=1333352&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/pom.xml Thu May  3 08:15:56 2012
@@ -66,7 +66,7 @@
         FIXME: STOP using properties for dependency versions unless you absolutly need them,
                ie. you have a hundred dependencies that all use the same version.
         -->
-        <tomcatVersion>7.0.23.1</tomcatVersion>
+        <tomcatVersion>7.0.27.1-SNAPSHOT</tomcatVersion>
         <tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
 
         <openejbVersion>4.0.0-beta-1</openejbVersion>



Mime
View raw message