directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-core git commit: FC-134 - Don't initialize extended ldap controls with system properties
Date Thu, 07 Jan 2016 21:29:15 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 406cf90d6 -> 9a1ef877f


 FC-134 - Don't initialize extended ldap controls with system properties


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/9a1ef877
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/9a1ef877
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/9a1ef877

Branch: refs/heads/master
Commit: 9a1ef877f5c207c580b49ea2f08ce3945dea97b8
Parents: 406cf90
Author: Shawn McKinney <smckinney@apache.org>
Authored: Thu Jan 7 15:29:08 2016 -0600
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Thu Jan 7 15:29:08 2016 -0600

----------------------------------------------------------------------
 .../fortress/core/ldap/ApacheDsDataProvider.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9a1ef877/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
b/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
index 5eb8061..be5d025 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
@@ -195,16 +195,15 @@ public abstract class ApacheDsDataProvider
         config.setCredentials( adminPw );
         try
         {
-            System.setProperty( StandaloneLdapApiService.EXTENDED_OPERATIONS_LIST,
-                "org.openldap.accelerator.impl.createSession.RbacCreateSessionFactory,"
-                    + "org.openldap.accelerator.impl.checkAccess.RbacCheckAccessFactory,"
-                    + "org.openldap.accelerator.impl.addRole.RbacAddRoleFactory,"
-                    + "org.openldap.accelerator.impl.dropRole.RbacDropRoleFactory,"
-                    + "org.openldap.accelerator.impl.deleteSession.RbacDeleteSessionFactory,"
-                    + "org.openldap.accelerator.impl.sessionRoles.RbacSessionRolesFactory"
-                );
-
-            LdapApiService ldapApiService = new StandaloneLdapApiService();
+            List<String> listExOps = new ArrayList<>();
+            listExOps.add( "org.openldap.accelerator.impl.createSession.RbacCreateSessionFactory"
);
+            listExOps.add( "org.openldap.accelerator.impl.checkAccess.RbacCheckAccessFactory"
);
+            listExOps.add( "org.openldap.accelerator.impl.addRole.RbacAddRoleFactory" );
+            listExOps.add( "org.openldap.accelerator.impl.dropRole.RbacDropRoleFactory" );
+            listExOps.add( "org.openldap.accelerator.impl.deleteSession.RbacDeleteSessionFactory"
);
+            listExOps.add( "org.openldap.accelerator.impl.sessionRoles.RbacSessionRolesFactory"
);
+            LdapApiService ldapApiService = new StandaloneLdapApiService( new ArrayList<String>(),
listExOps );
+
             if ( !LdapApiServiceFactory.isInitialized() )
             {
                 LdapApiServiceFactory.initialize( ldapApiService );


Mime
View raw message