You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2021/06/24 18:29:48 UTC
[directory-fortress-realm] branch master updated: FC-238 - Migrate
to LDAP API 2.0 - use commons 4
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-fortress-realm.git
The following commit(s) were added to refs/heads/master by this push:
new 10b9be9 FC-238 - Migrate to LDAP API 2.0 - use commons 4
10b9be9 is described below
commit 10b9be9a794410dad9a516d4678aa78e1b8216ed
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Thu Jun 24 13:29:42 2021 -0500
FC-238 - Migrate to LDAP API 2.0 - use commons 4
---
impl/pom.xml | 6 ++++++
.../org/apache/directory/fortress/realm/J2eePolicyMgrFactory.java | 4 +---
.../org/apache/directory/fortress/realm/J2eePolicyMgrImpl.java | 7 ++-----
.../apache/directory/fortress/realm/tomcat/TcAccessMgrImpl.java | 4 ++--
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/impl/pom.xml b/impl/pom.xml
index c7c420e..04a76d2 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -39,6 +39,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.4</version>
+ </dependency>
+
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>fortress-realm-proxy</artifactId>
<scope>provided</scope>
diff --git a/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrFactory.java b/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrFactory.java
index 7799371..f00e287 100644
--- a/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrFactory.java
+++ b/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrFactory.java
@@ -23,8 +23,6 @@ import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.*;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.impl.AdminMgrImpl;
-import org.apache.directory.fortress.core.rest.AdminMgrRestImpl;
import org.apache.directory.fortress.core.util.ClassUtil;
import org.apache.directory.fortress.core.util.Config;
import org.apache.directory.fortress.core.util.VUtil;
@@ -95,4 +93,4 @@ public final class J2eePolicyMgrFactory
return policyMgr;
}
-}
\ No newline at end of file
+}
diff --git a/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrImpl.java b/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrImpl.java
index 5250108..527fa24 100644
--- a/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrImpl.java
+++ b/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrImpl.java
@@ -28,12 +28,9 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.security.Principal;
-import java.util.NoSuchElementException;
import java.util.Set;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.directory.fortress.core.GlobalIds;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.directory.fortress.core.ReviewMgr;
import org.apache.directory.fortress.core.ReviewMgrFactory;
import org.apache.directory.fortress.core.AccessMgr;
@@ -343,4 +340,4 @@ public class J2eePolicyMgrImpl implements J2eePolicyMgr
accessMgr.setContextId( contextId );
reviewMgr.setContextId( contextId );
}
-}
\ No newline at end of file
+}
diff --git a/impl/src/main/java/org/apache/directory/fortress/realm/tomcat/TcAccessMgrImpl.java b/impl/src/main/java/org/apache/directory/fortress/realm/tomcat/TcAccessMgrImpl.java
index 035668a..637d1b2 100644
--- a/impl/src/main/java/org/apache/directory/fortress/realm/tomcat/TcAccessMgrImpl.java
+++ b/impl/src/main/java/org/apache/directory/fortress/realm/tomcat/TcAccessMgrImpl.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.realm.tomcat;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.realm.J2eePolicyMgr;
@@ -154,4 +154,4 @@ public class TcAccessMgrImpl implements TcAccessMgr
j2eeMgr.setContextId( contextId );
LOG.info( "CONTEXT ID: {}", contextId );
}
-}
\ No newline at end of file
+}