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:26:34 UTC
tomee git commit: TOMEE-1278 tomcat 8.0.21 + a trivial cleanup
Repository: tomee
Updated Branches:
refs/heads/master a4cecde17 -> 9a9773093
TOMEE-1278 tomcat 8.0.21 + a trivial cleanup
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9a977309
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9a977309
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9a977309
Branch: refs/heads/master
Commit: 9a97730930cba882a734aa98c979aeeaad2b4c1d
Parents: a4cecde
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Apr 13 08:26:26 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Apr 13 08:26:26 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/config/AutoConfig.java | 5 +++--
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 ++++++++
5 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/9a977309/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
index ca5b254..0c3c60d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
@@ -1243,8 +1243,9 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
}
private String getType(final JndiReference ref, final ClassLoader classLoader) throws OpenEJBException {
- if (ref.getType() != null) {
- return ref.getType();
+ final String refType = ref.getType();
+ if (refType != null) {
+ return refType;
}
if (classLoader != null) {
final Set<InjectionTarget> injections = ref.getInjectionTarget();
http://git-wip-us.apache.org/repos/asf/tomee/blob/9a977309/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f32d5d7..9c874c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
<version.shrinkwrap.descriptor>2.0.0-alpha-7</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.2.2</version.shrinkwrap.shrinkwrap>
- <tomcat.version>8.0.20</tomcat.version>
+ <tomcat.version>8.0.21</tomcat.version>
<cxf.version>3.0.3</cxf.version>
<ehcache.version>2.8.5</ehcache.version>
http://git-wip-us.apache.org/repos/asf/tomee/blob/9a977309/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 a2df62c..d7bdbe6 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
@@ -67,7 +67,6 @@ import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -468,9 +467,9 @@ 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() {
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/9a977309/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 91bbfaf..277eb9c 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
@@ -264,6 +264,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/9a977309/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 b9d7178..d2a1990 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
@@ -43,6 +43,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 Object delegate;
private final Method simpleAuthenticateMethod;
+ private final Method authenticateStringMethod;
private final Method authenticateMethod;
private final Method gsMethod;
private final Method findSecurityConstraintsMethod;
@@ -70,6 +72,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);
@@ -129,6 +132,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);
}