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 st...@apache.org on 2017/10/02 06:28:39 UTC
svn commit: r1810297 - in /jackrabbit/oak/trunk: oak-core/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/
oak-core/src/main/java/org/apache/jackrabbit/oak/spi/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/
oak-core/src/...
Author: stillalex
Date: Mon Oct 2 06:28:38 2017
New Revision: 1810297
URL: http://svn.apache.org/viewvc?rev=1810297&view=rev
Log:
OAK-6318 Refactor oak.spi.security into a separate module/bundle
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/impl/TreeUtilTest.java
- copied, changed from r1810296, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtilTest.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ReadOnly.java
- copied, changed from r1810296, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ReadOnly.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeConstants.java
- copied unchanged from r1810296, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeConstants.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeContext.java
- copied unchanged from r1810296, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeContext.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocation.java
- copied unchanged from r1810296, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocation.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeType.java
- copied unchanged from r1810296, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeType.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeAware.java
- copied unchanged from r1810296, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeAware.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProvider.java
- copied unchanged from r1810296, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java
- copied, changed from r1810296, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/package-info.java
- copied unchanged from r1810296, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/package-info.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/
- copied from r1810296, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/
- copied from r1810296, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocationTest.java
- copied unchanged from r1810296, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProviderTest.java
- copied unchanged from r1810296, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/
- copied from r1810296, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/
Removed:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ReadOnly.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeConstants.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeContext.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocation.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeType.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeAware.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/package-info.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeLocationTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProviderTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtilTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/
Modified:
jackrabbit/oak/trunk/oak-core/pom.xml
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java
jackrabbit/oak/trunk/oak-parent/pom.xml
jackrabbit/oak/trunk/oak-security-spi/pom.xml
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/RegistrationConstants.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/ConfigurationUtil.java
Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1810297&r1=1810296&r2=1810297&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Mon Oct 2 06:28:38 2017
@@ -72,21 +72,6 @@
org.apache.jackrabbit.oak.plugins.tree,
org.apache.jackrabbit.oak.plugins.tree.factories,
org.apache.jackrabbit.oak.plugins.version,
- org.apache.jackrabbit.oak.spi.security,
- org.apache.jackrabbit.oak.spi.security.authentication,
- org.apache.jackrabbit.oak.spi.security.authentication.callback,
- org.apache.jackrabbit.oak.spi.security.authentication.credentials,
- org.apache.jackrabbit.oak.spi.security.authentication.token,
- org.apache.jackrabbit.oak.spi.security.authorization,
- org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol,
- org.apache.jackrabbit.oak.spi.security.authorization.permission,
- org.apache.jackrabbit.oak.spi.security.authorization.restriction,
- org.apache.jackrabbit.oak.spi.security.principal,
- org.apache.jackrabbit.oak.spi.security.privilege,
- org.apache.jackrabbit.oak.spi.security.user,
- org.apache.jackrabbit.oak.spi.security.user.action,
- org.apache.jackrabbit.oak.spi.security.user.util,
- org.apache.jackrabbit.oak.spi.xml,
org.apache.jackrabbit.oak.security,
org.apache.jackrabbit.oak.util,
</Export-Package>
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/impl/TreeUtilTest.java (from r1810296, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtilTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/impl/TreeUtilTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/impl/TreeUtilTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtilTest.java&r1=1810296&r2=1810297&rev=1810297&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtilTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/tree/impl/TreeUtilTest.java Mon Oct 2 06:28:38 2017
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.tree;
+package org.apache.jackrabbit.oak.plugins.tree.impl;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
import org.junit.Test;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java?rev=1810297&r1=1810296&r2=1810297&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java Mon Oct 2 06:28:38 2017
@@ -47,7 +47,10 @@ import com.google.common.collect.Immutab
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+
import org.apache.jackrabbit.JcrConstants;
+import org.apache.jackrabbit.api.security.JackrabbitAccessControlEntry;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlList;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy;
@@ -68,9 +71,9 @@ import org.apache.jackrabbit.oak.spi.nod
import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl;
import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.ACE;
+import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AbstractAccessControlList;
import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AbstractAccessControlManager;
import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants;
-import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.TestACL;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.Restriction;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
@@ -2367,4 +2370,69 @@ public class AccessControlManagerImplTes
// now try to write it back, which is expected to throw AccessControlException
acMgr.removePolicy(acl.getPath(), acl);
}
+
+ private final static class TestACL extends AbstractAccessControlList {
+
+ private final List<JackrabbitAccessControlEntry> entries = new ArrayList<JackrabbitAccessControlEntry>();
+ private final RestrictionProvider restrictionProvider;
+
+ public TestACL(@Nullable String jcrPath,
+ @Nonnull RestrictionProvider restrictionProvider,
+ @Nonnull NamePathMapper namePathMapper,
+ @Nonnull List<JackrabbitAccessControlEntry> entries) {
+ super((jcrPath == null) ? null : namePathMapper.getOakPath(jcrPath), namePathMapper);
+ this.entries.addAll(entries);
+ this.restrictionProvider = restrictionProvider;
+ }
+
+ public TestACL(@Nullable String jcrPath,
+ @Nonnull RestrictionProvider restrictionProvider,
+ @Nonnull NamePathMapper namePathMapper,
+ @Nonnull JackrabbitAccessControlEntry... entry) {
+ this(jcrPath, restrictionProvider, namePathMapper, Lists.newArrayList(entry));
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return entries.isEmpty();
+ }
+
+ @Override
+ public int size() {
+ return entries.size();
+ }
+
+ @Override
+ public boolean addEntry(Principal principal, Privilege[] privileges,
+ boolean isAllow, Map<String, Value> restrictions) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean addEntry(Principal principal, Privilege[] privileges, boolean isAllow, Map<String, Value> restrictions, Map<String, Value[]> mvRestrictions) throws AccessControlException, RepositoryException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void orderBefore(AccessControlEntry srcEntry, AccessControlEntry destEntry) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void removeAccessControlEntry(AccessControlEntry ace) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Nonnull
+ @Override
+ public List<JackrabbitAccessControlEntry> getEntries() {
+ return entries;
+ }
+
+ @Nonnull
+ @Override
+ public RestrictionProvider getRestrictionProvider() {
+ return restrictionProvider;
+ }
+ }
}
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1810297&r1=1810296&r2=1810297&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Mon Oct 2 06:28:38 2017
@@ -229,6 +229,7 @@
<filter>!org.apache.jackrabbit.oak.plugins.nodetype.write</filter>
<filter>!org.apache.jackrabbit.oak.plugins.observation</filter>
<filter>!org.apache.jackrabbit.oak.plugins.observation.filter</filter>
+ <filter>!org.apache.jackrabbit.oak.plugins.tree</filter>
<filter>!org.apache.jackrabbit.oak.plugins.tree.factories</filter>
<filter>!org.apache.jackrabbit.oak.plugins.value</filter>
<filter>!org.apache.jackrabbit.oak.plugins.version</filter>
Modified: jackrabbit/oak/trunk/oak-security-spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/pom.xml?rev=1810297&r1=1810296&r2=1810297&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-security-spi/pom.xml Mon Oct 2 06:28:38 2017
@@ -39,7 +39,22 @@
<configuration>
<instructions>
<Export-Package>
-
+ org.apache.jackrabbit.oak.plugins.tree,
+ org.apache.jackrabbit.oak.spi.security,
+ org.apache.jackrabbit.oak.spi.security.authentication,
+ org.apache.jackrabbit.oak.spi.security.authentication.callback,
+ org.apache.jackrabbit.oak.spi.security.authentication.credentials,
+ org.apache.jackrabbit.oak.spi.security.authentication.token,
+ org.apache.jackrabbit.oak.spi.security.authorization,
+ org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol,
+ org.apache.jackrabbit.oak.spi.security.authorization.permission,
+ org.apache.jackrabbit.oak.spi.security.authorization.restriction,
+ org.apache.jackrabbit.oak.spi.security.principal,
+ org.apache.jackrabbit.oak.spi.security.privilege,
+ org.apache.jackrabbit.oak.spi.security.user,
+ org.apache.jackrabbit.oak.spi.security.user.action,
+ org.apache.jackrabbit.oak.spi.security.user.util,
+ org.apache.jackrabbit.oak.spi.xml
</Export-Package>
</instructions>
</configuration>
@@ -82,10 +97,13 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <scope>provided</scope>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ </dependency>
<!-- JCR and Jackrabbit dependencies -->
<dependency>
Copied: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ReadOnly.java (from r1810296, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ReadOnly.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ReadOnly.java?p2=jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ReadOnly.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ReadOnly.java&r1=1810296&r2=1810297&rev=1810297&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ReadOnly.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/ReadOnly.java Mon Oct 2 06:28:38 2017
@@ -17,8 +17,9 @@
package org.apache.jackrabbit.oak.plugins.tree;
/**
- * Marker interface to indicate if a {@link Tree} or {@link org.apache.jackrabbit.oak.api.Root}
- * can only be read (write operations not implemented).
+ * Marker interface to indicate if a {@link org.apache.jackrabbit.oak.api.Tree}
+ * or {@link org.apache.jackrabbit.oak.api.Root} can only be read (write
+ * operations not implemented).
*/
public interface ReadOnly {
}
\ No newline at end of file
Copied: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java (from r1810296, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java?p2=jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java&r1=1810296&r2=1810297&rev=1810297&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/plugins/tree/TreeUtil.java Mon Oct 2 06:28:38 2017
@@ -75,7 +75,7 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.REP_SUPERTYPES;
/**
- * Utility providing common operations for the {@code Tree} that are not provided
+ * Utility providing common operations for the {@link org.apache.jackrabbit.oak.api.Tree} that are not provided
* by the API.
*/
public final class TreeUtil {
@@ -492,7 +492,7 @@ public final class TreeUtil {
*
* @param tree The tree object to be tested.
* @return {@code true} if the specified tree is an immutable read-only tree.
- * @see {@link ReadOnly}
+ * @see org.apache.jackrabbit.oak.plugins.tree.ReadOnly
*/
public static boolean isReadOnlyTree(@Nonnull Tree tree) {
return tree instanceof ReadOnly;
Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/RegistrationConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/RegistrationConstants.java?rev=1810297&r1=1810296&r2=1810297&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/RegistrationConstants.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/RegistrationConstants.java Mon Oct 2 06:28:38 2017
@@ -17,8 +17,6 @@
package org.apache.jackrabbit.oak.spi.security;
-import org.apache.jackrabbit.oak.security.internal.SecurityProviderRegistration;
-
/**
* Holds the names of well-known registration properties for security-related components
*
@@ -26,7 +24,7 @@ import org.apache.jackrabbit.oak.securit
public abstract class RegistrationConstants {
/**
- * Name to be used when registering components that are required by the {@link SecurityProviderRegistration}
+ * Name to be used when registering components that are required by the {@code org.apache.jackrabbit.oak.security.internal.SecurityProviderRegistration}
*/
public static final String OAK_SECURITY_NAME = "oak.security.name";
Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/ConfigurationUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/ConfigurationUtil.java?rev=1810297&r1=1810296&r2=1810297&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/ConfigurationUtil.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/ConfigurationUtil.java Mon Oct 2 06:28:38 2017
@@ -21,8 +21,6 @@ import java.util.Map;
import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.Configuration;
-import org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule;
-import org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
/**
@@ -76,7 +74,8 @@ public final class ConfigurationUtil {
private static final class DefaultEntry extends AppConfigurationEntry {
private DefaultEntry(Map<String, ?> options) {
- super(LoginModuleImpl.class.getName(), LoginModuleControlFlag.REQUIRED, options);
+ super("org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl",
+ LoginModuleControlFlag.REQUIRED, options);
}
}
@@ -90,7 +89,8 @@ public final class ConfigurationUtil {
private static final class TokenEntry extends AppConfigurationEntry {
private TokenEntry(Map<String, ?> options) {
- super(TokenLoginModule.class.getName(), LoginModuleControlFlag.SUFFICIENT, options);
+ super("org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule",
+ LoginModuleControlFlag.SUFFICIENT, options);
}
}