You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2015/09/07 14:46:59 UTC
svn commit: r1701615 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security:
SecurityProviderImpl.java package-info.java
Author: reschke
Date: Mon Sep 7 12:46:59 2015
New Revision: 1701615
URL: http://svn.apache.org/r1701615
Log:
OAK-3201: reverting revision 1701579 due to oak-pojosr test failure
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/package-info.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java?rev=1701615&r1=1701614&r2=1701615&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java Mon Sep 7 12:46:59 2015
@@ -29,9 +29,6 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.ReferencePolicy;
-import org.apache.felix.scr.annotations.ReferencePolicyOption;
-import org.apache.felix.scr.annotations.ReferenceStrategy;
-import org.apache.felix.scr.annotations.References;
import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard;
import org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl;
@@ -49,15 +46,11 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenConfiguration;
import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants;
-import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider;
import org.apache.jackrabbit.oak.spi.security.principal.CompositePrincipalConfiguration;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalConfiguration;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConfiguration;
-import org.apache.jackrabbit.oak.spi.security.user.AuthorizableNodeName;
-import org.apache.jackrabbit.oak.spi.security.user.UserAuthenticationFactory;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
-import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableActionProvider;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardAuthorizableActionProvider;
import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardAuthorizableNodeName;
@@ -70,40 +63,6 @@ import static com.google.common.base.Pre
@Component
@Service(value = {SecurityProvider.class})
-@References({
- @Reference(
- name = "authorizableNodeName",
- referenceInterface = AuthorizableNodeName.class,
- policy = ReferencePolicy.STATIC,
- policyOption = ReferencePolicyOption.GREEDY,
- cardinality = ReferenceCardinality.OPTIONAL_UNARY,
- strategy = ReferenceStrategy.LOOKUP
- ),
- @Reference(
- name = "authorizableActionProvider",
- referenceInterface = AuthorizableActionProvider.class,
- policy = ReferencePolicy.STATIC,
- policyOption = ReferencePolicyOption.GREEDY,
- cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE,
- strategy = ReferenceStrategy.LOOKUP
- ),
- @Reference(
- name = "restrictionProvider",
- referenceInterface = RestrictionProvider.class,
- policy = ReferencePolicy.STATIC,
- policyOption = ReferencePolicyOption.GREEDY,
- cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE,
- strategy = ReferenceStrategy.LOOKUP
- ),
- @Reference(
- name = "userAuthenticationFactory",
- referenceInterface = UserAuthenticationFactory.class,
- policy = ReferencePolicy.STATIC,
- policyOption = ReferencePolicyOption.GREEDY,
- cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE,
- strategy = ReferenceStrategy.LOOKUP
- )
-})
public class SecurityProviderImpl implements SecurityProvider, WhiteboardAware {
@Reference
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/package-info.java?rev=1701615&r1=1701614&r2=1701615&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/package-info.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/package-info.java Mon Sep 7 12:46:59 2015
@@ -20,9 +20,9 @@
*
* See <a href="README.md">README.md</a> for more details.
*/
-@Version("2.0.0")
+@Version("1.0.1")
@Export(optional = "provide:=true")
package org.apache.jackrabbit.oak.security;
import aQute.bnd.annotation.Version;
-import aQute.bnd.annotation.Export;
+import aQute.bnd.annotation.Export;
\ No newline at end of file