You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/04/13 08:25:50 UTC
tomee git commit: TOMEE-1405 tomcat 7.0.61
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 980dafe76 -> 41461cf88
TOMEE-1405 tomcat 7.0.61
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/41461cf8
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/41461cf8
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/41461cf8
Branch: refs/heads/tomee-1.7.x
Commit: 41461cf88100bddf1ad7f3fe25d49000e62b5106
Parents: 980dafe
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Apr 13 08:25:09 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Apr 13 08:25:44 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
.../java/org/apache/tomee/catalina/OpenEJBContextConfig.java | 5 ++---
.../main/java/org/apache/tomee/catalina/realm/LazyRealm.java | 5 +++++
.../java/org/apache/tomee/catalina/realm/LowTypedRealm.java | 8 ++++++++
4 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/41461cf8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5f8bebc..97fe4c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
<jaxb.version>2.2.7</jaxb.version>
- <tomcat.version>7.0.59</tomcat.version>
+ <tomcat.version>7.0.61</tomcat.version>
<cxf.version>2.6.16</cxf.version>
<!--2.6.4 requires wss4j 1.6.8-->
http://git-wip-us.apache.org/repos/asf/tomee/blob/41461cf8/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
index 22bc59b..df375a1 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
@@ -60,7 +60,6 @@ import org.apache.tomee.loader.TomcatHelper;
import org.apache.xbean.finder.IAnnotationFinder;
import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServlet;
import javax.ws.rs.core.Application;
import java.io.ByteArrayInputStream;
@@ -425,10 +424,10 @@ public class OpenEJBContextConfig extends ContextConfig {
}
@Override // called before processAnnotationsFile so using it as hook to init webInfClassesAnnotationsProcessed
- protected void processServletContainerInitializers(final ServletContext ctx) {
+ protected void processServletContainerInitializers() {
webInfClassesAnnotationsProcessed = false;
try {
- super.processServletContainerInitializers(ctx);
+ super.processServletContainerInitializers();
final Iterator<Map.Entry<ServletContainerInitializer,Set<Class<?>>>> iterator = initializerClassMap.entrySet().iterator();
while (iterator.hasNext()) {
final Map.Entry<ServletContainerInitializer, Set<Class<?>>> entry = iterator.next();
http://git-wip-us.apache.org/repos/asf/tomee/blob/41461cf8/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 40d40c2..af888d9 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
@@ -262,6 +262,11 @@ public class LazyRealm extends LifecycleBase implements Realm {
}
@Override
+ public Principal authenticate(final String s) {
+ return instance().authenticate(s);
+ }
+
+ @Override
public Principal authenticate(final String username, final String credentials) {
return instance().authenticate(username, credentials);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/41461cf8/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 b018d55..a857e81 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
@@ -42,6 +42,7 @@ import java.util.List;
import java.util.Map;
public class LowTypedRealm implements Realm {
+ private static final Class<?>[] AUTHENTICATE_STRING_ARGS = new Class<?>[] { String.class };
private static final Class<?>[] SIMPLE_AUTHENTICATE_ARGS = new Class<?>[] { String.class, String.class };
private static final Class<?>[] AUTHENTICATE_ARGS = new Class<?>[] { String.class, String.class, String.class, String.class, String.class, String.class, String.class, String.class };
private static final Class<?>[] GSCONTEXT_AUTHENTICATE = new Class<?>[] { GSSContext.class, Boolean.class };
@@ -55,6 +56,7 @@ public class LowTypedRealm implements Realm {
private final String info;
private final Method simpleAuthenticateMethod;
+ private final Method authenticateStringMethod;
private final Method authenticateMethod;
private final Method gsMethod;
private final Method findSecurityConstraintsMethod;
@@ -71,6 +73,7 @@ public class LowTypedRealm implements Realm {
final Class<?> clazz = delegate.getClass();
+ authenticateStringMethod = findMethod(clazz, AUTHENTICATE_STRING_ARGS);
simpleAuthenticateMethod = findMethod(clazz, SIMPLE_AUTHENTICATE_ARGS);
authenticateMethod = findMethod(clazz, AUTHENTICATE_ARGS);
gsMethod = findMethod(clazz, GSCONTEXT_AUTHENTICATE);
@@ -135,6 +138,11 @@ public class LowTypedRealm implements Realm {
}
@Override
+ public Principal authenticate(final String s) {
+ return (Principal) invoke(authenticateStringMethod, s);
+ }
+
+ @Override
public Principal authenticate(final String username, final String credentials) {
return (Principal) invoke(simpleAuthenticateMethod, username, credentials);
}