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 2016/06/22 10:59:00 UTC
tomee git commit: TOMEE-1849 ensuring jaccprovider can be overriden
Repository: tomee
Updated Branches:
refs/heads/master 30e42e463 -> e6d45464d
TOMEE-1849 ensuring jaccprovider can be overriden
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e6d45464
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e6d45464
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e6d45464
Branch: refs/heads/master
Commit: e6d45464d4e007ea157a6f979f6049ce98e04488
Parents: 30e42e4
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Wed Jun 22 12:58:39 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Wed Jun 22 12:58:39 2016 +0200
----------------------------------------------------------------------
.../core/security/AbstractSecurityService.java | 8 +++-
.../core/security/SecurityServiceImpl.java | 2 +-
.../security/AbstractSecurityServiceTest.java | 42 ++++++++++++++++++++
3 files changed, 50 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/e6d45464/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java b/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
index 0fd7ed2..1378f98 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
@@ -70,7 +70,7 @@ public abstract class AbstractSecurityService implements DestroyableResource, Se
protected SecurityContext defaultContext;
public AbstractSecurityService() {
- this(BasicJaccProvider.class.getName());
+ this(autoJaccProvider());
}
public AbstractSecurityService(final String jaccProvider) {
@@ -331,6 +331,12 @@ public abstract class AbstractSecurityService implements DestroyableResource, Se
return true;
}
+ protected static String autoJaccProvider() {
+ return SystemInstance.isInitialized() ?
+ SystemInstance.get().getProperty(JaccProvider.class.getName(), BasicJaccProvider.class.getName()) :
+ BasicJaccProvider.class.getName();
+ }
+
protected static void installJacc() {
final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
http://git-wip-us.apache.org/repos/asf/tomee/blob/e6d45464/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java
index 4d3a776..b152765 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java
@@ -39,7 +39,7 @@ public class SecurityServiceImpl extends AbstractSecurityService {
private static final Map<Object, LoginContext> contexts = new ConcurrentHashMap<Object, LoginContext>();
public SecurityServiceImpl() {
- this(BasicJaccProvider.class.getName());
+ this(autoJaccProvider());
}
public SecurityServiceImpl(final String jaccProviderClass) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/e6d45464/container/openejb-core/src/test/java/org/apache/openejb/core/security/AbstractSecurityServiceTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/security/AbstractSecurityServiceTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/security/AbstractSecurityServiceTest.java
new file mode 100644
index 0000000..3b2c0c9
--- /dev/null
+++ b/container/openejb-core/src/test/java/org/apache/openejb/core/security/AbstractSecurityServiceTest.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.core.security;
+
+import org.apache.openejb.core.security.jacc.BasicJaccProvider;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.ContainerProperties;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertTrue;
+
+@Classes
+@RunWith(ApplicationComposer.class)
+@ContainerProperties(
+ @ContainerProperties.Property(
+ name = "org.apache.openejb.core.security.JaccProvider",
+ value = "org.apache.openejb.core.security.AbstractSecurityServiceTest$MyJaacProv"))
+public class AbstractSecurityServiceTest {
+ @Test
+ public void run() {
+ assertTrue(MyJaacProv.class.isInstance(JaccProvider.get()));
+ }
+
+ public static class MyJaacProv extends BasicJaccProvider {
+ }
+}