From commits-return-52636-archive-asf-public=cust-asf.ponee.io@directory.apache.org Thu Jun 24 18:29:50 2021 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-he-de.apache.org (mxout1-he-de.apache.org [95.216.194.37]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id EF5A8180648 for ; Thu, 24 Jun 2021 20:29:49 +0200 (CEST) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-he-de.apache.org (ASF Mail Server at mxout1-he-de.apache.org) with SMTP id 669F3600FF for ; Thu, 24 Jun 2021 18:29:49 +0000 (UTC) Received: (qmail 96045 invoked by uid 500); 24 Jun 2021 18:29:48 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 96036 invoked by uid 99); 24 Jun 2021 18:29:48 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jun 2021 18:29:48 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 205F4821E0; Thu, 24 Jun 2021 18:29:48 +0000 (UTC) Date: Thu, 24 Jun 2021 18:29:48 +0000 To: "commits@directory.apache.org" Subject: [directory-fortress-realm] branch master updated: FC-238 - Migrate to LDAP API 2.0 - use commons 4 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <162455938806.6285.5046207696338569720@gitbox.apache.org> From: smckinney@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: directory-fortress-realm X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 458beb8598fbc44bdc40b8ebec8ee1432ace6f16 X-Git-Newrev: 10b9be9a794410dad9a516d4678aa78e1b8216ed X-Git-Rev: 10b9be9a794410dad9a516d4678aa78e1b8216ed X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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 @@ + org.apache.commons + commons-collections4 + 4.4 + + + ${project.groupId} fortress-realm-proxy provided 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 +}