You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/05/19 12:50:16 UTC
[3/3] directory-fortress-core git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/directory-fortress-core
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-fortress-core
Conflicts:
src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
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/4fde4a99
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/4fde4a99
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/4fde4a99
Branch: refs/heads/master
Commit: 4fde4a99cc9a475431c94777f3821cb276b3a8d6
Parents: d0922cd 4d037cb
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Tue May 19 12:49:38 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Tue May 19 12:49:38 2015 +0200
----------------------------------------------------------------------
LICENSE | 257 ++++++++
LICENSE.txt | 178 ------
NOTICE | 15 +
NOTICE.txt | 30 -
build.xml | 28 +-
docker/Dockerfile | 45 ++
docker/Dockerfile.centos6 | 46 ++
docker/README.md | 67 ++
docker/run-tests.sh | 48 ++
ldap/schema/apacheds-fortress.ldif | 36 ++
ldap/schema/mavibot-setup.ldif | 123 ++++
ldap/setup/LoadTestUsers.xml | 200 +++---
pom.xml | 189 +++---
.../directory/fortress/core/GlobalErrIds.java | 610 +++++++++----------
.../directory/fortress/core/GlobalIds.java | 157 ++---
.../directory/fortress/core/cfg/Config.java | 225 +++++--
.../fortress/core/cli/CmdLineParser.java | 6 +-
.../core/cli/CommandLineInterpreter.java | 7 +-
.../directory/fortress/core/cli/Options.java | 4 +-
.../core/doc-files/apache-fortress-core.html | 6 +-
.../core/doc-files/apache-fortress-rest.html | 11 +-
.../core/doc-files/apache-fortress-web.html | 12 +-
.../screenshot-fortress-console-main.png | Bin 0 -> 56230 bytes
.../core/ldap/ApacheDsDataProvider.java | 71 +--
.../core/ldap/LdapClientTrustStoreManager.java | 2 +-
.../fortress/core/ldap/group/GroupDAO.java | 7 +-
.../directory/fortress/core/rbac/AdminRole.java | 11 +
.../fortress/core/rbac/AdminRoleDAO.java | 8 +-
.../directory/fortress/core/rbac/AuditDAO.java | 12 +-
.../fortress/core/rbac/GlobalPwMsgIds.java | 36 +-
.../directory/fortress/core/rbac/Graphable.java | 8 -
.../directory/fortress/core/rbac/OrgUnit.java | 11 +
.../fortress/core/rbac/OrgUnitDAO.java | 6 +-
.../directory/fortress/core/rbac/PermDAO.java | 85 ++-
.../directory/fortress/core/rbac/PermObj.java | 15 +
.../fortress/core/rbac/Permission.java | 17 +
.../directory/fortress/core/rbac/PolicyDAO.java | 22 +-
.../directory/fortress/core/rbac/Props.java | 8 +
.../directory/fortress/core/rbac/PwPolicy.java | 21 +
.../directory/fortress/core/rbac/Role.java | 25 +-
.../directory/fortress/core/rbac/RoleDAO.java | 20 +-
.../directory/fortress/core/rbac/SDSet.java | 13 +-
.../directory/fortress/core/rbac/SdDAO.java | 60 +-
.../directory/fortress/core/rbac/User.java | 15 +-
.../fortress/core/rbac/UserAdminRole.java | 13 +
.../directory/fortress/core/rbac/UserDAO.java | 4 +-
.../directory/fortress/core/rbac/UserRole.java | 16 +
.../fortress/core/DefaultTestCase.java | 30 -
.../fortress/core/UnstableTestCase.java | 33 -
.../fortress/core/example/EErrIds.java | 22 +-
.../directory/fortress/core/example/EIds.java | 14 +-
.../fortress/core/rbac/AccelMgrImplTest.java | 3 -
.../fortress/core/rbac/AdminRoleTestData.java | 16 +-
.../fortress/core/rbac/FortressJUnitTest.java | 4 -
.../fortress/core/rbac/OrgUnitTestData.java | 28 +-
.../fortress/core/rbac/PRATestData.java | 2 +-
.../fortress/core/rbac/PermTestData.java | 58 +-
.../fortress/core/rbac/RoleTestData.java | 96 +--
.../fortress/core/rbac/URATestData.java | 2 +-
.../fortress/core/rbac/UserTestData.java | 48 +-
.../core/rbac/accelerator/TestAccelerator.java | 3 -
.../apacheds/FortressJUnitApachedsTest.java | 3 -
.../core/samples/AllSamplesJUnitTest.java | 3 -
src/test/jmeter/acCheckAccess.jmx | 2 +-
src/test/jmeter/acCreateSession.jmx | 2 +-
src/test/jmeter/ftCheckAccess.jmx | 2 +-
66 files changed, 1965 insertions(+), 1212 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4fde4a99/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
----------------------------------------------------------------------
diff --cc src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
index af7e97d,72a1a88..1167b84
--- a/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
@@@ -156,15 -144,16 +144,15 @@@ public abstract class ApacheDsDataProvi
private static final PasswordPolicy PP_REQ_CTRL = new PasswordPolicyImpl();
-
static
{
- String host = Config.getProperty( LDAP_HOST, "localhost" );
- int port = Config.getInt( LDAP_PORT, 10389 );
- int min = Config.getInt( LDAP_ADMIN_POOL_MIN, 1 );
- int max = Config.getInt( LDAP_ADMIN_POOL_MAX, 10 );
+ String host = Config.getProperty( GlobalIds.LDAP_HOST, "localhost" );
+ int port = Config.getInt( GlobalIds.LDAP_PORT, 10389 );
+ int min = Config.getInt( GlobalIds.LDAP_ADMIN_POOL_MIN, 1 );
+ int max = Config.getInt( GlobalIds.LDAP_ADMIN_POOL_MAX, 10 );
int logmin = Config.getInt( LDAP_LOG_POOL_MIN, 1 );
int logmax = Config.getInt( LDAP_LOG_POOL_MAX, 10 );
- LOG.info( "LDAP POOL: host=[{}], port=[{}], min=[{}], max=[{}]", host, port, min, max);
+ LOG.info( "LDAP POOL: host=[{}], port=[{}], min=[{}], max=[{}]", host, port, min, max );
if ( IS_SET_TRUST_STORE_PROP )
{
@@@ -1561,4 -1540,4 +1542,4 @@@
{
return counters;
}
--}
++}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4fde4a99/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4fde4a99/src/main/java/org/apache/directory/fortress/core/rbac/Graphable.java
----------------------------------------------------------------------