tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject tomee git commit: tomcat 8.0.15
Date Wed, 12 Nov 2014 11:20:36 GMT
Repository: tomee
Updated Branches:
  refs/heads/develop 03d4fdf36 -> 7235407eb


tomcat 8.0.15


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7235407e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7235407e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7235407e

Branch: refs/heads/develop
Commit: 7235407eb66d9a2eb867e80d1d360a559f65d7ec
Parents: 03d4fdf
Author: Romain Manni-Bucau <rmannibucau@apache.org>
Authored: Wed Nov 12 12:20:17 2014 +0100
Committer: Romain Manni-Bucau <rmannibucau@apache.org>
Committed: Wed Nov 12 12:20:17 2014 +0100

----------------------------------------------------------------------
 pom.xml                                            |  2 +-
 .../org/apache/tomee/catalina/realm/LazyRealm.java | 17 +++++++++++++++++
 .../apache/tomee/catalina/realm/LowTypedRealm.java | 11 +++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/7235407e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 63cd469..67714d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
     <version.shrinkwrap.descriptor>2.0.0-alpha-6</version.shrinkwrap.descriptor>
     <version.shrinkwrap.shrinkwrap>1.1.2</version.shrinkwrap.shrinkwrap>
 
-    <tomcat.version>8.0.14</tomcat.version>
+    <tomcat.version>8.0.15</tomcat.version>
 
     <cxf.version>3.0.2</cxf.version>
     <!--2.6.4 requires wss4j 1.6.8-->

http://git-wip-us.apache.org/repos/asf/tomee/blob/7235407e/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java
index 539de1c..6e29153 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LazyRealm.java
@@ -18,6 +18,7 @@ package org.apache.tomee.catalina.realm;
 
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
+import org.apache.catalina.CredentialHandler;
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
 import org.apache.catalina.LifecycleException;
@@ -53,6 +54,7 @@ public class LazyRealm extends LifecycleBase implements Realm {
 
     private volatile Realm delegate;
     private Context container;
+    private CredentialHandler credentialHandler;
 
     private CreationalContext<Object> creationalContext;
 
@@ -126,6 +128,7 @@ public class LazyRealm extends LifecycleBase implements Realm {
                         delegate = new LowTypedRealm(instance);
                     }
                     delegate.setContainer(container);
+                    delegate.setCredentialHandler(credentialHandler);
                 }
             }
         }
@@ -195,6 +198,20 @@ public class LazyRealm extends LifecycleBase implements Realm {
     }
 
     @Override
+    public CredentialHandler getCredentialHandler() {
+        return credentialHandler;
+    }
+
+    @Override
+    public void setCredentialHandler(final CredentialHandler credentialHandler) {
+        this.credentialHandler = credentialHandler;
+        final Realm r = instance();
+        if (r != null) {
+            r.setCredentialHandler(credentialHandler);
+        }
+    }
+
+    @Override
     public void addPropertyChangeListener(final PropertyChangeListener listener) {
         final Realm instance = instance();
         if (instance == null) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/7235407e/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LowTypedRealm.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LowTypedRealm.java
b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LowTypedRealm.java
index d03bdc1..b9d7178 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LowTypedRealm.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/LowTypedRealm.java
@@ -18,6 +18,7 @@ package org.apache.tomee.catalina.realm;
 
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
+import org.apache.catalina.CredentialHandler;
 import org.apache.catalina.Realm;
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.connector.Request;
@@ -185,6 +186,16 @@ public class LowTypedRealm implements Realm {
         return (Boolean) invoke(hasUserDataMethod, request.getRequest(), response.getResponse(),
constraint);
     }
 
+    @Override
+    public CredentialHandler getCredentialHandler() {
+        return null;
+    }
+
+    @Override
+    public void setCredentialHandler(final CredentialHandler credentialHandler) {
+        // no-op: ignored, impl should handle it
+    }
+
     private Object invoke(final Method method, final Object... args) {
         if (method == null) {
             return null;


Mime
View raw message