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 2014/11/10 16:01:37 UTC
[1/5] directory-fortress-core git commit: Removed the GlobalIds
constants NO_ATRS, TOP, OBJECT_CLASS, OU, CN and UID,
replaced by the SchemaConstants values (FC-40)
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 55358f9c9 -> 50c0cc005
Removed the GlobalIds constants NO_ATRS, TOP, OBJECT_CLASS, OU, CN and
UID, replaced by the SchemaConstants values (FC-40)
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/2371393d
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/2371393d
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/2371393d
Branch: refs/heads/master
Commit: 2371393d19e47acfe4db9abcf4eb44d8e8d4aa77
Parents: 1a4d971
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Wed Nov 5 19:38:41 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Wed Nov 5 19:38:41 2014 +0100
----------------------------------------------------------------------
.../directory/fortress/core/GlobalIds.java | 38 ++------------
.../directory/fortress/core/cfg/ConfigDAO.java | 10 ++--
.../core/ldap/ApacheDsDataProvider.java | 9 ++--
.../ldap/container/OrganizationalUnitDAO.java | 13 ++---
.../fortress/core/ldap/group/GroupDAO.java | 14 +++---
.../fortress/core/ldap/suffix/SuffixDAO.java | 2 +-
.../fortress/core/rbac/AdminRoleDAO.java | 10 ++--
.../directory/fortress/core/rbac/AuditDAO.java | 14 +++---
.../fortress/core/rbac/OrgUnitDAO.java | 14 +++---
.../directory/fortress/core/rbac/PolicyDAO.java | 16 +++---
.../directory/fortress/core/rbac/RoleDAO.java | 8 +--
.../directory/fortress/core/rbac/SdDAO.java | 12 ++---
.../directory/fortress/core/rbac/UserDAO.java | 53 ++++++++++----------
13 files changed, 91 insertions(+), 122 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2371393d/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
index 6dc1609..d0422fe 100755
--- a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.core;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.fortress.core.cfg.Config;
@@ -140,14 +141,6 @@ public class GlobalIds
.getProperty( GlobalIds.AUTHENTICATION_TYPE ) );
/**
- * Constant is used to tell ldap server to return no attributes on search.
- */
- public final static String[] NO_ATRS =
- {
- "1.1"
- };
-
- /**
* Parameter specifies the distinguished name (dn) of the LDAP suffix. The is the root or top-most node for a Directory Information Tree (DIT). The typical
* Fortress suffix format is {@code dc=example,dc=com}.
*/
@@ -219,11 +212,6 @@ public class GlobalIds
* ************************************************************************
*/
- /*
- * Constant contains the top object class name that is at the root of all ldap object class structures.
- */
- public final static String TOP = "top";
-
/**
* Constant contains the organization object class name.
*/
@@ -235,16 +223,6 @@ public class GlobalIds
public final static String SUFFIX_CLASS = "dcObject";
/**
- * Constant contains the userId attribute name for inetOrgPerson object class.
- */
- public final static String UID = "uid";
-
- /**
- * Constant contains the common name attribute name used within inetOrgPerson and other ldap object classes.
- */
- public final static String CN = "cn";
-
- /**
* Constant contains the ldap distinguished name attribute.
*/
public final static String DN = "dn";
@@ -260,19 +238,9 @@ public class GlobalIds
public final static String DESC = "description";
/**
- * Constant contains the ou attribute name used within inetOrgPerson and other ldap object classes.
- */
- public final static String OU = "ou";
-
- /**
* Password policy object class structure uses cn attribute name.
*/
- public final static String POLICY_NODE_TYPE = CN;
-
- /**
- * Constant contains the ldap object class attribute name.
- */
- public final static String OBJECT_CLASS = "objectclass";
+ public final static String POLICY_NODE_TYPE = SchemaConstants.CN_AT;
/*
* *************************************************************************
@@ -371,7 +339,7 @@ public class GlobalIds
*/
public final static String ROLE_OBJ_CLASS[] =
{
- GlobalIds.TOP,
+ SchemaConstants.TOP_OC,
ROLE_OBJECT_CLASS_NM,
GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME,
GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2371393d/src/main/java/org/apache/directory/fortress/core/cfg/ConfigDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigDAO.java b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigDAO.java
index 1d8f07a..e93feba 100755
--- a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigDAO.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.entry.Modification;
@@ -35,7 +36,6 @@ import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.apache.directory.fortress.core.FinderException;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
@@ -95,7 +95,7 @@ final class ConfigDAO extends ApacheDsDataProvider
private static final String[] CONFIG_ATRS =
{
- GlobalIds.CN, GlobalIds.PROPS
+ SchemaConstants.CN_AT, GlobalIds.PROPS
};
/**
@@ -120,9 +120,9 @@ final class ConfigDAO extends ApacheDsDataProvider
try
{
Entry myEntry = new DefaultEntry( dn );
- myEntry.add( GlobalIds.OBJECT_CLASS, CONFIG_OBJ_CLASS );
+ myEntry.add( SchemaConstants.OBJECT_CLASS_AT, CONFIG_OBJ_CLASS );
ld = getAdminConnection();
- myEntry.add( GlobalIds.CN, name );
+ myEntry.add( SchemaConstants.CN_AT, name );
loadProperties( props, myEntry, GlobalIds.PROPS );
add( ld, myEntry );
}
@@ -294,6 +294,6 @@ final class ConfigDAO extends ApacheDsDataProvider
*/
private String getDn( String name )
{
- return GlobalIds.CN + "=" + name + "," + CONFIG_ROOT_DN;
+ return SchemaConstants.CN_AT + "=" + name + "," + CONFIG_ROOT_DN;
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2371393d/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 4b7591f..0a542a0 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
@@ -30,6 +30,7 @@ import java.util.Set;
import java.util.TreeSet;
import org.apache.commons.pool.impl.GenericObjectPool;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
@@ -59,7 +60,6 @@ import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.ldap.client.api.LdapConnectionConfig;
import org.apache.directory.ldap.client.api.LdapConnectionPool;
import org.apache.directory.ldap.client.api.PoolableLdapConnectionFactory;
-
import org.apache.directory.fortress.core.CfgRuntimeException;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
@@ -71,7 +71,6 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
import org.apache.directory.fortress.core.util.crypto.EncryptUtil;
import org.apache.directory.fortress.core.util.time.CUtil;
import org.apache.directory.fortress.core.util.time.Constraint;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -289,7 +288,7 @@ public abstract class ApacheDsDataProvider
// Found. The DN is ,ou=<contextId>,
StringBuilder dn = new StringBuilder();
- dn.append( szDn.substring( 0, idx - 1 ) ).append( "," ).append( GlobalIds.OU ).append( "=" ).append(
+ dn.append( szDn.substring( 0, idx - 1 ) ).append( "," ).append( SchemaConstants.OU_AT ).append( "=" ).append(
contextId ).append( "," ).append( szDn.substring( idx ) );
return dn.toString();
@@ -318,7 +317,7 @@ public abstract class ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) && !contextId
.equals( GlobalIds.HOME ) )
{
- dn.append( GlobalIds.OU ).append( "=" ).append( contextId ).append( "," +
+ dn.append( SchemaConstants.OU_AT ).append( "=" ).append( contextId ).append( "," +
"" ).append( Config.getProperty( GlobalIds.SUFFIX ) );
}
else
@@ -631,7 +630,7 @@ public abstract class ApacheDsDataProvider
String theDN;
// Find child nodes
- SearchCursor cursor = search( connection, dn, SearchScope.ONELEVEL, "(objectclass=*)", GlobalIds.NO_ATRS,
+ SearchCursor cursor = search( connection, dn, SearchScope.ONELEVEL, "(objectclass=*)", SchemaConstants.NO_ATTRIBUTE_ARRAY,
false, 0 );
// Iterate over all entries under this entry
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2371393d/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
index 551362e..33d7387 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.core.ldap.container;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
import org.apache.directory.api.ldap.model.entry.Entry;
@@ -96,11 +97,11 @@ final class OrganizationalUnitDAO extends ApacheDsDataProvider
throws CreateException
{
LdapConnection ld = null;
- String nodeDn = GlobalIds.OU + "=" + oe.getName() + ",";
+ String nodeDn = SchemaConstants.OU_AT + "=" + oe.getName() + ",";
if ( VUtil.isNotNullOrEmpty( oe.getParent() ) )
{
- nodeDn += GlobalIds.OU + "=" + oe.getParent() + ",";
+ nodeDn += SchemaConstants.OU_AT + "=" + oe.getParent() + ",";
}
nodeDn += getRootDn( oe.getContextId() );
@@ -109,8 +110,8 @@ final class OrganizationalUnitDAO extends ApacheDsDataProvider
{
LOG.info( "create container dn [{}]", nodeDn );
Entry myEntry = new DefaultEntry( nodeDn,
- GlobalIds.OBJECT_CLASS, ORGUNIT_OBJ_CLASS,
- GlobalIds.OU, oe.getName(),
+ SchemaConstants.OBJECT_CLASS_AT, ORGUNIT_OBJ_CLASS,
+ SchemaConstants.OU_AT, oe.getName(),
GlobalIds.DESC, oe.getDescription() );
ld = getAdminConnection();
add( ld, myEntry );
@@ -136,11 +137,11 @@ final class OrganizationalUnitDAO extends ApacheDsDataProvider
throws RemoveException
{
LdapConnection ld = null;
- String nodeDn = GlobalIds.OU + "=" + oe.getName() + ",";
+ String nodeDn = SchemaConstants.OU_AT + "=" + oe.getName() + ",";
if ( VUtil.isNotNullOrEmpty( oe.getParent() ) )
{
- nodeDn += GlobalIds.OU + "=" + oe.getParent() + ",";
+ nodeDn += SchemaConstants.OU_AT + "=" + oe.getParent() + ",";
}
nodeDn += getRootDn( oe.getContextId(), GlobalIds.SUFFIX );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2371393d/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupDAO.java b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupDAO.java
index a46a22e..48eb26f 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupDAO.java
@@ -68,8 +68,8 @@ final class GroupDAO extends ApacheDsDataProvider
private static final String GROUP_PROTOCOL_ATTR_IMPL = Config.getProperty( GROUP_PROTOCOL_ATTR );
private static final String GROUP_PROPERTY_ATTR = "group.properties";
private static final String GROUP_PROPERTY_ATTR_IMPL = Config.getProperty( GROUP_PROPERTY_ATTR );
- private static final String GROUP_OBJ_CLASS[] = {GlobalIds.TOP, GROUP_OBJECT_CLASS_IMPL};
- private static final String[] GROUP_ATRS = {GlobalIds.CN, GlobalIds.DESC, GROUP_PROTOCOL_ATTR_IMPL, GROUP_PROPERTY_ATTR_IMPL, SchemaConstants.MEMBER_AT};
+ private static final String GROUP_OBJ_CLASS[] = {SchemaConstants.TOP_OC, GROUP_OBJECT_CLASS_IMPL};
+ private static final String[] GROUP_ATRS = {SchemaConstants.CN_AT, GlobalIds.DESC, GROUP_PROTOCOL_ATTR_IMPL, GROUP_PROPERTY_ATTR_IMPL, SchemaConstants.MEMBER_AT};
/**
* Package private default constructor.
@@ -92,8 +92,8 @@ final class GroupDAO extends ApacheDsDataProvider
{
LOG.debug( "create group dn [{}]", nodeDn );
Entry myEntry = new DefaultEntry( nodeDn );
- myEntry.add( GlobalIds.OBJECT_CLASS, GROUP_OBJ_CLASS );
- myEntry.add( GlobalIds.CN , group.getName() );
+ myEntry.add( SchemaConstants.OBJECT_CLASS_AT, GROUP_OBJ_CLASS );
+ myEntry.add( SchemaConstants.CN_AT , group.getName() );
myEntry.add( GROUP_PROTOCOL_ATTR_IMPL, group.getProtocol() );
loadAttrs( group.getMembers(), myEntry, SchemaConstants.MEMBER_AT );
loadProperties( group.getProperties(), myEntry, GROUP_PROPERTY_ATTR_IMPL, '=' );
@@ -385,7 +385,7 @@ final class GroupDAO extends ApacheDsDataProvider
try
{
String searchVal = encodeSafeText( group.getName(), GlobalIds.ROLE_LEN );
- filter = GlobalIds.FILTER_PREFIX + GROUP_OBJECT_CLASS_IMPL + ")(" + GlobalIds.CN + "=" + searchVal + "*))";
+ filter = GlobalIds.FILTER_PREFIX + GROUP_OBJECT_CLASS_IMPL + ")(" + SchemaConstants.CN_AT + "=" + searchVal + "*))";
ld = getAdminConnection();
searchResults = search( ld, groupRoot, SearchScope.ONELEVEL, filter, GROUP_ATRS, false,
GlobalIds.BATCH_SIZE );
@@ -470,7 +470,7 @@ final class GroupDAO extends ApacheDsDataProvider
throws LdapInvalidAttributeValueException
{
Group entity = new ObjectFactory().createGroup();
- entity.setName( getAttribute( le, GlobalIds.CN ) );
+ entity.setName( getAttribute( le, SchemaConstants.CN_AT ) );
entity.setDescription( getAttribute( le, GlobalIds.DESC ) );
entity.setProtocol( getAttribute( le, GROUP_PROTOCOL_ATTR_IMPL ) );
entity.setMembers( getAttributes( le, SchemaConstants.MEMBER_AT ) );
@@ -484,6 +484,6 @@ final class GroupDAO extends ApacheDsDataProvider
private String getDn( String name, String contextId )
{
- return GlobalIds.CN + "=" + name + "," + getRootDn( contextId, GlobalIds.GROUP_ROOT );
+ return SchemaConstants.CN_AT + "=" + name + "," + getRootDn( contextId, GlobalIds.GROUP_ROOT );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2371393d/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java b/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
index 49ff943..87ba929 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
@@ -96,7 +96,7 @@ final class SuffixDAO extends ApacheDsDataProvider
{
LOG.info( "create suffix dn [" + nodeDn + "]" );
Entry myEntry = new DefaultEntry( nodeDn );
- myEntry.add( GlobalIds.OBJECT_CLASS, SUFFIX_OBJ_CLASS );
+ myEntry.add( SchemaConstants.OBJECT_CLASS_AT, SUFFIX_OBJ_CLASS );
myEntry.add( SchemaConstants.DC_AT, se.getName() );
myEntry.add( SchemaConstants.O_AT, se.getDescription() );
ld = getAdminConnection();
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2371393d/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
index 80c5182..4a3ec00 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleDAO.java
@@ -23,6 +23,7 @@ package org.apache.directory.fortress.core.rbac;
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@ -35,7 +36,6 @@ import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueEx
import org.apache.directory.api.ldap.model.exception.LdapNoSuchObjectException;
import org.apache.directory.api.ldap.model.message.SearchScope;
import org.apache.directory.ldap.client.api.LdapConnection;
-
import org.apache.directory.fortress.core.CreateException;
import org.apache.directory.fortress.core.FinderException;
import org.apache.directory.fortress.core.GlobalErrIds;
@@ -117,7 +117,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
private static final String POOLS_AUX_OBJECT_CLASS_NAME = "ftPools";
private static final String ADMIN_ROLE_OBJ_CLASS[] =
{
- GlobalIds.TOP,
+ SchemaConstants.TOP_OC,
GlobalIds.ROLE_OBJECT_CLASS_NM,
GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME,
POOLS_AUX_OBJECT_CLASS_NAME,
@@ -160,7 +160,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
{
Entry entry = new DefaultEntry( dn );
- entry.add( GlobalIds.OBJECT_CLASS, ADMIN_ROLE_OBJ_CLASS );
+ entry.add( SchemaConstants.OBJECT_CLASS_AT, ADMIN_ROLE_OBJ_CLASS );
entity.setId();
entry.add( GlobalIds.FT_IID, entity.getId() );
entry.add( ROLE_NM, entity.getName() );
@@ -172,7 +172,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
}
// CN attribute is required for this object class:
- entry.add( GlobalIds.CN, entity.getName() );
+ entry.add( SchemaConstants.CN_AT, entity.getName() );
entry.add( GlobalIds.CONSTRAINT, CUtil.setConstraint( entity ) );
loadAttrs( entity.getOsP(), entry, ROLE_OSP );
loadAttrs( entity.getOsU(), entry, ROLE_OSU );
@@ -690,7 +690,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
private String getDn( AdminRole adminRole )
{
- return GlobalIds.CN + "=" + adminRole.getName() + ","
+ return SchemaConstants.CN_AT + "=" + adminRole.getName() + ","
+ getRootDn( adminRole.getContextId(), GlobalIds.ADMIN_ROLE_ROOT );
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2371393d/src/main/java/org/apache/directory/fortress/core/rbac/AuditDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AuditDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/AuditDAO.java
index 1f0858c..e273559 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AuditDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AuditDAO.java
@@ -23,6 +23,7 @@ package org.apache.directory.fortress.core.rbac;
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
import org.apache.directory.api.ldap.model.entry.Entry;
@@ -30,7 +31,6 @@ import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueException;
import org.apache.directory.api.ldap.model.message.SearchScope;
import org.apache.directory.ldap.client.api.LdapConnection;
-
import org.apache.directory.fortress.core.FinderException;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
@@ -240,13 +240,13 @@ final class AuditDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( audit.getUserId() ) )
{
userId = audit.getUserId();
- filter += REQDN + "=" + GlobalIds.UID + "=" + userId + "," + userRoot + ")(" +
+ filter += REQDN + "=" + SchemaConstants.UID_AT + "=" + userId + "," + userRoot + ")(" +
REQUAUTHZID + "=" + "cn=Manager," + Config.getProperty( GlobalIds.SUFFIX ) + ")";
}
else
{
// pull back all failed authN attempts for all users:
- filter += REQATTR + "=" + GlobalIds.UID + ")(" +
+ filter += REQATTR + "=" + SchemaConstants.UID_AT + ")(" +
REQUAUTHZID + "=" + "cn=Manager," + Config.getProperty( GlobalIds.SUFFIX ) + ")";
}
@@ -316,7 +316,7 @@ final class AuditDAO extends ApacheDsDataProvider
String reqDn = PermDAO.getOpRdn( audit.getOpName(), audit.getObjId() ) + "," + GlobalIds.POBJ_NAME + "="
+ audit.getObjName() + "," + permRoot;
String filter = GlobalIds.FILTER_PREFIX + ACCESS_AUTHZ_CLASS_NM + ")(" + REQDN + "=" +
- reqDn + ")(" + REQUAUTHZID + "=" + GlobalIds.UID + "=" + audit.getUserId() + "," + userRoot + ")";
+ reqDn + ")(" + REQUAUTHZID + "=" + SchemaConstants.UID_AT + "=" + audit.getUserId() + "," + userRoot + ")";
if ( audit.isFailedOnly() )
{
@@ -397,7 +397,7 @@ final class AuditDAO extends ApacheDsDataProvider
if ( audit.getUserId() != null && audit.getUserId().length() > 0 )
{
- filter += REQUAUTHZID + "=" + GlobalIds.UID + "=" + audit.getUserId() + "," + userRoot + ")";
+ filter += REQUAUTHZID + "=" + SchemaConstants.UID_AT + "=" + audit.getUserId() + "," + userRoot + ")";
}
else
{
@@ -471,7 +471,7 @@ final class AuditDAO extends ApacheDsDataProvider
if ( audit.getUserId() != null && audit.getUserId().length() > 0 )
{
filter = GlobalIds.FILTER_PREFIX + ACCESS_BIND_CLASS_NM + ")(" +
- REQDN + "=" + GlobalIds.UID + "=" + audit.getUserId() + "," + userRoot + ")";
+ REQDN + "=" + SchemaConstants.UID_AT + "=" + audit.getUserId() + "," + userRoot + ")";
if ( audit.isFailedOnly() )
{
@@ -551,7 +551,7 @@ final class AuditDAO extends ApacheDsDataProvider
try
{
String filter = GlobalIds.FILTER_PREFIX + ACCESS_MOD_CLASS_NM + ")(" +
- REQDN + "=" + GlobalIds.UID + "=" + audit.getUserId() + "," + userRoot + ")";
+ REQDN + "=" + SchemaConstants.UID_AT + "=" + audit.getUserId() + "," + userRoot + ")";
if ( audit.getBeginDate() != null )
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2371393d/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
index 41f83f0..02d800c 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
@@ -109,16 +109,16 @@ final class OrgUnitDAO extends ApacheDsDataProvider
private static final String ORGUNIT_OBJ_CLASS[] =
{
- GlobalIds.TOP, ORGUNIT_OBJECT_CLASS_NM, GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
+ SchemaConstants.TOP_OC, ORGUNIT_OBJECT_CLASS_NM, GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
};
private static final String[] ORGUNIT_ATRS =
{
- GlobalIds.FT_IID, GlobalIds.OU, GlobalIds.DESC, GlobalIds.PARENT_NODES
+ GlobalIds.FT_IID, SchemaConstants.OU_AT, GlobalIds.DESC, GlobalIds.PARENT_NODES
};
private static final String[] ORGUNIT_ATR =
{
- GlobalIds.OU
+ SchemaConstants.OU_AT
};
@@ -416,7 +416,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
{
String searchVal = encodeSafeText( orgUnit.getName(), GlobalIds.ROLE_LEN );
String filter = GlobalIds.FILTER_PREFIX + ORGUNIT_OBJECT_CLASS_NM + ")("
- + GlobalIds.OU + "=" + searchVal + "*))";
+ + SchemaConstants.OU_AT + "=" + searchVal + "*))";
ld = getAdminConnection();
SearchCursor searchResults = search( ld, orgUnitRoot,
SearchScope.ONELEVEL, filter, ORGUNIT_ATRS, false, GlobalIds.BATCH_SIZE );
@@ -550,7 +550,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
{
String orgUnitRoot = getOrgRoot( orgUnit );
String[] DESC_ATRS =
- { GlobalIds.OU, GlobalIds.PARENT_NODES };
+ { SchemaConstants.OU_AT, GlobalIds.PARENT_NODES };
List<Graphable> descendants = new ArrayList<>();
LdapConnection ld = null;
String filter = null;
@@ -672,7 +672,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
{
OrgUnit entity = new ObjectFactory().createOrgUnit();
entity.setSequenceId( sequence );
- entity.setName( getAttribute( le, GlobalIds.OU ) );
+ entity.setName( getAttribute( le, SchemaConstants.OU_AT ) );
entity.setParents( getAttributeSet( le, GlobalIds.PARENT_NODES ) );
return entity;
@@ -694,7 +694,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
OrgUnit entity = new ObjectFactory().createOrgUnit();
entity.setSequenceId( sequence );
entity.setId( getAttribute( le, GlobalIds.FT_IID ) );
- entity.setName( getAttribute( le, GlobalIds.OU ) );
+ entity.setName( getAttribute( le, SchemaConstants.OU_AT ) );
entity.setDescription( getAttribute( le, GlobalIds.DESC ) );
String dn = le.getDn().getName();
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2371393d/src/main/java/org/apache/directory/fortress/core/rbac/PolicyDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PolicyDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/PolicyDAO.java
index 98e958c..7bc7e58 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PolicyDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PolicyDAO.java
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@ -37,7 +38,6 @@ import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueEx
import org.apache.directory.api.ldap.model.exception.LdapNoSuchObjectException;
import org.apache.directory.api.ldap.model.message.SearchScope;
import org.apache.directory.ldap.client.api.LdapConnection;
-
import org.apache.directory.fortress.core.CreateException;
import org.apache.directory.fortress.core.FinderException;
import org.apache.directory.fortress.core.GlobalErrIds;
@@ -109,7 +109,7 @@ final class PolicyDAO extends ApacheDsDataProvider
*/
private static final String OAM_PWPOLICY_OBJ_CLASS[] =
{
- GlobalIds.TOP, "device", OLPW_POLICY_CLASS, GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
+ SchemaConstants.TOP_OC, "device", OLPW_POLICY_CLASS, GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
};
private static final String OLPW_ATTRIBUTE = "pwdAttribute";
@@ -129,7 +129,7 @@ final class PolicyDAO extends ApacheDsDataProvider
private static final String OLPW_SAFE_MODIFY = "pwdSafeModify";
private static final String[] PASSWORD_POLICY_ATRS =
{
- GlobalIds.CN, OLPW_MIN_AGE, OLPW_MAX_AGE, OLPW_IN_HISTORY, OLPW_CHECK_QUALITY,
+ SchemaConstants.CN_AT, OLPW_MIN_AGE, OLPW_MAX_AGE, OLPW_IN_HISTORY, OLPW_CHECK_QUALITY,
OLPW_MIN_LENGTH, OLPW_EXPIRE_WARNING, OLPW_GRACE_LOGIN_LIMIT, OLPW_LOCKOUT,
OLPW_LOCKOUT_DURATION, OLPW_MAX_FAILURE, OLPW_FAILURE_COUNT_INTERVAL,
OLPW_MUST_CHANGE, OLPW_ALLOW_USER_CHANGE, OLPW_SAFE_MODIFY,
@@ -137,7 +137,7 @@ final class PolicyDAO extends ApacheDsDataProvider
private static final String[] PASSWORD_POLICY_NAME_ATR =
{
- GlobalIds.CN
+ SchemaConstants.CN_AT
};
@@ -156,8 +156,8 @@ final class PolicyDAO extends ApacheDsDataProvider
try
{
Entry entry = new DefaultEntry( dn );
- entry.add( GlobalIds.OBJECT_CLASS, OAM_PWPOLICY_OBJ_CLASS );
- entry.add( GlobalIds.CN, entity.getName() );
+ entry.add( SchemaConstants.OBJECT_CLASS_AT, OAM_PWPOLICY_OBJ_CLASS );
+ entry.add( SchemaConstants.CN_AT, entity.getName() );
entry.add( OLPW_ATTRIBUTE, OLPW_POLICY_EXTENSION );
if ( entity.getMinAge() != null )
@@ -478,7 +478,7 @@ final class PolicyDAO extends ApacheDsDataProvider
{
PwPolicy entity = new ObjectFactory().createPswdPolicy();
entity.setSequenceId( sequence );
- entity.setName( getAttribute( le, GlobalIds.CN ) );
+ entity.setName( getAttribute( le, SchemaConstants.CN_AT ) );
String val = getAttribute( le, OLPW_MIN_AGE );
if ( VUtil.isNotNullOrEmpty( val ) )
@@ -649,7 +649,7 @@ final class PolicyDAO extends ApacheDsDataProvider
while ( searchResults.next() )
{
- policySet.add( getAttribute( searchResults.getEntry(), GlobalIds.CN ) );
+ policySet.add( getAttribute( searchResults.getEntry(), SchemaConstants.CN_AT ) );
}
}
catch ( LdapException e )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2371393d/src/main/java/org/apache/directory/fortress/core/rbac/RoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/RoleDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/RoleDAO.java
index 7b62ba4..966177a 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/RoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/RoleDAO.java
@@ -23,6 +23,7 @@ package org.apache.directory.fortress.core.rbac;
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@ -35,7 +36,6 @@ import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueEx
import org.apache.directory.api.ldap.model.exception.LdapNoSuchObjectException;
import org.apache.directory.api.ldap.model.message.SearchScope;
import org.apache.directory.ldap.client.api.LdapConnection;
-
import org.apache.directory.fortress.core.CreateException;
import org.apache.directory.fortress.core.FinderException;
import org.apache.directory.fortress.core.GlobalErrIds;
@@ -130,7 +130,7 @@ final class RoleDAO extends ApacheDsDataProvider
try
{
Entry entry = new DefaultEntry( dn );
- entry.add( GlobalIds.OBJECT_CLASS, GlobalIds.ROLE_OBJ_CLASS );
+ entry.add( SchemaConstants.OBJECT_CLASS_AT, GlobalIds.ROLE_OBJ_CLASS );
entity.setId();
entry.add( GlobalIds.FT_IID, entity.getId() );
entry.add( ROLE_NM, entity.getName() );
@@ -142,7 +142,7 @@ final class RoleDAO extends ApacheDsDataProvider
}
// CN attribute is required for this object class:
- entry.add( GlobalIds.CN, entity.getName() );
+ entry.add( SchemaConstants.CN_AT, entity.getName() );
entry.add( GlobalIds.CONSTRAINT, CUtil.setConstraint( entity ) );
// These multi-valued attributes are optional. The utility function will return quietly if items are not loaded into collection:
@@ -652,6 +652,6 @@ final class RoleDAO extends ApacheDsDataProvider
private String getDn( String name, String contextId )
{
- return GlobalIds.CN + "=" + name + "," + getRootDn( contextId, GlobalIds.ROLE_ROOT );
+ return SchemaConstants.CN_AT + "=" + name + "," + getRootDn( contextId, GlobalIds.ROLE_ROOT );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2371393d/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java
index 5888f85..89f2674 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@ -37,7 +38,6 @@ import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueEx
import org.apache.directory.api.ldap.model.exception.LdapNoSuchObjectException;
import org.apache.directory.api.ldap.model.message.SearchScope;
import org.apache.directory.ldap.client.api.LdapConnection;
-
import org.apache.directory.fortress.core.CreateException;
import org.apache.directory.fortress.core.FinderException;
import org.apache.directory.fortress.core.GlobalErrIds;
@@ -124,13 +124,13 @@ final class SdDAO extends ApacheDsDataProvider
private static final String SSD_OBJECT_CLASS_NM = "ftSSDSet";
private static final String SSD_OBJ_CLASS[] =
{
- GlobalIds.TOP, SSD_OBJECT_CLASS_NM, GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
+ SchemaConstants.TOP_OC, SSD_OBJECT_CLASS_NM, GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
};
private static final String DSD_OBJECT_CLASS_NM = "ftDSDSet";
private static final String DSD_OBJ_CLASS[] =
{
- GlobalIds.TOP, DSD_OBJECT_CLASS_NM, GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
+ SchemaConstants.TOP_OC, DSD_OBJECT_CLASS_NM, GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
};
private static final String[] SD_SET_ATRS =
@@ -158,7 +158,7 @@ final class SdDAO extends ApacheDsDataProvider
try
{
Entry entry = new DefaultEntry( dn );
- entry.add( createAttributes( GlobalIds.OBJECT_CLASS, objectClass ) );
+ entry.add( createAttributes( SchemaConstants.OBJECT_CLASS_AT, objectClass ) );
entity.setId();
entry.add( GlobalIds.FT_IID, entity.getId() );
entry.add( SD_SET_NM, entity.getName() );
@@ -170,7 +170,7 @@ final class SdDAO extends ApacheDsDataProvider
}
// CN attribute is required for this object class:
- entry.add( GlobalIds.CN, entity.getName() );
+ entry.add( SchemaConstants.CN_AT, entity.getName() );
loadAttrs( entity.getMembers(), entry, ROLES );
entry.add( SD_SET_CARDINALITY, "" + entity.getCardinality() );
@@ -622,7 +622,7 @@ final class SdDAO extends ApacheDsDataProvider
private String getDn( String name, String contextId )
{
- return GlobalIds.CN + "=" + name + "," + getSdRoot( contextId );
+ return SchemaConstants.CN_AT + "=" + name + "," + getSdRoot( contextId );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2371393d/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
index 3def2ff..1ed46f7 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
import org.apache.directory.api.ldap.model.entry.Attribute;
@@ -45,7 +46,6 @@ import org.apache.directory.api.ldap.model.message.SearchScope;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.apache.directory.fortress.core.CreateException;
import org.apache.directory.fortress.core.FinderException;
import org.apache.directory.fortress.core.GlobalErrIds;
@@ -163,7 +163,7 @@ final class UserDAO extends ApacheDsDataProvider
// The Fortress User entity attributes are stored within standard LDAP object classes along with custom auxiliary object classes:
private static final String USER_OBJ_CLASS[] =
{
- GlobalIds.TOP,
+ SchemaConstants.TOP_OC,
Config.getProperty( USER_OBJECT_CLASS ),
USERS_AUX_OBJECT_CLASS_NAME,
GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME,
@@ -250,22 +250,23 @@ final class UserDAO extends ApacheDsDataProvider
private static final String OPENLDAP_ACCOUNT_LOCKED_TIME = "pwdAccountLockedTime";
private static final String LOCK_VALUE = "000001010000Z";
private static final String[] USERID =
- { GlobalIds.UID };
+ { SchemaConstants.UID_AT };
private static final String[] ROLES =
{ GlobalIds.USER_ROLE_ASSIGN };
private static final String[] USERID_ATRS =
{
- GlobalIds.UID
+ SchemaConstants.UID_AT
};
// This smaller result set of attributes are needed for user validation and authentication operations.
private static final String[] AUTHN_ATRS =
{
GlobalIds.FT_IID,
- GlobalIds.UID, PW,
+ SchemaConstants.UID_AT, PW,
GlobalIds.DESC,
- GlobalIds.OU, GlobalIds.CN,
+ SchemaConstants.OU_AT,
+ SchemaConstants.CN_AT,
SN,
GlobalIds.CONSTRAINT,
GlobalIds.IS_OPENLDAP ? OPENLDAP_PW_RESET : null,
@@ -277,10 +278,10 @@ final class UserDAO extends ApacheDsDataProvider
private static final String[] DEFAULT_ATRS =
{
GlobalIds.FT_IID,
- GlobalIds.UID, PW,
+ SchemaConstants.UID_AT, PW,
GlobalIds.DESC,
- GlobalIds.OU,
- GlobalIds.CN,
+ SchemaConstants.OU_AT,
+ SchemaConstants.CN_AT,
SN,
GlobalIds.USER_ROLE_DATA,
GlobalIds.CONSTRAINT,
@@ -337,9 +338,9 @@ final class UserDAO extends ApacheDsDataProvider
Entry myEntry = new DefaultEntry( dn );
- myEntry.add( GlobalIds.OBJECT_CLASS, USER_OBJ_CLASS );
+ myEntry.add( SchemaConstants.OBJECT_CLASS_AT, USER_OBJ_CLASS );
myEntry.add( GlobalIds.FT_IID, entity.getInternalId() );
- myEntry.add( GlobalIds.UID, entity.getUserId() );
+ myEntry.add( SchemaConstants.UID_AT, entity.getUserId() );
// CN is required on inetOrgPerson object class, if caller did not set, use the userId:
if ( !VUtil.isNotNullOrEmpty( entity.getCn() ) )
@@ -347,7 +348,7 @@ final class UserDAO extends ApacheDsDataProvider
entity.setCn( entity.getUserId() );
}
- myEntry.add( GlobalIds.CN, entity.getCn() );
+ myEntry.add( SchemaConstants.CN_AT, entity.getCn() );
// SN is required on inetOrgPerson object class, if caller did not set, use the userId:
if ( !VUtil.isNotNullOrEmpty( entity.getSn() ) )
@@ -395,7 +396,7 @@ final class UserDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( entity.getOu() ) )
{
- myEntry.add( GlobalIds.OU, entity.getOu() );
+ myEntry.add( SchemaConstants.OU_AT, entity.getOu() );
}
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
@@ -454,7 +455,7 @@ final class UserDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( entity.getCn() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, GlobalIds.CN, entity.getCn() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.CN_AT, entity.getCn() ) );
}
if ( VUtil.isNotNullOrEmpty( entity.getSn() ) )
@@ -466,7 +467,7 @@ final class UserDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( entity.getOu() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, GlobalIds.OU, entity.getOu() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.OU_AT, entity.getOu() ) );
}
if ( VUtil.isNotNullOrEmpty( entity.getPassword() ) )
@@ -942,7 +943,7 @@ final class UserDAO extends ApacheDsDataProvider
// place a wild card after the input userId:
String searchVal = encodeSafeText( user.getUserId(), GlobalIds.USERID_LEN );
filter = GlobalIds.FILTER_PREFIX + objectClassImpl + ")("
- + GlobalIds.UID + "=" + searchVal + "*))";
+ + SchemaConstants.UID_AT + "=" + searchVal + "*))";
}
else if ( VUtil.isNotNullOrEmpty( user.getInternalId() ) )
{
@@ -1006,7 +1007,7 @@ final class UserDAO extends ApacheDsDataProvider
{
String searchVal = encodeSafeText( user.getUserId(), GlobalIds.USERID_LEN );
String filter = GlobalIds.FILTER_PREFIX + objectClassImpl + ")("
- + GlobalIds.UID + "=" + searchVal + "*))";
+ + SchemaConstants.UID_AT + "=" + searchVal + "*))";
ld = getAdminConnection();
SearchCursor searchResults = search( ld, userRoot,
SearchScope.ONELEVEL, filter, USERID, false, GlobalIds.BATCH_SIZE, limit );
@@ -1014,7 +1015,7 @@ final class UserDAO extends ApacheDsDataProvider
while ( searchResults.next() )
{
Entry entry = searchResults.getEntry();
- userList.add( getAttribute( entry, GlobalIds.UID ) );
+ userList.add( getAttribute( entry, SchemaConstants.UID_AT ) );
}
}
catch ( LdapException e )
@@ -1187,7 +1188,7 @@ final class UserDAO extends ApacheDsDataProvider
while ( searchResults.next() )
{
- userSet.add( getAttribute( searchResults.getEntry(), GlobalIds.UID ) );
+ userSet.add( getAttribute( searchResults.getEntry(), SchemaConstants.UID_AT ) );
}
}
catch ( LdapException e )
@@ -1283,7 +1284,7 @@ final class UserDAO extends ApacheDsDataProvider
while ( searchResults.next() )
{
Entry entry = searchResults.getEntry();
- userList.add( getAttribute( entry, GlobalIds.UID ) );
+ userList.add( getAttribute( entry, SchemaConstants.UID_AT ) );
}
}
catch ( LdapException e )
@@ -1323,7 +1324,7 @@ final class UserDAO extends ApacheDsDataProvider
{
searchVal = encodeSafeText( searchVal, GlobalIds.USERID_LEN );
String filter = GlobalIds.FILTER_PREFIX + objectClassImpl + ")("
- + GlobalIds.UID + "=" + searchVal + "*))";
+ + SchemaConstants.UID_AT + "=" + searchVal + "*))";
ld = getAdminConnection();
SearchCursor searchResults = search( ld, userRoot,
SearchScope.ONELEVEL, filter, DEFAULT_ATRS, false, GlobalIds.BATCH_SIZE );
@@ -1369,7 +1370,7 @@ final class UserDAO extends ApacheDsDataProvider
{
String szOu = encodeSafeText( ou.getName(), GlobalIds.OU_LEN );
String filter = GlobalIds.FILTER_PREFIX + objectClassImpl + ")("
- + GlobalIds.OU + "=" + szOu + "))";
+ + SchemaConstants.OU_AT + "=" + szOu + "))";
int maxLimit;
if ( limitSize )
@@ -1800,11 +1801,11 @@ final class UserDAO extends ApacheDsDataProvider
entity.setSequenceId( sequence );
entity.setInternalId( getAttribute( entry, GlobalIds.FT_IID ) );
entity.setDescription( getAttribute( entry, GlobalIds.DESC ) );
- entity.setUserId( getAttribute( entry, GlobalIds.UID ) );
- entity.setCn( getAttribute( entry, GlobalIds.CN ) );
+ entity.setUserId( getAttribute( entry, SchemaConstants.UID_AT ) );
+ entity.setCn( getAttribute( entry, SchemaConstants.CN_AT ) );
entity.setName( entity.getCn() );
entity.setSn( getAttribute( entry, SN ) );
- entity.setOu( getAttribute( entry, GlobalIds.OU ) );
+ entity.setOu( getAttribute( entry, SchemaConstants.OU_AT ) );
entity.setDn( entry.getDn().getName() );
entity.setTitle( getAttribute( entry, TITLE ) );
entity.setEmployeeType( getAttribute( entry, EMPLOYEE_TYPE ) );
@@ -2336,7 +2337,7 @@ final class UserDAO extends ApacheDsDataProvider
*/
private String getDn( String userId, String contextId )
{
- return GlobalIds.UID + "=" + userId + "," + getRootDn( contextId, GlobalIds.USER_ROOT );
+ return SchemaConstants.UID_AT + "=" + userId + "," + getRootDn( contextId, GlobalIds.USER_ROOT );
}
[4/5] directory-fortress-core git commit: Used the correct Strings
class
Posted by el...@apache.org.
Used the correct Strings class
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/0913c700
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/0913c700
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/0913c700
Branch: refs/heads/master
Commit: 0913c7006a8d584467dea33caabd85c0c268e720
Parents: 31e6442
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Mon Nov 10 15:56:28 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Mon Nov 10 15:56:28 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0913c700/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
index 02d800c..d758b99 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java
@@ -39,8 +39,8 @@ import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.api.ldap.model.exception.LdapNoSuchObjectException;
import org.apache.directory.api.ldap.model.message.SearchScope;
import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.util.Strings;
import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.mavibot.btree.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.directory.fortress.core.CreateException;
[2/5] directory-fortress-core git commit: Using teh SchemaConstants
constants CN_AT, OBJECT_CLASS_AT, TOP_OC, DEVICE_OC,
OU_AT and DC_OBJECT_AT instead of the one declared in GlobalIds
Posted by el...@apache.org.
Using teh SchemaConstants constants CN_AT, OBJECT_CLASS_AT, TOP_OC,
DEVICE_OC, OU_AT and DC_OBJECT_AT instead of the one declared in
GlobalIds
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/59bfc625
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/59bfc625
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/59bfc625
Branch: refs/heads/master
Commit: 59bfc62569a45bb36aa8d3de45a422300753b9c5
Parents: 2371393
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Thu Nov 6 11:53:09 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Thu Nov 6 11:53:09 2014 +0100
----------------------------------------------------------------------
.../directory/fortress/core/GlobalIds.java | 5 ----
.../directory/fortress/core/cfg/ConfigDAO.java | 3 +--
.../fortress/core/ldap/suffix/SuffixDAO.java | 2 +-
.../directory/fortress/core/rbac/PermDAO.java | 24 ++++++++++----------
.../directory/fortress/core/rbac/PolicyDAO.java | 2 +-
.../directory/fortress/core/example/EIds.java | 3 ++-
.../fortress/core/example/ExampleDAO.java | 13 ++++++-----
7 files changed, 24 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/59bfc625/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
index d0422fe..7e12f20 100755
--- a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
@@ -218,11 +218,6 @@ public class GlobalIds
public final static String ORGANIZATION_CLASS = "organization";
/**
- * Constant contains the suffix's dcObject object class name.
- */
- public final static String SUFFIX_CLASS = "dcObject";
-
- /**
* Constant contains the ldap distinguished name attribute.
*/
public final static String DN = "dn";
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/59bfc625/src/main/java/org/apache/directory/fortress/core/cfg/ConfigDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigDAO.java b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigDAO.java
index e93feba..da48bdd 100755
--- a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigDAO.java
@@ -86,11 +86,10 @@ final class ConfigDAO extends ApacheDsDataProvider
private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
private static final String CONFIG_ROOT_PARAM = "config.root";
private static final String CONFIG_ROOT_DN = Config.getProperty( CONFIG_ROOT_PARAM );
- private static final String DEVICE_OBJECT_CLASS_NM = "device";
private static final String CONFIG_OBJ_CLASS[] =
{
- DEVICE_OBJECT_CLASS_NM, GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME
+ SchemaConstants.DEVICE_OC, GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME
};
private static final String[] CONFIG_ATRS =
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/59bfc625/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java b/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
index 87ba929..81c365b 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
@@ -71,7 +71,7 @@ final class SuffixDAO extends ApacheDsDataProvider
private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
private static final String[] SUFFIX_OBJ_CLASS =
{
- GlobalIds.SUFFIX_CLASS, GlobalIds.ORGANIZATION_CLASS
+ SchemaConstants.DC_OBJECT_OC, GlobalIds.ORGANIZATION_CLASS
};
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/59bfc625/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java
index c7bce1b..2a4840a 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
@@ -40,7 +41,6 @@ import org.apache.directory.api.ldap.model.exception.LdapNoSuchAttributeExceptio
import org.apache.directory.api.ldap.model.exception.LdapNoSuchObjectException;
import org.apache.directory.api.ldap.model.message.SearchScope;
import org.apache.directory.ldap.client.api.LdapConnection;
-
import org.apache.directory.fortress.core.CreateException;
import org.apache.directory.fortress.core.FinderException;
import org.apache.directory.fortress.core.GlobalErrIds;
@@ -156,7 +156,7 @@ final class PermDAO extends ApacheDsDataProvider
private static final String PERM_OBJ_OBJ_CLASS[] =
{
- GlobalIds.TOP,
+ SchemaConstants.TOP_OC,
"organizationalunit",
PERM_OBJ_OBJECT_CLASS_NAME,
GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME,
@@ -165,7 +165,7 @@ final class PermDAO extends ApacheDsDataProvider
private static final String PERM_OP_OBJ_CLASS[] =
{
- GlobalIds.TOP,
+ SchemaConstants.TOP_OC,
"organizationalrole",
PERM_OP_OBJECT_CLASS_NAME,
GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME,
@@ -178,13 +178,13 @@ final class PermDAO extends ApacheDsDataProvider
private static final String USERS = "ftUsers";
private static final String[] PERMISSION_OP_ATRS =
{
- GlobalIds.FT_IID, PERM_NAME, GlobalIds.POBJ_NAME, GlobalIds.POP_NAME, GlobalIds.DESC, GlobalIds.OU,
+ GlobalIds.FT_IID, PERM_NAME, GlobalIds.POBJ_NAME, GlobalIds.POP_NAME, GlobalIds.DESC, SchemaConstants.OU_AT,
POBJ_ID, TYPE, ROLES, USERS, GlobalIds.PROPS
};
private static final String[] PERMISION_OBJ_ATRS =
{
- GlobalIds.FT_IID, GlobalIds.POBJ_NAME, GlobalIds.DESC, GlobalIds.OU, TYPE,
+ GlobalIds.FT_IID, GlobalIds.POBJ_NAME, GlobalIds.DESC, SchemaConstants.OU_AT, TYPE,
GlobalIds.PROPS
};
@@ -203,7 +203,7 @@ final class PermDAO extends ApacheDsDataProvider
try
{
Entry entry = new DefaultEntry( dn );
- entry.add( GlobalIds.OBJECT_CLASS, PERM_OBJ_OBJ_CLASS );
+ entry.add( SchemaConstants.OBJECT_CLASS_AT, PERM_OBJ_OBJ_CLASS );
entry.add( GlobalIds.POBJ_NAME, entity.getObjName() );
// this will generatre a new random, unique id on this entity:
@@ -213,7 +213,7 @@ final class PermDAO extends ApacheDsDataProvider
entry.add( GlobalIds.FT_IID, entity.getInternalId() );
// ou is required:
- entry.add( GlobalIds.OU, entity.getOu() );
+ entry.add( SchemaConstants.OU_AT, entity.getOu() );
// description is optional:
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
@@ -273,7 +273,7 @@ final class PermDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( entity.getOu() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, GlobalIds.OU, entity.getOu() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.OU_AT, entity.getOu() ) );
}
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
@@ -364,7 +364,7 @@ final class PermDAO extends ApacheDsDataProvider
{
Entry entry = new DefaultEntry( dn );
- entry.add( GlobalIds.OBJECT_CLASS, PERM_OP_OBJ_CLASS );
+ entry.add( SchemaConstants.OBJECT_CLASS_AT, PERM_OP_OBJ_CLASS );
entry.add( GlobalIds.POP_NAME, entity.getOpName() );
entry.add( GlobalIds.POBJ_NAME, entity.getObjName() );
entity.setAbstractName( entity.getObjName() + "." + entity.getOpName() );
@@ -385,7 +385,7 @@ final class PermDAO extends ApacheDsDataProvider
entry.add( PERM_NAME, entity.getAbstractName() );
// organizational name requires CN attribute:
- entry.add( GlobalIds.CN, entity.getAbstractName() );
+ entry.add( SchemaConstants.CN_AT, entity.getAbstractName() );
// objectid is optional:
if ( VUtil.isNotNullOrEmpty( entity.getObjId() ) )
@@ -1035,7 +1035,7 @@ final class PermDAO extends ApacheDsDataProvider
PermObj entity = new ObjectFactory().createPermObj();
entity.setSequenceId( sequence );
entity.setObjName( getAttribute( le, GlobalIds.POBJ_NAME ) );
- entity.setOu( getAttribute( le, GlobalIds.OU ) );
+ entity.setOu( getAttribute( le, SchemaConstants.OU_AT ) );
entity.setDn( le.getDn().getName() );
entity.setInternalId( getAttribute( le, GlobalIds.FT_IID ) );
entity.setType( getAttribute( le, TYPE ) );
@@ -1157,7 +1157,7 @@ final class PermDAO extends ApacheDsDataProvider
{
String ouVal = encodeSafeText( ou.getName(), GlobalIds.OU_LEN );
String filter = GlobalIds.FILTER_PREFIX + PERM_OBJ_OBJECT_CLASS_NAME + ")("
- + GlobalIds.OU + "=" + ouVal + "*))";
+ + SchemaConstants.OU_AT + "=" + ouVal + "*))";
int maxLimit;
if ( limitSize )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/59bfc625/src/main/java/org/apache/directory/fortress/core/rbac/PolicyDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PolicyDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/PolicyDAO.java
index 7bc7e58..2232bae 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PolicyDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PolicyDAO.java
@@ -109,7 +109,7 @@ final class PolicyDAO extends ApacheDsDataProvider
*/
private static final String OAM_PWPOLICY_OBJ_CLASS[] =
{
- SchemaConstants.TOP_OC, "device", OLPW_POLICY_CLASS, GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
+ SchemaConstants.TOP_OC, SchemaConstants.DEVICE_OC, OLPW_POLICY_CLASS, GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
};
private static final String OLPW_ATTRIBUTE = "pwdAttribute";
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/59bfc625/src/test/java/org/apache/directory/fortress/core/example/EIds.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/example/EIds.java b/src/test/java/org/apache/directory/fortress/core/example/EIds.java
index bd2018a..90d2d53 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/EIds.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/EIds.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.core.example;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.fortress.core.GlobalIds;
public class EIds
@@ -36,7 +37,7 @@ public class EIds
public final static String EXAMPLE_OBJECT_CLASS_NM = "oamExamples";
public final static String EXAMPLE_OBJ_CLASS[] = {
- GlobalIds.TOP, EXAMPLE_OBJECT_CLASS_NM, GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME
+ SchemaConstants.TOP_OC, EXAMPLE_OBJECT_CLASS_NM, GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME
// GlobalIds.TOP, EXAMPLE_OBJECT_CLASS_NM, GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME, GlobalIds.TEMPORAL_AUX_OBJECT_CLASS_NAME
};
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/59bfc625/src/test/java/org/apache/directory/fortress/core/example/ExampleDAO.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/example/ExampleDAO.java b/src/test/java/org/apache/directory/fortress/core/example/ExampleDAO.java
index 78fed81..8f2967b 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/ExampleDAO.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/ExampleDAO.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core.example;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
@@ -65,7 +66,7 @@ public class ExampleDAO extends ApacheDsDataProvider
throws CreateException
{
LdapConnection ld = null;
- String dn = GlobalIds.CN + "=" + entity.getName() + "," + Config.getProperty(EIds.EXAMPLE_ROOT);
+ String dn = SchemaConstants.CN_AT + "=" + entity.getName() + "," + Config.getProperty(EIds.EXAMPLE_ROOT);
if (LOG.isDebugEnabled())
{
LOG.debug("create dn [" + dn + "]");
@@ -93,7 +94,7 @@ public class ExampleDAO extends ApacheDsDataProvider
ld = getAdminConnection();
Entry entry = new DefaultEntry( dn );
- entry.add( createAttributes( GlobalIds.OBJECT_CLASS, EIds.EXAMPLE_OBJ_CLASS ) );
+ entry.add( createAttributes( SchemaConstants.OBJECT_CLASS_AT, EIds.EXAMPLE_OBJ_CLASS ) );
entity.setId();
@@ -105,7 +106,7 @@ public class ExampleDAO extends ApacheDsDataProvider
entry.add( GlobalIds.DESC, entity.getDescription() );
// organizational name requires CN attribute:
- entry.add( GlobalIds.CN, entity.getName() );
+ entry.add( SchemaConstants.CN_AT, entity.getName() );
//AttrHelper.loadTemporalAttrs(entity, attrs);
entity.setName("EXAMPLE");
@@ -136,7 +137,7 @@ public class ExampleDAO extends ApacheDsDataProvider
throws UpdateException
{
LdapConnection ld = null;
- String dn = GlobalIds.CN + "=" + entity.getName() + "," + Config.getProperty( EIds.EXAMPLE_ROOT );
+ String dn = SchemaConstants.CN_AT + "=" + entity.getName() + "," + Config.getProperty( EIds.EXAMPLE_ROOT );
if (LOG.isDebugEnabled())
{
LOG.debug("update dn [" + dn + "]");
@@ -184,7 +185,7 @@ public class ExampleDAO extends ApacheDsDataProvider
throws RemoveException
{
LdapConnection ld = null;
- String dn = GlobalIds.CN + "=" + name + "," + Config.getProperty(EIds.EXAMPLE_ROOT);
+ String dn = SchemaConstants.CN_AT + "=" + name + "," + Config.getProperty(EIds.EXAMPLE_ROOT);
if (LOG.isDebugEnabled())
{
LOG.debug("remove dn [" + dn + "]");
@@ -218,7 +219,7 @@ public class ExampleDAO extends ApacheDsDataProvider
{
Example entity = null;
LdapConnection ld = null;
- String dn = GlobalIds.CN + "=" + name + "," + Config.getProperty(EIds.EXAMPLE_ROOT);
+ String dn = SchemaConstants.CN_AT + "=" + name + "," + Config.getProperty(EIds.EXAMPLE_ROOT);
if (LOG.isDebugEnabled())
{
LOG.debug("findByKey dn [" + dn + "]");
[3/5] directory-fortress-core git commit: Using parameters in LOG
instead of concatenations
Posted by el...@apache.org.
Using parameters in LOG instead of concatenations
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/31e64423
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/31e64423
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/31e64423
Branch: refs/heads/master
Commit: 31e6442367516be34f8d8e42a225517c46da86f2
Parents: 59bfc62
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Thu Nov 6 18:09:47 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Thu Nov 6 18:09:47 2014 +0100
----------------------------------------------------------------------
.../fortress/core/ant/FortressAntTask.java | 234 +++++++++----------
.../directory/fortress/core/cfg/Config.java | 12 +-
.../directory/fortress/core/cfg/ConfigDAO.java | 10 +-
.../core/cli/CommandLineInterpreter.java | 29 +--
.../core/ldap/ApacheDsDataProvider.java | 17 +-
.../core/ldap/LdapClientTrustStoreManager.java | 2 +-
.../fortress/core/ldap/suffix/SuffixDAO.java | 4 +-
.../fortress/core/rbac/AcceleratorDAO.java | 4 +-
.../directory/fortress/core/rbac/HierUtil.java | 8 +-
.../directory/fortress/core/rbac/PsoUtil.java | 4 +-
.../directory/fortress/core/rbac/RoleUtil.java | 4 +-
.../directory/fortress/core/rbac/UserP.java | 2 +-
.../directory/fortress/core/rbac/UsoUtil.java | 4 +-
.../directory/fortress/core/rest/RestUtils.java | 4 +-
.../fortress/core/util/time/CUtil.java | 4 +-
15 files changed, 169 insertions(+), 173 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/31e64423/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java b/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
index 1938d22..cadc175 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
@@ -271,7 +271,7 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( " FortressAntTask setContext caught SecurityException=" + se );
+ LOG.warn( " FortressAntTask setContext caught SecurityException={}", se );
}
}
@@ -291,7 +291,7 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( " FortressAntTask constructor caught SecurityException=" + se );
+ LOG.warn( " FortressAntTask constructor caught SecurityException={}", se );
}
}
@@ -303,7 +303,7 @@ public class FortressAntTask extends Task implements InputHandler
*/
public void handleInput( InputRequest request )
{
- LOG.info( "handleInput request=" + request );
+ LOG.info( "handleInput request={}", request );
}
@@ -785,7 +785,7 @@ public class FortressAntTask extends Task implements InputHandler
*/
public void execute() throws BuildException
{
- LOG.info( "FORTRESS ANT TASK NAME : " + getTaskName() );
+ LOG.info( "FORTRESS ANT TASK NAME : {}", getTaskName() );
if ( isListNotNull( addcontexts ) )
{
setContext( addcontexts.get( 0 ).getContexts().get( 0 ) );
@@ -1038,8 +1038,8 @@ public class FortressAntTask extends Task implements InputHandler
for ( UserAnt user : users )
{
- LOG.info( "addUsers userid=" + user.getUserId() + " description=" + user.getDescription() + " " +
- "orgUnit=" + user.getOu() );
+ LOG.info( "addUsers userid={} description={} orgUnit={}",
+ user.getUserId(), user.getDescription(), user.getOu() );
try
{
try
@@ -1080,7 +1080,7 @@ public class FortressAntTask extends Task implements InputHandler
dAdminMgr.assignUser( uAdminRoleRole );
}
}
- LOG.info( "addUsers - Update entity - userId=" + user.getUserId() );
+ LOG.info( "addUsers - Update entity - userId={}", user.getUserId() );
}
else
{
@@ -1090,7 +1090,7 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "addUsers userId [" + user.getUserId() + "] caught SecurityException=" + se );
+ LOG.warn( "addUsers userId [{}] caught SecurityException={}", user.getUserId(), se );
}
}
}
@@ -1108,14 +1108,14 @@ public class FortressAntTask extends Task implements InputHandler
List<UserAnt> users = deluser.getUsers();
for ( UserAnt user : users )
{
- LOG.info( "deleteUsers userid=" + user.getUserId() );
+ LOG.info( "deleteUsers userid={}", user.getUserId() );
try
{
adminMgr.deleteUser( user );
}
catch ( SecurityException se )
{
- LOG.warn( "deleteUsers userId [" + user.getUserId() + "] caught SecurityException=" + se );
+ LOG.warn( "deleteUsers userId [{}] caught SecurityException={}", user.getUserId(), se );
}
}
}
@@ -1133,14 +1133,14 @@ public class FortressAntTask extends Task implements InputHandler
for ( Group group : groups )
{
- LOG.info( "addGroups name=" + group.getName() + " description=" + group.getDescription());
+ LOG.info( "addGroups name={} description={}", group.getName(), group.getDescription());
try
{
groupMgr.add( group );
}
catch ( SecurityException se )
{
- LOG.warn( "addGroups name [" + group.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "addGroups name [{}] caught SecurityException={}", group.getName(), se );
}
}
}
@@ -1157,14 +1157,14 @@ public class FortressAntTask extends Task implements InputHandler
List<Group> groups = delgroup.getGroups();
for ( Group group : groups )
{
- LOG.info( "deleteGroups name=" + group.getName() );
+ LOG.info( "deleteGroups name={}", group.getName() );
try
{
groupMgr.delete( group );
}
catch ( SecurityException se )
{
- LOG.warn( "deleteGroups name [" + group.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "deleteGroups name [{}] caught SecurityException={}", group.getName(), se );
}
}
}
@@ -1187,20 +1187,20 @@ public class FortressAntTask extends Task implements InputHandler
{
for( String member : members )
{
- LOG.info( "addGroupMembers name=" + group.getName() + ", member=" + member );
+ LOG.info( "addGroupMembers name={}, member={}", group.getName(), member );
try
{
groupMgr.assign( group, member );
}
catch ( SecurityException se )
{
- LOG.warn( "addGroupMembers name [" + group.getName() + "], member [" + member + "] caught SecurityException=" + se );
+ LOG.warn( "addGroupMembers name [{}], member [{}] caught SecurityException={}", group.getName(), member, se );
}
}
}
else
{
- LOG.info( "addGroupMembers name=" + group.getName() + ", no member found" );
+ LOG.info( "addGroupMembers name={}, no member found", group.getName() );
}
}
}
@@ -1221,20 +1221,21 @@ public class FortressAntTask extends Task implements InputHandler
{
for(String member : group.getMembers())
{
- LOG.info( "deleteGroupmembers name=" + group.getName() + ", member=" + member );
+ LOG.info( "deleteGroupmembers name={}, member={}", group.getName(), member );
try
{
groupMgr.deassign( group, member );
}
catch ( SecurityException se )
{
- LOG.warn( "deleteGroupmembers name [" + group.getName() + "], member [" + member + "] caught SecurityException=" + se );
+ LOG.warn( "deleteGroupmembers name [{}], member [{}] caught SecurityException={}",
+ group.getName(), member, se );
}
}
}
else
{
- LOG.info( "deleteGroupmembers name=" + group.getName() + ", no member found" );
+ LOG.info( "deleteGroupmembers name={}, no member found", group.getName() );
}
}
}
@@ -1264,13 +1265,13 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "addGroupProperties name [" + group.getName() + "], key [" + key + "], value [" + val + "] caught SecurityException=" + se );
+ LOG.warn( "addGroupProperties name [{}], key [{}], value [{}] caught SecurityException={}", group.getName(), key, val, se );
}
}
}
else
{
- LOG.info( "addGroupProperties name=" + group.getName() + ", no properties found" );
+ LOG.info( "addGroupProperties name={}, no properties found", group.getName() );
}
}
}
@@ -1300,13 +1301,14 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "deleteGroupProperties name [" + group.getName() + "], key [" + key + "], value [" + val + "] caught SecurityException=" + se );
+ LOG.warn( "deleteGroupProperties name [{}], key [{}], value [{}] caught SecurityException={}",
+ group.getName(), key, val, se );
}
}
}
else
{
- LOG.info( "deleteGroupProperties name=" + group.getName() + ", no properties found" );
+ LOG.info( "deleteGroupProperties name={}, no properties found", group.getName() );
}
}
}
@@ -1323,7 +1325,7 @@ public class FortressAntTask extends Task implements InputHandler
List<UserRole> userroles = adduserrole.getUserRoles();
for ( UserRole userRole : userroles )
{
- LOG.info( "addUserRoles userid=" + userRole.getUserId() + " role name=" + userRole.getName() );
+ LOG.info( "addUserRoles userid={} role name={}", userRole.getUserId(), userRole.getName() );
/*
System.out.println("userrole data:");
@@ -1367,7 +1369,7 @@ public class FortressAntTask extends Task implements InputHandler
List<UserRole> userroles = deluserrole.getUserRoles();
for ( UserRole userRole : userroles )
{
- LOG.info( "delUserRoles userid=" + userRole.getUserId() + " role name=" + userRole.getName() );
+ LOG.info( "delUserRoles userid={} role name={}", userRole.getUserId(), userRole.getName() );
try
{
adminMgr.deassignUser( userRole );
@@ -1394,14 +1396,14 @@ public class FortressAntTask extends Task implements InputHandler
List<Role> roles = addrole.getRoles();
for ( Role role : roles )
{
- LOG.info( "addRoles name=" + role.getName() + " description=" + role.getDescription() );
+ LOG.info( "addRoles name={} description={}", role.getName(), role.getDescription() );
try
{
adminMgr.addRole( role );
}
catch ( SecurityException se )
{
- LOG.warn( "addRoles name [" + role.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "addRoles name [{}] caught SecurityException={}", role.getName(), se );
}
}
}
@@ -1419,14 +1421,14 @@ public class FortressAntTask extends Task implements InputHandler
List<Role> roles = delrole.getRoles();
for ( Role role : roles )
{
- LOG.info( "deleteRoles name=" + role.getName() );
+ LOG.info( "deleteRoles name={}", role.getName() );
try
{
adminMgr.deleteRole( role );
}
catch ( SecurityException se )
{
- LOG.warn( "deleteRoles name [" + role.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "deleteRoles name [{}] caught SecurityException={}", role.getName(), se );
}
}
}
@@ -1444,8 +1446,7 @@ public class FortressAntTask extends Task implements InputHandler
List<Relationship> roles = addroleinheritance.getRelationships();
for ( Relationship relationship : roles )
{
- LOG.info( "addRoleInheritances parent=" + relationship.getParent() + " child=" + relationship
- .getChild() );
+ LOG.info( "addRoleInheritances parent={} child={}", relationship.getParent(), relationship.getChild() );
try
{
adminMgr.addInheritance( new Role( relationship.getParent() ), new Role( relationship.getChild()
@@ -1453,8 +1454,8 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "addRoleInheritances parent [" + relationship.getParent() + "] child [" + relationship
- .getChild() + "] caught SecurityException=" + se );
+ LOG.warn( "addRoleInheritances parent [{}] child [{}] caught SecurityException={}",
+ relationship.getParent(), relationship.getChild(), se );
}
}
}
@@ -1472,8 +1473,7 @@ public class FortressAntTask extends Task implements InputHandler
List<Relationship> roles = delroleinheritance.getRelationships();
for ( Relationship relationship : roles )
{
- LOG.info( "deleteRoleInheritances parent=" + relationship.getParent() + " child=" + relationship
- .getChild() );
+ LOG.info( "deleteRoleInheritances parent={} child={}", relationship.getParent(), relationship.getChild() );
try
{
adminMgr.deleteInheritance( new Role( relationship.getParent() ),
@@ -1481,8 +1481,8 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "deleteRoleInheritances parent [" + relationship.getParent() + "] child [" +
- relationship.getChild() + "] caught SecurityException=" + se );
+ LOG.warn( "deleteRoleInheritances parent [{}] child [{}] caught SecurityException={}",
+ relationship.getParent(), relationship.getChild(), se );
}
}
}
@@ -1500,7 +1500,7 @@ public class FortressAntTask extends Task implements InputHandler
List<SDSetAnt> sds = addsdset.getSdset();
for ( SDSetAnt sd : sds )
{
- LOG.info( "addSdsets name=" + sd.getName() + " description=" + sd.getDescription() );
+ LOG.info( "addSdsets name={} description={}", sd.getName(), sd.getDescription() );
try
{
if ( sd.getType() == SDSet.SDType.STATIC )
@@ -1514,7 +1514,7 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "addSdsets name [" + sd.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "addSdsets name [{}] caught SecurityException={}", sd.getName() + se );
}
}
}
@@ -1532,7 +1532,7 @@ public class FortressAntTask extends Task implements InputHandler
List<SDSetAnt> sds = delsdset.getSdset();
for ( SDSetAnt sd : sds )
{
- LOG.info( "deleteSdsets name=" + sd.getName() );
+ LOG.info( "deleteSdsets name={}", sd.getName() );
try
{
if ( sd.getSetType().equals( "STATIC" ) )
@@ -1547,7 +1547,7 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "deleteSdsets name [" + sd.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "deleteSdsets name [{}] caught SecurityException={}", sd.getName(), se );
}
}
}
@@ -1565,8 +1565,8 @@ public class FortressAntTask extends Task implements InputHandler
List<PermObj> permObjs = addpermObj.getPermObjs();
for ( PermObj permObj : permObjs )
{
- LOG.info( "addPermObjs objName=" + permObj.getObjName() + " description=" + permObj
- .getDescription() + " orgUnit=" + permObj.getOu() + " type=" + permObj.getType() );
+ LOG.info( "addPermObjs objName={} description={} orgUnit={} type={}",
+ permObj.getObjName(), permObj.getDescription(), permObj.getOu(), permObj.getType() );
try
{
try
@@ -1590,8 +1590,8 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "addPermObjs objName [" + permObj.getObjName() + "] caught SecurityException=" +
- se );
+ LOG.warn( "addPermObjs objName [{}] caught SecurityException={}",
+ permObj.getObjName(), se );
}
}
}
@@ -1609,15 +1609,15 @@ public class FortressAntTask extends Task implements InputHandler
List<PermObj> permObjs = delpermObj.getObjs();
for ( PermObj permObj : permObjs )
{
- LOG.info( "deletePermObjs objName=" + permObj.getObjName() + " description=" + permObj
- .getDescription() );
+ LOG.info( "deletePermObjs objName={} description={}",
+ permObj.getObjName(), permObj.getDescription() );
try
{
adminMgr.deletePermObj( permObj );
}
catch ( SecurityException se )
{
- LOG.warn( "deletePermObjs name [" + permObj.getObjName() + "] caught SecurityException=" + se );
+ LOG.warn( "deletePermObjs name [{}] caught SecurityException={}", permObj.getObjName(), se );
}
}
}
@@ -1635,7 +1635,7 @@ public class FortressAntTask extends Task implements InputHandler
List<PermAnt> permissions = addpermOp.getPermOps();
for ( PermAnt permission : permissions )
{
- LOG.info( "addPermOps name=" + permission.getOpName() + " objName=" + permission.getObjName() );
+ LOG.info( "addPermOps name={} objName={}", permission.getOpName() , permission.getObjName() );
try
{
try
@@ -1648,8 +1648,8 @@ public class FortressAntTask extends Task implements InputHandler
if ( se.getErrorId() == GlobalErrIds.PERM_DUPLICATE )
{
adminMgr.updatePermission( permission );
- LOG.info( "addPermOps - update entity - name=" + permission.getOpName() + " objName="
- + permission.getObjName() );
+ LOG.info( "addPermOps - update entity - name={} objName={}",
+ permission.getOpName(), permission.getObjName() );
}
else
{
@@ -1659,8 +1659,8 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "addPermOps name [" + permission.getOpName() + "] objName [" + permission
- .getObjName() + "] caught SecurityException=" + se );
+ LOG.warn( "addPermOps name [{}] objName [{}] caught SecurityException={}",
+ permission.getOpName(), permission.getObjName(), se );
}
}
}
@@ -1678,15 +1678,15 @@ public class FortressAntTask extends Task implements InputHandler
List<PermAnt> permissions = delpermOp.getPermOps();
for ( Permission permission : permissions )
{
- LOG.info( "deletePermOps name=" + permission.getOpName() + " objName=" + permission.getObjName() );
+ LOG.info( "deletePermOps name={} objName={}", permission.getOpName(), permission.getObjName() );
try
{
adminMgr.deletePermission( permission );
}
catch ( SecurityException se )
{
- LOG.warn( "deletePermOps name [" + permission.getOpName() + "] objName[" + permission
- .getObjName() + "] caught SecurityException=" + se );
+ LOG.warn( "deletePermOps name [{}] objName[{}] caught SecurityException={}",
+ permission.getOpName(), permission.getObjName(), se );
}
}
}
@@ -1794,14 +1794,14 @@ public class FortressAntTask extends Task implements InputHandler
List<PwPolicy> policies = addpwpolicy.getPolicies();
for ( PwPolicy policy : policies )
{
- LOG.info( "addPolicies name=" + policy.getName() );
+ LOG.info( "addPolicies name={}", policy.getName() );
try
{
policyMgr.add( policy );
}
catch ( SecurityException se )
{
- LOG.warn( "addPolicies name [" + policy.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "addPolicies name [{}] caught SecurityException={}", policy.getName(), se );
}
}
}
@@ -1819,14 +1819,14 @@ public class FortressAntTask extends Task implements InputHandler
List<PwPolicy> policies = delpwpolicy.getPolicies();
for ( PwPolicy policy : policies )
{
- LOG.info( "deletePolicies name=" + policy.getName() );
+ LOG.info( "deletePolicies name={}", policy.getName() );
try
{
policyMgr.delete( policy );
}
catch ( SecurityException se )
{
- LOG.warn( "deletePolicies name [" + policy.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "deletePolicies name [{}] caught SecurityException={}", policy.getName(), se );
}
}
}
@@ -1845,7 +1845,7 @@ public class FortressAntTask extends Task implements InputHandler
for ( OrganizationalUnit ou : containers )
{
- LOG.info( "addContainers name=" + ou.getName() + " description=" + ou.getDescription() );
+ LOG.info( "addContainers name={} description={}", ou.getName(), ou.getDescription() );
try
{
OrganizationalUnitP op = new OrganizationalUnitP();
@@ -1859,7 +1859,7 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "addContainers name [" + ou.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "addContainers name [{}] caught SecurityException={}", ou.getName(), se );
}
}
}
@@ -1877,7 +1877,7 @@ public class FortressAntTask extends Task implements InputHandler
List<OrganizationalUnit> containers = delcontainer.getContainers();
for ( OrganizationalUnit ou : containers )
{
- LOG.info( "deleteContainers name=" + ou.getName() );
+ LOG.info( "deleteContainers name={}", ou.getName() );
try
{
OrganizationalUnitP op = new OrganizationalUnitP();
@@ -1885,7 +1885,7 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "deleteContainers name [" + ou.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "deleteContainers name [{}] caught SecurityException={}", ou.getName(), se );
}
}
}
@@ -1904,7 +1904,7 @@ public class FortressAntTask extends Task implements InputHandler
for ( Suffix suffix : suffixes )
{
- LOG.info( "addSuffixes name=" + suffix.getName() + " description=" + suffix.getDescription() );
+ LOG.info( "addSuffixes name={} description={}", suffix.getName(), suffix.getDescription() );
try
{
SuffixP sp = new SuffixP();
@@ -1912,7 +1912,7 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "addSuffixes name [" + suffix.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "addSuffixes name [{}] caught SecurityException={}", suffix.getName(), se );
}
}
}
@@ -1930,7 +1930,7 @@ public class FortressAntTask extends Task implements InputHandler
List<Suffix> suffixes = delsuffix.getSuffixes();
for ( Suffix suffix : suffixes )
{
- LOG.info( "deleteSuffixes name=" + suffix.getName() );
+ LOG.info( "deleteSuffixes name={}", suffix.getName() );
try
{
SuffixP sp = new SuffixP();
@@ -1938,7 +1938,7 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "deleteSuffixes name [" + suffix.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "deleteSuffixes name [{}] caught SecurityException={}", suffix.getName(), se );
}
}
}
@@ -1956,15 +1956,15 @@ public class FortressAntTask extends Task implements InputHandler
List<OrgUnitAnt> ous = addorgunit.getOrgUnits();
for ( OrgUnitAnt ou : ous )
{
- LOG.info( "addOrgunits name=" + ou.getName() + " typeName=" + ou.getTypeName() + " description=" + ou
- .getDescription() );
+ LOG.info( "addOrgunits name={} typeName={} description={}",
+ ou.getName(), ou.getTypeName(), ou.getDescription() );
try
{
dAdminMgr.add( ou );
}
catch ( SecurityException se )
{
- LOG.warn( "addOrgunits name [" + ou.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "addOrgunits name [{}] caught SecurityException={}", ou.getName(), se );
}
}
}
@@ -1982,14 +1982,14 @@ public class FortressAntTask extends Task implements InputHandler
List<OrgUnitAnt> ous = delorgunit.getOrgUnits();
for ( OrgUnitAnt ou : ous )
{
- LOG.info( "deleteOrgunits name=" + ou.getName() + " typeName=" + ou.getTypeName() );
+ LOG.info( "deleteOrgunits name={} typeName={}", ou.getName(), ou.getTypeName() );
try
{
dAdminMgr.delete( ou );
}
catch ( SecurityException se )
{
- LOG.warn( "deleteOrgunits name [" + ou.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "deleteOrgunits name [{}] caught SecurityException={}", ou.getName(), se );
}
}
}
@@ -2007,8 +2007,8 @@ public class FortressAntTask extends Task implements InputHandler
List<Relationship> orgs = adduserorgunitinheritance.getRelationships();
for ( Relationship relationship : orgs )
{
- LOG.info( "addUserOrgunitInheritances parent=" + relationship.getParent() + " child=" + relationship
- .getChild() );
+ LOG.info( "addUserOrgunitInheritances parent={} child={}",
+ relationship.getParent(), relationship.getChild() );
try
{
dAdminMgr.addInheritance( new OrgUnit( relationship.getParent(), OrgUnit.Type.USER ),
@@ -2016,8 +2016,8 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "addUserOrgunitInheritances parent [" + relationship.getParent() + "] child [" +
- relationship.getChild() + "] caught SecurityException=" + se );
+ LOG.warn( "addUserOrgunitInheritances parent [{}] child [{}] caught SecurityException={}",
+ relationship.getParent(), relationship.getChild(), se );
}
}
}
@@ -2035,8 +2035,8 @@ public class FortressAntTask extends Task implements InputHandler
List<Relationship> orgs = deluserorgunitinheritance.getRelationships();
for ( Relationship relationship : orgs )
{
- LOG.info( "deleteUserOrgunitInheritances parent=" + relationship.getParent() + " child=" +
- relationship.getChild() );
+ LOG.info( "deleteUserOrgunitInheritances parent={} child={}" +
+ relationship.getParent(), relationship.getChild() );
try
{
dAdminMgr.deleteInheritance( new OrgUnit( relationship.getParent(), OrgUnit.Type.USER ),
@@ -2044,8 +2044,8 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "deleteUserOrgunitInheritances parent [" + relationship.getParent() + "] child [" +
- relationship.getChild() + "] caught SecurityException=" + se );
+ LOG.warn( "deleteUserOrgunitInheritances parent [{}] child [{}] caught SecurityException={}",
+ relationship.getParent(), relationship.getChild(), se );
}
}
}
@@ -2063,8 +2063,8 @@ public class FortressAntTask extends Task implements InputHandler
List<Relationship> orgs = addpermorgunitinheritance.getRelationships();
for ( Relationship relationship : orgs )
{
- LOG.info( "addPermOrgunitInheritances parent=" + relationship.getParent() + " child=" + relationship
- .getChild() );
+ LOG.info( "addPermOrgunitInheritances parent={} child={}",
+ relationship.getParent(), relationship.getChild() );
try
{
dAdminMgr.addInheritance( new OrgUnit( relationship.getParent(), OrgUnit.Type.PERM ),
@@ -2072,8 +2072,8 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "addPermOrgunitInheritances parent [" + relationship.getParent() + "] child [" +
- relationship.getChild() + "] caught SecurityException=" + se );
+ LOG.warn( "addPermOrgunitInheritances parent [{}] child [{}] caught SecurityException={}",
+ relationship.getParent(), relationship.getChild(), se );
}
}
}
@@ -2091,8 +2091,8 @@ public class FortressAntTask extends Task implements InputHandler
List<Relationship> orgs = delpermorgunitinheritance.getRelationships();
for ( Relationship relationship : orgs )
{
- LOG.info( "deletePermOrgunitInheritances parent=" + relationship.getParent() + " child=" +
- relationship.getChild() );
+ LOG.info( "deletePermOrgunitInheritances parent={} child={}",
+ relationship.getParent(), relationship.getChild() );
try
{
dAdminMgr.deleteInheritance( new OrgUnit( relationship.getParent(), OrgUnit.Type.PERM ),
@@ -2100,8 +2100,8 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "deletePermOrgunitInheritances parent [" + relationship.getParent() + "] child [" +
- relationship.getChild() + "] caught SecurityException=" + se );
+ LOG.warn( "deletePermOrgunitInheritances parent [{}] child [{}] caught SecurityException={}",
+ relationship.getParent(), relationship.getChild(), se );
}
}
}
@@ -2119,14 +2119,14 @@ public class FortressAntTask extends Task implements InputHandler
List<AdminRoleAnt> roles = addrole.getRoles();
for ( AdminRoleAnt role : roles )
{
- LOG.info( "addAdminRoles name=" + role.getName() + " description=" + role.getDescription() );
+ LOG.info( "addAdminRoles name={} description={}", role.getName(), role.getDescription() );
try
{
dAdminMgr.addRole( role );
}
catch ( SecurityException se )
{
- LOG.warn( "addAdminRoles name [" + role.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "addAdminRoles name [{}] caught SecurityException={}", role.getName(), se );
}
}
}
@@ -2144,14 +2144,14 @@ public class FortressAntTask extends Task implements InputHandler
List<AdminRoleAnt> roles = delrole.getRoles();
for ( AdminRoleAnt role : roles )
{
- LOG.info( "deleteAdminRoles name=" + role.getName() );
+ LOG.info( "deleteAdminRoles name={}", role.getName() );
try
{
dAdminMgr.deleteRole( role );
}
catch ( SecurityException se )
{
- LOG.warn( "deleteAdminRoles name [" + role.getName() + "] caught SecurityException=" + se );
+ LOG.warn( "deleteAdminRoles name [{}] caught SecurityException={}", role.getName(), se );
}
}
}
@@ -2169,8 +2169,8 @@ public class FortressAntTask extends Task implements InputHandler
List<Relationship> roles = addadminroleinheritance.getRelationships();
for ( Relationship relationship : roles )
{
- LOG.info( "addAdminRoleInheritances parent=" + relationship.getParent() + " child=" + relationship
- .getChild() );
+ LOG.info( "addAdminRoleInheritances parent={} child={}",
+ relationship.getParent(), relationship.getChild() );
try
{
dAdminMgr.addInheritance( new AdminRole( relationship.getParent() ),
@@ -2178,8 +2178,8 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "addAdminRoleInheritances parent [" + relationship.getParent() + "] child [" +
- relationship.getChild() + "] caught SecurityException=" + se );
+ LOG.warn( "addAdminRoleInheritances parent [{}] child [{}] caught SecurityException={}",
+ relationship.getParent(), relationship.getChild(), se );
}
}
}
@@ -2197,8 +2197,8 @@ public class FortressAntTask extends Task implements InputHandler
List<Relationship> roles = deladminroleinheritance.getRelationships();
for ( Relationship relationship : roles )
{
- LOG.info( "deleteAdminRoleInheritances parent=" + relationship.getParent() + " child=" + relationship
- .getChild() );
+ LOG.info( "deleteAdminRoleInheritances parent={} child={}",
+ relationship.getParent(), relationship.getChild() );
try
{
dAdminMgr.deleteInheritance( new AdminRole( relationship.getParent() ),
@@ -2206,8 +2206,8 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- LOG.warn( "deleteAdminRoleInheritances parent [" + relationship.getParent() + "] child [" +
- relationship.getChild() + "] caught SecurityException=" + se );
+ LOG.warn( "deleteAdminRoleInheritances parent [{}] child [{}] caught SecurityException={}",
+ relationship.getParent(), relationship.getChild(), se );
}
}
}
@@ -2225,7 +2225,7 @@ public class FortressAntTask extends Task implements InputHandler
List<UserAdminRole> userroles = adduserrole.getUserRoles();
for ( UserAdminRole userRole : userroles )
{
- LOG.info( "addUserAdminRoles userid=" + userRole.getUserId() + " role name=" + userRole.getName() );
+ LOG.info( "addUserAdminRoles userid={} role name={}", userRole.getUserId(), userRole.getName() );
try
{
//AdminRole role = new AdminRole(userRole);
@@ -2233,9 +2233,8 @@ public class FortressAntTask extends Task implements InputHandler
}
catch ( SecurityException se )
{
- String warning = "addUserAdminRoles userId [" + userRole.getUserId() + "] role name [" + userRole
- .getName() + "] caught SecurityException=" + se;
- LOG.warn( warning );
+ LOG.warn( "addUserAdminRoles userId [{}] role name [{}] caught SecurityException={}",
+ userRole.getUserId(), userRole.getName(), se );
}
}
}
@@ -2253,16 +2252,15 @@ public class FortressAntTask extends Task implements InputHandler
List<UserAdminRole> userroles = deluserrole.getUserRoles();
for ( UserAdminRole userRole : userroles )
{
- LOG.info( "delUserAdminRoles userid=" + userRole.getUserId() + " role name=" + userRole.getName() );
+ LOG.info( "delUserAdminRoles userid={} role name={}", userRole.getUserId(), userRole.getName() );
try
{
dAdminMgr.deassignUser( userRole );
}
catch ( SecurityException se )
{
- String warning = "delUserAdminRoles userId [" + userRole.getUserId() + "] role name [" + userRole
- .getName() + "] caught SecurityException=" + se;
- LOG.warn( warning );
+ LOG.warn( "delUserAdminRoles userId [{}] role name [{}] caught SecurityException={}",
+ userRole.getUserId(), userRole.getName(), se );
}
}
}
@@ -2295,31 +2293,27 @@ public class FortressAntTask extends Task implements InputHandler
}
}
configNodeName = props.getProperty( GlobalIds.CONFIG_REALM );
- LOG.info( "addConfig realm name [" + configNodeName + "]" );
+ LOG.info( "addConfig realm name [{}]", configNodeName );
cfgMgr.add( configNodeName, props );
}
catch ( SecurityException se )
{
- String msgHdr = "addConfig realm name [" + configNodeName + "]";
if ( se.getErrorId() == GlobalErrIds.FT_CONFIG_ALREADY_EXISTS )
{
try
{
- String warning = msgHdr + " entry already exists, attempt to update";
- LOG.info( warning );
+ LOG.info( "addConfig realm name [{}] entry already exists, attempt to update", configNodeName );
cfgMgr.update( configNodeName, props );
- LOG.info( msgHdr + " update [" + configNodeName + "] successful" );
+ LOG.info( "addConfig realm name [{}] update [{}] successful", configNodeName, configNodeName );
}
catch ( SecurityException se2 )
{
- String warning = msgHdr + " update failed SecurityException=" + se2;
- LOG.warn( warning );
+ LOG.warn( "addConfig realm name [{}] update failed SecurityException={}", configNodeName, se2 );
}
}
else
{
- String warning = msgHdr + " failed SecurityException=" + se;
- LOG.warn( warning );
+ LOG.warn( "addConfig realm name [{}] failed SecurityException={}", configNodeName, se );
}
}
}
@@ -2351,7 +2345,7 @@ public class FortressAntTask extends Task implements InputHandler
}
}
configNodeName = props.getProperty( GlobalIds.CONFIG_REALM );
- LOG.info( "delConfig realm name [" + configNodeName + "]" );
+ LOG.info( "delConfig realm name [{}]", configNodeName );
props.remove( GlobalIds.CONFIG_REALM );
cfgMgr.delete( configNodeName, props );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/31e64423/src/main/java/org/apache/directory/fortress/core/cfg/Config.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cfg/Config.java b/src/main/java/org/apache/directory/fortress/core/cfg/Config.java
index 782c28e..7b98223 100755
--- a/src/main/java/org/apache/directory/fortress/core/cfg/Config.java
+++ b/src/main/java/org/apache/directory/fortress/core/cfg/Config.java
@@ -166,13 +166,11 @@ public class Config
if ( config != null )
{
value = ( String ) config.getProperty( name );
- if ( LOG.isDebugEnabled() )
- LOG.debug( "getProperty name [{}] value [{}]", name, value );
+ LOG.debug( "getProperty name [{}] value [{}]", name, value );
}
else
{
- String error = "getProperty invalid config, can't read prop [" + name + "]";
- LOG.error( error );
+ LOG.error( "getProperty invalid config, can't read prop [{}]", name );
}
return value;
}
@@ -217,13 +215,11 @@ public class Config
if ( config != null )
{
value = ( char ) config.getProperty( name );
- if ( LOG.isDebugEnabled() )
- LOG.debug( "getChar name [{}] value [{}]", name, value );
+ LOG.debug( "getChar name [{}] value [{}]", name, value );
}
else
{
- String error = "getChar invalid config, can't read prop [" + name + "]";
- LOG.error( error );
+ LOG.error( "getChar invalid config, can't read prop [{}]", name );
}
return value;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/31e64423/src/main/java/org/apache/directory/fortress/core/cfg/ConfigDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigDAO.java b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigDAO.java
index da48bdd..3d6eca8 100755
--- a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigDAO.java
@@ -115,7 +115,7 @@ final class ConfigDAO extends ApacheDsDataProvider
{
LdapConnection ld = null;
String dn = getDn( name );
- LOG.info( "create dn [" + dn + "]" );
+ LOG.info( "create dn [{}]", dn );
try
{
Entry myEntry = new DefaultEntry( dn );
@@ -157,7 +157,7 @@ final class ConfigDAO extends ApacheDsDataProvider
{
LdapConnection ld = null;
String dn = getDn( name );
- LOG.info( "update dn [" + dn + "]" );
+ LOG.info( "update dn [{}]", dn );
try
{
List<Modification> mods = new ArrayList<Modification>();
@@ -194,7 +194,7 @@ final class ConfigDAO extends ApacheDsDataProvider
{
LdapConnection ld = null;
String dn = getDn( name );
- LOG.info( "remove dn [" + dn + "]" );
+ LOG.info( "remove dn [{}]", dn );
try
{
ld = getAdminConnection();
@@ -223,7 +223,7 @@ final class ConfigDAO extends ApacheDsDataProvider
{
LdapConnection ld = null;
String dn = getDn( name );
- LOG.info( "remove props dn [" + dn + "]" );
+ LOG.info( "remove props dn [{}]", dn );
try
{
List<Modification> mods = new ArrayList<Modification>();
@@ -261,7 +261,7 @@ final class ConfigDAO extends ApacheDsDataProvider
Properties props = null;
LdapConnection ld = null;
String dn = getDn( name );
- LOG.info( "getConfig dn [" + dn + "]" );
+ LOG.info( "getConfig dn [{}]", dn );
try
{
ld = getAdminConnection();
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/31e64423/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java b/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
index 9870eae..c19c009 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
+++ b/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
@@ -442,7 +442,7 @@ public class CommandLineInterpreter
LOG.warn("unknown delegated admin operation detected");
return;
}
- LOG.info("command:" + command + " was successful");
+ LOG.info("command:{} was successful", command);
}
catch ( org.apache.directory.fortress.core.SecurityException se)
{
@@ -659,7 +659,7 @@ public class CommandLineInterpreter
LOG.warn("unknown admin operation detected");
return;
}
- LOG.info("command:" + command + " was successful");
+ LOG.info("command:{} was successful", command);
}
catch ( SecurityException se)
{
@@ -810,7 +810,7 @@ public class CommandLineInterpreter
LOG.warn("unknown review operation detected");
return;
}
- LOG.info("command:" + command + " was successful");
+ LOG.info("command:{} was successful", command);
}
catch ( SecurityException se)
{
@@ -875,7 +875,7 @@ public class CommandLineInterpreter
LOG.warn("unknown system operation detected");
return;
}
- LOG.info("command:" + command + " was successful");
+ LOG.info("command:{} was successful", command);
}
catch ( SecurityException se)
{
@@ -997,7 +997,7 @@ public class CommandLineInterpreter
LOG.warn("unknown group operation detected");
return;
}
- LOG.info("command:" + command + " was successful");
+ LOG.info( "command:{} was successful", command );
}
catch ( SecurityException se)
{
@@ -1049,7 +1049,7 @@ public class CommandLineInterpreter
options.add(arg);
if (!isPassword)
{
- LOG.info("arg:" + arg);
+ LOG.info("arg:{}", arg);
}
else
{
@@ -1163,8 +1163,9 @@ public class CommandLineInterpreter
{
String key = (String) e.nextElement();
String val = perm.getProperty(key);
- LOG.info(type + " KEY" + ++ctr + " [" + key + "]");
- LOG.info(type + " VAL" + ctr + " [" + val + "]");
+ ++ctr;
+ LOG.info( "{} KEY{} [{}]", type, ctr, key );
+ LOG.info( "{} VAL{} [{}]", type, ctr, val );
}
}
}
@@ -1187,8 +1188,9 @@ public class CommandLineInterpreter
{
String key = (String) e.nextElement();
String val = permObj.getProperty(key);
- LOG.info(type + " KEY" + ++ctr + " [" + key + "]");
- LOG.info(type + " VAL" + ctr + " [" + val + "]");
+ ++ctr;
+ LOG.info( "{} KEY{} [{}]", type, ctr, key );
+ LOG.info( "{} VAL{} [{}]", type, ctr, val );
}
}
}
@@ -1272,8 +1274,9 @@ public class CommandLineInterpreter
{
String key = (String) e.nextElement();
String val = user.getProperty(key);
- LOG.info(type + " KEY" + ++ctr + " [" + key + "]");
- LOG.info(type + " VAL" + ctr + " [" + val + "]");
+ ++ctr;
+ LOG.info( "{} KEY{} [{}]", type, ctr, key );
+ LOG.info( "{} VAL{} [{}]", type, ctr, val );
}
}
}
@@ -1390,7 +1393,7 @@ public class CommandLineInterpreter
*/
private void printRow(String type, String name, String value)
{
- LOG.info(type + " " + name + " [" + value + "]");
+ LOG.info( "{} {} [{}]", type, name, value);
}
/**
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/31e64423/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 0a542a0..34f23ad 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
@@ -29,6 +29,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
+import org.apache.commons.pool.PoolableObjectFactory;
import org.apache.commons.pool.impl.GenericObjectPool;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
@@ -56,10 +57,10 @@ import org.apache.directory.api.ldap.model.message.SearchRequest;
import org.apache.directory.api.ldap.model.message.SearchRequestImpl;
import org.apache.directory.api.ldap.model.message.SearchScope;
import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.ldap.client.api.DefaultPoolableLdapConnectionFactory;
import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.ldap.client.api.LdapConnectionConfig;
import org.apache.directory.ldap.client.api.LdapConnectionPool;
-import org.apache.directory.ldap.client.api.PoolableLdapConnectionFactory;
import org.apache.directory.fortress.core.CfgRuntimeException;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
@@ -154,8 +155,8 @@ public abstract class ApacheDsDataProvider
if(IS_SET_TRUST_STORE_PROP)
{
LOG.info( "Set JSSE truststore properties in Apache LDAP client:");
- LOG.info( "javax.net.ssl.trustStore: " + TRUST_STORE );
- LOG.info( "javax.net.debug: " + new Boolean( IS_SSL_DEBUG ).toString());
+ LOG.info( "javax.net.ssl.trustStore: {}", TRUST_STORE );
+ LOG.info( "javax.net.debug: {}" + IS_SSL_DEBUG );
System.setProperty( "javax.net.ssl.trustStore", TRUST_STORE );
System.setProperty( "javax.net.ssl.trustStorePassword", TRUST_STORE_PW );
System.setProperty( "javax.net.debug", new Boolean( IS_SSL_DEBUG ).toString() );
@@ -210,17 +211,17 @@ public abstract class ApacheDsDataProvider
throw new CfgRuntimeException( GlobalErrIds.FT_APACHE_LDAP_POOL_INIT_FAILED, error, ex );
}
- PoolableLdapConnectionFactory factory = new PoolableLdapConnectionFactory( config );
+ PoolableObjectFactory<LdapConnection> poolFactory = new DefaultPoolableLdapConnectionFactory( config );
// Create the Admin pool
- adminPool = new LdapConnectionPool( factory );
+ adminPool = new LdapConnectionPool( poolFactory );
adminPool.setTestOnBorrow( true );
adminPool.setWhenExhaustedAction( GenericObjectPool.WHEN_EXHAUSTED_GROW );
adminPool.setMaxActive( max );
adminPool.setMinIdle( min );
// Create the User pool
- userPool = new LdapConnectionPool( factory );
+ userPool = new LdapConnectionPool( poolFactory );
userPool.setTestOnBorrow( true );
userPool.setWhenExhaustedAction( GenericObjectPool.WHEN_EXHAUSTED_GROW );
userPool.setMaxActive( max );
@@ -256,8 +257,8 @@ public abstract class ApacheDsDataProvider
logPw = Config.getProperty( LDAP_LOG_POOL_PW );
}
logConfig.setCredentials( logPw );
- factory = new PoolableLdapConnectionFactory( logConfig );
- logPool = new LdapConnectionPool( factory );
+ poolFactory = new DefaultPoolableLdapConnectionFactory( logConfig );
+ logPool = new LdapConnectionPool( poolFactory );
logPool.setTestOnBorrow( true );
logPool.setWhenExhaustedAction( GenericObjectPool.WHEN_EXHAUSTED_GROW );
logPool.setMaxActive( logmax );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/31e64423/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
index 6819150..3576d22 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
@@ -242,7 +242,7 @@ public final class LdapClientTrustStoreManager implements X509TrustManager, Seri
{
// Eat this ioexception because it shouldn't be a problem, but log just in case:
LOG.warn( "FortressTrustStoreManager.getTrustManagers finally block on input stream close " +
- "operation caught IOException=" + e.getMessage() );
+ "operation caught IOException={}", e.getMessage() );
}
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/31e64423/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java b/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
index 81c365b..0ee8b76 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
@@ -94,7 +94,7 @@ final class SuffixDAO extends ApacheDsDataProvider
String nodeDn = getDn( se );
try
{
- LOG.info( "create suffix dn [" + nodeDn + "]" );
+ LOG.info( "create suffix dn [{}]", nodeDn );
Entry myEntry = new DefaultEntry( nodeDn );
myEntry.add( SchemaConstants.OBJECT_CLASS_AT, SUFFIX_OBJ_CLASS );
myEntry.add( SchemaConstants.DC_AT, se.getName() );
@@ -132,7 +132,7 @@ final class SuffixDAO extends ApacheDsDataProvider
{
LdapConnection ld = null;
String nodeDn = getDn( se );
- LOG.info( "remove suffix dn [" + nodeDn + "]" );
+ LOG.info( "remove suffix dn [{}]", nodeDn );
try
{
ld = getAdminConnection();
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/31e64423/src/main/java/org/apache/directory/fortress/core/rbac/AcceleratorDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AcceleratorDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/AcceleratorDAO.java
index 7e71ac7..6e53073 100644
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AcceleratorDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AcceleratorDAO.java
@@ -108,7 +108,9 @@ final class AcceleratorDAO extends ApacheDsDataProvider
// Send the request
RbacCreateSessionResponse rbacCreateSessionResponse = ( RbacCreateSessionResponse ) ld.extended(
rbacCreateSessionRequest );
- LOG.debug( "createSession userId: {}, sessionId: {}",user.getUserId(), rbacCreateSessionResponse.getSessionId() + ", resultCode: " + rbacCreateSessionResponse.getLdapResult().getResultCode());
+ LOG.debug( "createSession userId: {}, sessionId: {}, resultCode: {}",
+ user.getUserId(), rbacCreateSessionResponse.getSessionId(),
+ rbacCreateSessionResponse.getLdapResult().getResultCode());
session = new Session( user, rbacCreateSessionResponse.getSessionId() );
if ( rbacCreateSessionResponse.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/31e64423/src/main/java/org/apache/directory/fortress/core/rbac/HierUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/HierUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/HierUtil.java
index d9ab2ad..04c1437 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/HierUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/HierUtil.java
@@ -252,8 +252,8 @@ final class HierUtil
String error = "toGraph child: " + child + " parent: " + parent + " caught IllegalArgumentException=" + e;
LOG.error( error );
}
- if ( LOG.isDebugEnabled() )
- LOG.debug( "toGraph child={}, parent={}", child, parent );
+
+ LOG.debug( "toGraph child={}, parent={}", child, parent );
}
}
return graph;
@@ -533,8 +533,8 @@ final class HierUtil
//log.debug("getChildren graph is null");
return null;
}
- if ( LOG.isDebugEnabled() )
- LOG.debug( "getChildren [" + vertex + "]" );
+
+ LOG.debug( "getChildren [{}]", vertex );
Set<Relationship> edges;
try
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/31e64423/src/main/java/org/apache/directory/fortress/core/rbac/PsoUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PsoUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/PsoUtil.java
index 1dbb6e4..6a230b1 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PsoUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PsoUtil.java
@@ -220,7 +220,7 @@ public final class PsoUtil
{
Hier inHier = new Hier( Hier.Type.ROLE );
inHier.setContextId( contextId );
- LOG.info( "loadGraph initializing PSO context [" + inHier.getContextId() + "]" );
+ LOG.info( "loadGraph initializing PSO context [{}]", inHier.getContextId() );
List<Graphable> descendants = null;
try
@@ -232,7 +232,7 @@ public final class PsoUtil
}
catch ( SecurityException se )
{
- LOG.info( "loadGraph caught SecurityException=" + se );
+ LOG.info( "loadGraph caught SecurityException={}", se );
}
Hier hier = HierUtil.loadHier( contextId, descendants );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/31e64423/src/main/java/org/apache/directory/fortress/core/rbac/RoleUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/RoleUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/RoleUtil.java
index 9cd26ec..96b44da 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/RoleUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/RoleUtil.java
@@ -303,7 +303,7 @@ public final class RoleUtil
{
Hier inHier = new Hier( Hier.Type.ROLE );
inHier.setContextId( contextId );
- LOG.info( "loadGraph initializing ROLE context [" + inHier.getContextId() + "]" );
+ LOG.info( "loadGraph initializing ROLE context [{}]", inHier.getContextId() );
List<Graphable> descendants = null;
try
@@ -312,7 +312,7 @@ public final class RoleUtil
}
catch ( SecurityException se )
{
- LOG.info( "loadGraph caught SecurityException=" + se );
+ LOG.info( "loadGraph caught SecurityException={}", se );
}
Hier hier = HierUtil.loadHier( contextId, descendants );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/31e64423/src/main/java/org/apache/directory/fortress/core/rbac/UserP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/UserP.java b/src/main/java/org/apache/directory/fortress/core/rbac/UserP.java
index 972a618..01e2b36 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/UserP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/UserP.java
@@ -571,7 +571,7 @@ public final class UserP
boolean result = uDao.changePassword( entity, newPassword );
if ( !result )
{
- LOG.warn( "changePassword failed for user [" + userId + "]" );
+ LOG.warn( "changePassword failed for user [{}]", userId );
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/31e64423/src/main/java/org/apache/directory/fortress/core/rbac/UsoUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/UsoUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/UsoUtil.java
index d151039..d2e296f 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/UsoUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/UsoUtil.java
@@ -215,7 +215,7 @@ public final class UsoUtil
{
Hier inHier = new Hier( Hier.Type.ROLE );
inHier.setContextId( contextId );
- LOG.info( "loadGraph initializing USO context [" + inHier.getContextId() + "]" );
+ LOG.info( "loadGraph initializing USO context [{}]", inHier.getContextId() );
List<Graphable> descendants = null;
try
@@ -227,7 +227,7 @@ public final class UsoUtil
}
catch ( SecurityException se )
{
- LOG.info( "loadGraph caught SecurityException=" + se );
+ LOG.info( "loadGraph caught SecurityException={}", se );
}
Hier hier = HierUtil.loadHier( contextId, descendants );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/31e64423/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java b/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
index 3797bd1..cf6387f 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
@@ -96,7 +96,7 @@ public class RestUtils
if(IS_SET_TRUST_STORE_PROP)
{
LOG.info( "Set JSSE truststore properties:");
- LOG.info( "javax.net.ssl.trustStore: " + TRUST_STORE );
+ LOG.info( "javax.net.ssl.trustStore: {}", TRUST_STORE );
System.setProperty( "javax.net.ssl.trustStore", TRUST_STORE );
System.setProperty( "javax.net.ssl.trustStorePassword", TRUST_STORE_PW );
}
@@ -238,7 +238,7 @@ public class RestUtils
*/
public static String post( String userId, String password, String szInput, String function ) throws RestException
{
- LOG.debug( "post URI=[" + URI + "], function=[" + function + "], request=" + szInput );
+ LOG.debug( "post URI=[{}], function=[{}], request={}", URI, function, szInput );
String szResponse = null;
PostMethod post = new PostMethod( URI + function );
post.addRequestHeader( "Accept", "text/xml" );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/31e64423/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java b/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
index 1c3c81d..b22bbeb 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
@@ -390,7 +390,7 @@ public class CUtil
{
if(LOG.isDebugEnabled())
{
- LOG.debug(location + " userId [" + session.getUserId() + "] no constraints enabled");
+ LOG.debug( "{} userId [{}] no constraints enabled", location, session.getUserId() );
}
return;
}
@@ -399,7 +399,7 @@ public class CUtil
{
if(LOG.isDebugEnabled())
{
- LOG.debug(location + " userId [" + session.getUserId() + "] has no roles assigned");
+ LOG.debug( "{} userId [{}] has no roles assigned", location, session.getUserId() );
}
return;
}
[5/5] directory-fortress-core git commit: merged with Shawn's changes
Posted by el...@apache.org.
merged with Shawn's changes
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/50c0cc00
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/50c0cc00
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/50c0cc00
Branch: refs/heads/master
Commit: 50c0cc0058d0be04290cdb7892ab49104849d591
Parents: 0913c70 55358f9
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Mon Nov 10 16:01:24 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Mon Nov 10 16:01:24 2014 +0100
----------------------------------------------------------------------
ldap/setup/CommanderDemoUsers.xml | 80 ----
ldap/setup/DelegatedAdminManagerLoad.xml | 224 +++++-----
ldap/setup/FortressDemoUsers.xml | 7 +-
ldap/setup/refreshLDAPData-src.xml | 7 +-
.../ldap/container/OrganizationalUnitDAO.java | 7 +
.../fortress/core/ldap/suffix/SuffixDAO.java | 6 +
.../directory/fortress/core/overview.html | 28 +-
.../fortress/core/rbac/DelAccessMgrImpl.java | 2 +-
.../fortress/core/rbac/DelAdminMgrImpl.java | 12 +-
.../directory/fortress/core/rest/RestUtils.java | 2 +-
.../fortress/core/rbac/AdminRoleTestData.java | 4 +-
.../fortress/core/rbac/UserTestData.java | 442 +++++++++----------
12 files changed, 377 insertions(+), 444 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/50c0cc00/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
----------------------------------------------------------------------
diff --cc src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
index 33d7387,5d03437..4d0c012
--- a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
@@@ -109,10 -108,12 +109,17 @@@ final class OrganizationalUnitDAO exten
try
{
LOG.info( "create container dn [{}]", nodeDn );
+
Entry myEntry = new DefaultEntry( nodeDn,
++<<<<<<< HEAD
+ SchemaConstants.OBJECT_CLASS_AT, ORGUNIT_OBJ_CLASS,
+ SchemaConstants.OU_AT, oe.getName(),
++=======
+ GlobalIds.OBJECT_CLASS, ORGUNIT_CLASS,
+ GlobalIds.OU, oe.getName(),
++>>>>>>> 55358f9c9d15e549e0121cc1b3cddd4a06d1f4ae
GlobalIds.DESC, oe.getDescription() );
+
ld = getAdminConnection();
add( ld, myEntry );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/50c0cc00/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
----------------------------------------------------------------------
diff --cc src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
index 0ee8b76,ead33dc..a269b91
--- a/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixDAO.java
@@@ -94,11 -94,13 +94,17 @@@ final class SuffixDAO extends ApacheDsD
String nodeDn = getDn( se );
try
{
- LOG.info( "create suffix dn [" + nodeDn + "]" );
+ LOG.info( "create suffix dn [{}]", nodeDn );
Entry myEntry = new DefaultEntry( nodeDn );
++<<<<<<< HEAD
+ myEntry.add( SchemaConstants.OBJECT_CLASS_AT, SUFFIX_OBJ_CLASS );
++=======
+ myEntry.add( GlobalIds.OBJECT_CLASS, SUFFIX_OBJ_CLASS );
+ myEntry.add( GlobalIds.OBJECT_CLASS, SUFFIX_OBJ_CLASS );
++>>>>>>> 55358f9c9d15e549e0121cc1b3cddd4a06d1f4ae
myEntry.add( SchemaConstants.DC_AT, se.getName() );
myEntry.add( SchemaConstants.O_AT, se.getDescription() );
+
ld = getAdminConnection();
add( ld, myEntry );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/50c0cc00/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
----------------------------------------------------------------------