JCR-4467: Remove all usage of java.security.acl.Group for Java 14
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1866144 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/EveryonePrincipal.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/EveryonePrincipal.java
index dfa3a02..9f9f35c 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/EveryonePrincipal.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/EveryonePrincipal.java
@@ -25,7 +25,7 @@
/**
* The EveryonePrincipal contains all principals (excluding itself).
*/
-public final class EveryonePrincipal implements java.security.acl.Group, GroupPrincipal, JackrabbitPrincipal {
+public final class EveryonePrincipal implements GroupPrincipal, JackrabbitPrincipal {
public static final String NAME = "everyone";
private static final EveryonePrincipal INSTANCE = new EveryonePrincipal();
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/GroupPrincipals.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/GroupPrincipals.java
index 62953a7..5e08cd8 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/GroupPrincipals.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/GroupPrincipals.java
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.core.security.principal;
import java.security.Principal;
-import java.security.acl.Group;
import java.util.Collections;
import java.util.Enumeration;
@@ -41,7 +40,7 @@
* @return true if the principal is of type group.
*/
public static boolean isGroup(Principal principal) {
- return principal instanceof Group || principal instanceof GroupPrincipal;
+ return principal instanceof GroupPrincipal;
}
/**
@@ -50,9 +49,6 @@
* @return an enumeration of the group members.
*/
public static Enumeration<? extends Principal> members(Principal principal) {
- if (principal instanceof Group) {
- return ((Group) principal).members();
- }
if (principal instanceof GroupPrincipal) {
return ((GroupPrincipal) principal).members();
}
@@ -66,9 +62,6 @@
* @return true if the principal is a member of this group, false otherwise.
*/
public static boolean isMember(Principal principal, Principal member) {
- if (principal instanceof Group) {
- return ((Group) principal).isMember(member);
- }
if (principal instanceof GroupPrincipal) {
return ((GroupPrincipal) principal).isMember(member);
}
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerImpl.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerImpl.java
index ac02811..f7d81da 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerImpl.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/PrincipalManagerImpl.java
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.core.security.principal;
import java.security.Principal;
-import java.security.acl.Group;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
@@ -212,7 +211,7 @@
* due to the fact, that the principal provider is not bound to a particular
* Session object.
*/
- private class CheckedGroup implements Group, GroupPrincipal, JackrabbitPrincipal {
+ private class CheckedGroup implements GroupPrincipal, JackrabbitPrincipal {
final Principal delegatee;
private final PrincipalProvider provider;
diff --git a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/GroupImpl.java b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/GroupImpl.java
index e3a9e71..331f1a6 100644
--- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/GroupImpl.java
+++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/GroupImpl.java
@@ -291,7 +291,7 @@
/**
* Principal Implementation
*/
- private class NodeBasedGroup extends NodeBasedPrincipal implements java.security.acl.Group, GroupPrincipal {
+ private class NodeBasedGroup extends NodeBasedPrincipal implements GroupPrincipal {
private NodeBasedGroup(String name) {
super(name);
diff --git a/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/principal/ClientGroup.java b/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/principal/ClientGroup.java
index 393ca7b..36ccd37 100644
--- a/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/principal/ClientGroup.java
+++ b/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/principal/ClientGroup.java
@@ -20,10 +20,10 @@
import java.rmi.RemoteException;
import java.security.Principal;
-import java.security.acl.Group;
import java.util.Enumeration;
import java.util.Iterator;
+import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
import org.apache.jackrabbit.rmi.client.LocalAdapterFactory;
import org.apache.jackrabbit.rmi.client.RemoteRuntimeException;
import org.apache.jackrabbit.rmi.remote.RemoteIterator;
@@ -38,7 +38,7 @@
* @see Group
* @see RemoteGroup
*/
-public class ClientGroup extends ClientPrincipal implements Group {
+public class ClientGroup extends ClientPrincipal implements GroupPrincipal {
private final LocalAdapterFactory factory;
diff --git a/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/principal/package-info.java b/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/principal/package-info.java
index 92b877c..8dd28b8 100755
--- a/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/principal/package-info.java
+++ b/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/client/principal/package-info.java
@@ -14,5 +14,5 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@org.osgi.annotation.versioning.Version("3.1.0")
+@org.osgi.annotation.versioning.Version("4.0.0")
package org.apache.jackrabbit.rmi.client.principal;
diff --git a/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/principal/ServerGroup.java b/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/principal/ServerGroup.java
index 750b966..2c140dc 100644
--- a/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/principal/ServerGroup.java
+++ b/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/principal/ServerGroup.java
@@ -20,7 +20,6 @@
import java.rmi.RemoteException;
import java.security.Principal;
-import java.security.acl.Group;
import java.util.Collections;
import java.util.Enumeration;
import java.util.Iterator;
@@ -32,7 +31,7 @@
public class ServerGroup extends ServerPrincipal implements RemoteGroup {
- public ServerGroup(final Group principal, final RemoteAdapterFactory factory)
+ public ServerGroup(final GroupPrincipal principal, final RemoteAdapterFactory factory)
throws RemoteException {
super(principal, factory);
}
@@ -81,16 +80,13 @@
}
public static boolean isGroup(Principal principal) {
- return principal instanceof Group || principal instanceof GroupPrincipal;
+ return principal instanceof GroupPrincipal;
}
private static Enumeration<? extends Principal> members(Principal principal) {
- if (principal instanceof Group) {
- return ((Group) principal).members();
- }
if (principal instanceof GroupPrincipal) {
return ((GroupPrincipal) principal).members();
}
return Collections.emptyEnumeration();
}
-}
\ No newline at end of file
+}
diff --git a/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/principal/package-info.java b/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/principal/package-info.java
index 82151c4..a51fb00 100755
--- a/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/principal/package-info.java
+++ b/jackrabbit-jcr-rmi/src/main/java/org/apache/jackrabbit/rmi/server/principal/package-info.java
@@ -14,5 +14,5 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@org.osgi.annotation.versioning.Version("3.1.0")
+@org.osgi.annotation.versioning.Version("4.0.0")
package org.apache.jackrabbit.rmi.server.principal;
