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:38 UTC
[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
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 + "]");