You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/05/20 09:35:41 UTC
[1/5] directory-fortress-core git commit: o Fixed many Sonar warnings
o Renamed the Organizat*ii*onalUnitDAO class
Repository: directory-fortress-core
Updated Branches:
refs/heads/master d48b33c5b -> 195bcc1ee
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 cb7b4fa..dac9d39 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
@@ -81,13 +81,13 @@ public final class UserP
* @return List of type User containing fully populated matching User entities. If no records found this will be empty.
* @throws SecurityException in the event of DAO search error.
*/
- final List<User> search( User user ) throws SecurityException
+ List<User> search( User user ) throws SecurityException
{
return uDao.findUsers( user );
}
- final List<User> search( OrgUnit ou, boolean limitSize ) throws SecurityException
+ List<User> search( OrgUnit ou, boolean limitSize ) throws SecurityException
{
return uDao.findUsers( ou, limitSize );
}
@@ -102,7 +102,7 @@ public final class UserP
* @return List of type String containing userId of all matching User entities. If no records found this will be empty.
* @throws SecurityException in the event of DAO search error.
*/
- final List<String> search( User user, int limit ) throws SecurityException
+ List<String> search( User user, int limit ) throws SecurityException
{
return uDao.findUsers( user, limit );
}
@@ -115,7 +115,7 @@ public final class UserP
* @return List of type User containing fully populated matching User entities. If no records found this will be empty.
* @throws SecurityException in the event of DAO search error.
*/
- final List<User> getAuthorizedUsers( Role role ) throws SecurityException
+ List<User> getAuthorizedUsers( Role role ) throws SecurityException
{
return uDao.getAuthorizedUsers( role );
}
@@ -129,7 +129,7 @@ public final class UserP
* @return Set of type String containing the userId's for matching User entities. If no records found this will be empty.
* @throws SecurityException in the event of DAO search error.
*/
- final Set<String> getAssignedUsers( Set<String> roles, String contextId ) throws SecurityException
+ Set<String> getAssignedUsers( Set<String> roles, String contextId ) throws SecurityException
{
return uDao.getAssignedUsers( roles, contextId );
}
@@ -145,7 +145,7 @@ public final class UserP
* @return list of type String of userIds. If no records found this will be empty.
* @throws SecurityException in the event of DAO search error.
*/
- final List<String> getAuthorizedUsers( Role role, int limit ) throws SecurityException
+ List<String> getAuthorizedUsers( Role role, int limit ) throws SecurityException
{
return uDao.getAuthorizedUsers( role, limit );
}
@@ -159,7 +159,7 @@ public final class UserP
* @return List of fully populated User entities matching target search. If no records found this will be empty.
* @throws SecurityException in the event of DAO search error.
*/
- final List<User> getAssignedUsers( Role role ) throws SecurityException
+ List<User> getAssignedUsers( Role role ) throws SecurityException
{
return uDao.getAssignedUsers( role );
}
@@ -173,7 +173,7 @@ public final class UserP
* @return List of fully populated User entities matching target search. If no records found this will be empty.
* @throws SecurityException in the event of DAO search error.
*/
- final List<User> getAssignedUsers( AdminRole role ) throws SecurityException
+ List<User> getAssignedUsers( AdminRole role ) throws SecurityException
{
return uDao.getAssignedUsers( role );
}
@@ -186,7 +186,7 @@ public final class UserP
* @return List of type String containing RBAC role names. If no records found this will be empty.
* @throws SecurityException in the event of DAO search error.
*/
- final List<String> getAssignedRoles( User user ) throws SecurityException
+ List<String> getAssignedRoles( User user ) throws SecurityException
{
return uDao.getRoles( user );
}
@@ -201,7 +201,7 @@ public final class UserP
* @return User entity containing all attributes associated with User in directory.
* @throws SecurityException in the event of User not found or DAO search error.
*/
- final User read( User user, boolean isRoles ) throws SecurityException
+ User read( User user, boolean isRoles ) throws SecurityException
{
return uDao.getUser( user, isRoles );
}
@@ -216,7 +216,7 @@ public final class UserP
* @return User entity copy of input + additional attributes (internalId) that were added by op.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final User add( User entity ) throws SecurityException
+ User add( User entity ) throws SecurityException
{
return add( entity, true );
}
@@ -232,7 +232,7 @@ public final class UserP
* @return User entity copy of input + additional attributes (internalId)
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final User add( User entity, boolean validate ) throws SecurityException
+ User add( User entity, boolean validate ) throws SecurityException
{
if ( validate )
{
@@ -257,7 +257,7 @@ public final class UserP
* @return User entity copy of input
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final User update( User entity ) throws SecurityException
+ User update( User entity ) throws SecurityException
{
return update( entity, true );
}
@@ -287,7 +287,7 @@ public final class UserP
* @return User entity copy of input
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final User update( User entity, boolean validate ) throws SecurityException
+ User update( User entity, boolean validate ) throws SecurityException
{
if ( validate )
{
@@ -307,7 +307,7 @@ public final class UserP
* @return String contains user DN
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final String softDelete( User user ) throws SecurityException
+ String softDelete( User user ) throws SecurityException
{
// Ensure this user isn't listed in Fortress config as a system user that can't be removed via API.
// Is there a match between this userId and a Fortress system user?
@@ -332,7 +332,7 @@ public final class UserP
* @return String contains user DN
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final String delete( User user ) throws SecurityException
+ String delete( User user ) throws SecurityException
{
// Ensure this user isn't listed in Fortress config as a system user that can't be removed via API.
// Is there a match between this userId and a Fortress system user?
@@ -354,7 +354,7 @@ public final class UserP
* @param user contains the userId for target user.
* @throws SecurityException in the event of DAO error.
*/
- final void deletePwPolicy( User user ) throws SecurityException
+ void deletePwPolicy( User user ) throws SecurityException
{
uDao.deletePwPolicy( user );
}
@@ -368,7 +368,7 @@ public final class UserP
* @return Session object will be returned if authentication successful. This will not contain user's roles.
* @throws SecurityException in the event of data validation failure, security policy violation or DAO error.
*/
- final Session authenticate( User user ) throws SecurityException
+ Session authenticate( User user ) throws SecurityException
{
Session session;
session = uDao.checkPassword( user );
@@ -435,7 +435,7 @@ public final class UserP
* @return Session object will contain authentication result code, RBAC and Admin role activations, OpenLDAP pw policy output and more.
* @throws SecurityException in the event of data validation failure, security policy violation or DAO error.
*/
- final Session createSession( User user, boolean trusted ) throws SecurityException
+ Session createSession( User user, boolean trusted ) throws SecurityException
{
Session session;
if ( trusted )
@@ -535,7 +535,7 @@ public final class UserP
* @param user Contains userId that represents rDn of node in ldap directory.
* @throws SecurityException in the event of DAO error.
*/
- final void lock( User user ) throws SecurityException
+ void lock( User user ) throws SecurityException
{
uDao.lock( user );
}
@@ -547,7 +547,7 @@ public final class UserP
* @param user Contains userId that represents rDn of node in ldap directory.
* @throws SecurityException in the event of DAO error.
*/
- final void unlock( User user ) throws SecurityException
+ void unlock( User user ) throws SecurityException
{
uDao.unlock( user );
}
@@ -560,7 +560,7 @@ public final class UserP
* @param newPassword contains the new password which must pass the password policy constraints.
* @throws SecurityException in the event of data validation failure, password policy violation or DAO error.
*/
- final void changePassword( User entity, char[] newPassword ) throws SecurityException
+ void changePassword( User entity, char[] newPassword ) throws SecurityException
{
String userId = entity.getUserId();
boolean result = uDao.changePassword( entity, newPassword );
@@ -578,7 +578,7 @@ public final class UserP
* @param user contains the userId and the new password.
* @throws SecurityException in the event of DAO error.
*/
- final void resetPassword( User user ) throws SecurityException
+ void resetPassword( User user ) throws SecurityException
{
uDao.resetUserPassword( user );
}
@@ -618,7 +618,7 @@ public final class UserP
* @return String containing the user's DN. This value is used to update the "roleOccupant" attribute on associated role entity.
* @throws SecurityException in the event data error in user or role objects or system error.
*/
- final String assign( UserRole uRole ) throws SecurityException
+ String assign( UserRole uRole ) throws SecurityException
{
validate( uRole );
// "assign" custom Fortress role data, i.e. temporal constraints, onto the user node:
@@ -640,7 +640,7 @@ public final class UserP
* @return String containing the user's DN. This value is used to remove the "roleOccupant" attribute on associated RBAC Role entity.
* @throws SecurityException - in the event data error in user or role objects or system error.
*/
- final String deassign( UserRole uRole ) throws SecurityException
+ String deassign( UserRole uRole ) throws SecurityException
{
validate( uRole );
// "deassign" custom Fortress role data from the user's node:
@@ -672,7 +672,7 @@ public final class UserP
* @return String containing the user's DN. This value is used to update the "roleOccupant" attribute on associated Admin Role entity.
* @throws SecurityException in the event data error in user or role objects or system error.
*/
- final String assign( UserAdminRole uRole ) throws SecurityException
+ String assign( UserAdminRole uRole ) throws SecurityException
{
validate( uRole );
// Assign custom Fortress role data, i.e. temporal constraints, onto the user node:
@@ -692,7 +692,7 @@ public final class UserP
* @return String containing the user's DN. This value is used to remove the "roleOccupant" attribute on associated Admin Role entity.
* @throws SecurityException - in the event data error in user or role objects or system error.
*/
- final String deassign( UserAdminRole uRole ) throws SecurityException
+ String deassign( UserAdminRole uRole ) throws SecurityException
{
validate( uRole );
// Deassign custom Fortress role data from the user's node:
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 d671b7b..3728bf1 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
@@ -63,13 +63,13 @@ public class RestUtils
{
private static final String CLS_NM = RestUtils.class.getName();
private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
- private final static String HTTP_UID = Config.getProperty( "http.user" );
- private final static String HTTP_PW_PARAM = "http.pw";
- private final static String HTTP_PW = ( ( EncryptUtil.isEnabled() ) ? EncryptUtil.decrypt( Config
+ private static final String HTTP_UID = Config.getProperty( "http.user" );
+ private static final String HTTP_PW_PARAM = "http.pw";
+ private static final String HTTP_PW = ( ( EncryptUtil.isEnabled() ) ? EncryptUtil.decrypt( Config
.getProperty( HTTP_PW_PARAM ) ) : Config.getProperty( HTTP_PW_PARAM ) );
- private final static String HTTP_HOST = Config.getProperty( "http.host" );
- private final static String HTTP_PORT = Config.getProperty( "http.port" );
- private final static String HTTP_PROTOCOL = Config.getProperty( "http.protocol", "http" );
+ private static final String HTTP_HOST = Config.getProperty( "http.host" );
+ private static final String HTTP_PORT = Config.getProperty( "http.port" );
+ private static final String HTTP_PROTOCOL = Config.getProperty( "http.protocol", "http" );
private static final String VERSION = System.getProperty( "version" );
private static final String SERVICE = "fortress-rest-" + VERSION;
// TODO: add SSL capability here:
@@ -88,14 +88,14 @@ public class RestUtils
private static final String TRUST_STORE_PW = Config.getProperty( "trust.store.password" );
private static final String SET_TRUST_STORE_PROP = "trust.store.set.prop";
private static final boolean IS_SET_TRUST_STORE_PROP = (
- Config.getProperty( SET_TRUST_STORE_PROP ) != null &&
- Config.getProperty( SET_TRUST_STORE_PROP ).equalsIgnoreCase( "true" ));
+ Config.getProperty( SET_TRUST_STORE_PROP ) != null &&
+ Config.getProperty( SET_TRUST_STORE_PROP ).equalsIgnoreCase( "true" ) );
static
{
- if(IS_SET_TRUST_STORE_PROP)
+ if ( IS_SET_TRUST_STORE_PROP )
{
- LOG.info( "Set JSSE truststore properties:");
+ LOG.info( "Set JSSE truststore properties:" );
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 );
@@ -103,8 +103,6 @@ public class RestUtils
}
-
-
/**
* Marshall the request into an XML String.
*
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java b/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
index db0268a..ea5d67c 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
@@ -42,7 +42,7 @@ public class VUtil
private static final String CLS_NM = VUtil.class.getName();
private static final org.slf4j.Logger LOG = LoggerFactory.getLogger( CLS_NM );
private static int maximumFieldLen = 130;
- private final static String VALIDATE_LENGTH = "field.length";
+ private static final String VALIDATE_LENGTH = "field.length";
static
{
@@ -61,10 +61,10 @@ public class VUtil
}
}
- private final static int MAXIMUM_FIELD_LEN = maximumFieldLen;
- private final static int maxFieldLength = MAXIMUM_FIELD_LEN;
- private final static char[] LDAP_META_CHARS = loadLdapEscapeChars();
- private final static String[] LDAP_REPL_VALS = loadValidLdapVals();
+ private static final int MAXIMUM_FIELD_LEN = maximumFieldLen;
+ private static final int maxFieldLength = MAXIMUM_FIELD_LEN;
+ private static final char[] LDAP_META_CHARS = loadLdapEscapeChars();
+ private static final String[] LDAP_REPL_VALS = loadValidLdapVals();
private static final int TIME_LEN = 4;
private static final int DATE_LEN = 8;
private static final int DAYMASK_LEN = 7;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 77d9e86..96026a5 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
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core.util.time;
+
import org.apache.directory.fortress.core.CfgException;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.ObjectFactory;
@@ -38,6 +39,7 @@ import java.util.List;
import java.util.ListIterator;
import java.util.StringTokenizer;
+
/**
* This class contains utilities for temporal constraint processing that are used by Fortress internal. All of the methods are static and the class
* is thread safe.
@@ -61,7 +63,8 @@ public class CUtil
private static final String CLS_NM = CUtil.class.getName();
private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
private static List<Validator> validators;
- private static final String DSDVALIDATOR = Config.getProperty(GlobalIds.DSD_VALIDATOR_PROP);
+ private static final String DSDVALIDATOR = Config.getProperty( GlobalIds.DSD_VALIDATOR_PROP );
+
/**
* Used by DAO utilities to convert from a string with comma delimited values to fortress internal format {@link Constraint}.
@@ -69,24 +72,24 @@ public class CUtil
* @param inputString contains raw data format which is comma delimited containing temporal data.
* @param constraint used by internal processing to perform validations.
*/
- public static void setConstraint(String inputString, Constraint constraint)
+ public static void setConstraint( String inputString, Constraint constraint )
{
- if(VUtil.isNotNullOrEmpty(inputString))
+ if ( VUtil.isNotNullOrEmpty( inputString ) )
{
- StringTokenizer tkn = new StringTokenizer(inputString, GlobalIds.DELIMITER, true);
- if (tkn.countTokens() > 0)
+ StringTokenizer tkn = new StringTokenizer( inputString, GlobalIds.DELIMITER, true );
+ if ( tkn.countTokens() > 0 )
{
int count = tkn.countTokens();
int index = 0;
boolean previousTokenWasDelimiter = false;
- for (int i = 0; i < count; i++)
+ for ( int i = 0; i < count; i++ )
{
String szValue = tkn.nextToken();
- if(szValue.equals(GlobalIds.DELIMITER) && !previousTokenWasDelimiter)
+ if ( szValue.equals( GlobalIds.DELIMITER ) && !previousTokenWasDelimiter )
{
previousTokenWasDelimiter = true;
}
- else if(szValue.equals(GlobalIds.DELIMITER))
+ else if ( szValue.equals( GlobalIds.DELIMITER ) )
{
previousTokenWasDelimiter = true;
index++;
@@ -94,36 +97,39 @@ public class CUtil
else
{
previousTokenWasDelimiter = false;
- switch (index++)
+ switch ( index++ )
{
case 0:
// only set the name attr if it isn't already set:
- if (constraint.getName() == null || constraint.getName().length() == 0)
- constraint.setName(szValue);
+ if ( ( constraint.getName() == null ) || ( constraint.getName().length() == 0 ) )
+ {
+ constraint.setName( szValue );
+ }
+
break;
case 1:
- constraint.setTimeout(Integer.parseInt(szValue));
+ constraint.setTimeout( Integer.parseInt( szValue ) );
break;
case 2:
- constraint.setBeginTime(szValue);
+ constraint.setBeginTime( szValue );
break;
case 3:
- constraint.setEndTime(szValue);
+ constraint.setEndTime( szValue );
break;
case 4:
- constraint.setBeginDate(szValue);
+ constraint.setBeginDate( szValue );
break;
case 5:
- constraint.setEndDate(szValue);
+ constraint.setEndDate( szValue );
break;
case 6:
- constraint.setBeginLockDate(szValue);
+ constraint.setBeginLockDate( szValue );
break;
case 7:
- constraint.setEndLockDate(szValue);
+ constraint.setEndLockDate( szValue );
break;
case 8:
- constraint.setDayMask(szValue);
+ constraint.setDayMask( szValue );
break;
}
}
@@ -132,91 +138,126 @@ public class CUtil
}
}
+
/**
* Convert from fortress {@link Constraint} to comma delimited ldap format.
*
* @param constraint contains the temporal data.
* @return string containing raw data bound for ldap.
*/
- public static String setConstraint(Constraint constraint)
+ public static String setConstraint( Constraint constraint )
{
String szConstraint = null;
- if (constraint != null)
+ if ( constraint != null )
{
StringBuilder sb = new StringBuilder();
- sb.append(constraint.getName());
- sb.append(GlobalIds.DELIMITER);
- if(constraint.getTimeout() != null)
- sb.append(constraint.getTimeout());
- sb.append(GlobalIds.DELIMITER);
- if (constraint.getBeginTime() != null)
- sb.append(constraint.getBeginTime());
- sb.append(GlobalIds.DELIMITER);
- if (constraint.getEndTime() != null)
- sb.append(constraint.getEndTime());
- sb.append(GlobalIds.DELIMITER);
- if (constraint.getBeginDate() != null)
- sb.append(constraint.getBeginDate());
- sb.append(GlobalIds.DELIMITER);
- if (constraint.getEndDate() != null)
- sb.append(constraint.getEndDate());
- sb.append(GlobalIds.DELIMITER);
- if (constraint.getBeginLockDate() != null)
- sb.append(constraint.getBeginLockDate());
- sb.append(GlobalIds.DELIMITER);
- if (constraint.getEndLockDate() != null)
- sb.append(constraint.getEndLockDate());
- sb.append(GlobalIds.DELIMITER);
- if (constraint.getDayMask() != null)
- sb.append(constraint.getDayMask());
+ sb.append( constraint.getName() );
+ sb.append( GlobalIds.DELIMITER );
+
+ if ( constraint.getTimeout() != null )
+ {
+ sb.append( constraint.getTimeout() );
+ }
+
+ sb.append( GlobalIds.DELIMITER );
+
+ if ( constraint.getBeginTime() != null )
+ {
+ sb.append( constraint.getBeginTime() );
+ }
+
+ sb.append( GlobalIds.DELIMITER );
+
+ if ( constraint.getEndTime() != null )
+ {
+ sb.append( constraint.getEndTime() );
+ }
+
+ sb.append( GlobalIds.DELIMITER );
+
+ if ( constraint.getBeginDate() != null )
+ {
+ sb.append( constraint.getBeginDate() );
+ }
+
+ sb.append( GlobalIds.DELIMITER );
+
+ if ( constraint.getEndDate() != null )
+ {
+ sb.append( constraint.getEndDate() );
+ }
+
+ sb.append( GlobalIds.DELIMITER );
+
+ if ( constraint.getBeginLockDate() != null )
+ {
+ sb.append( constraint.getBeginLockDate() );
+ }
+
+ sb.append( GlobalIds.DELIMITER );
+
+ if ( constraint.getEndLockDate() != null )
+ {
+ sb.append( constraint.getEndLockDate() );
+ }
+
+ sb.append( GlobalIds.DELIMITER );
+
+ if ( constraint.getDayMask() != null )
+ {
+ sb.append( constraint.getDayMask() );
+ }
+
szConstraint = sb.toString();
}
return szConstraint;
}
+
/**
* Validate the non-null attributes on the constraint.
*
* @param c1 contains the temporal values associated with an entity.
* @throws org.apache.directory.fortress.core.ValidationException on first invalid attribute found.
*/
- public static void validate(Constraint c1)
+ public static void validate( Constraint c1 )
throws ValidationException
{
- if (VUtil.isNotNullOrEmpty(c1.getTimeout()))
+ if ( VUtil.isNotNullOrEmpty( c1.getTimeout() ) )
{
- VUtil.timeout(c1.getTimeout());
+ VUtil.timeout( c1.getTimeout() );
}
- if (VUtil.isNotNullOrEmpty(c1.getBeginTime()))
+ if ( VUtil.isNotNullOrEmpty( c1.getBeginTime() ) )
{
- VUtil.beginTime(c1.getBeginTime());
+ VUtil.beginTime( c1.getBeginTime() );
}
- if (VUtil.isNotNullOrEmpty(c1.getEndTime()))
+ if ( VUtil.isNotNullOrEmpty( c1.getEndTime() ) )
{
- VUtil.endTime(c1.getEndTime());
+ VUtil.endTime( c1.getEndTime() );
}
- if (VUtil.isNotNullOrEmpty(c1.getBeginDate()))
+ if ( VUtil.isNotNullOrEmpty( c1.getBeginDate() ) )
{
- VUtil.beginDate(c1.getBeginDate());
+ VUtil.beginDate( c1.getBeginDate() );
}
- if (VUtil.isNotNullOrEmpty(c1.getEndDate()))
+ if ( VUtil.isNotNullOrEmpty( c1.getEndDate() ) )
{
- VUtil.endDate(c1.getEndDate());
+ VUtil.endDate( c1.getEndDate() );
}
- if (VUtil.isNotNullOrEmpty(c1.getDayMask()))
+ if ( VUtil.isNotNullOrEmpty( c1.getDayMask() ) )
{
- VUtil.dayMask(c1.getDayMask());
+ VUtil.dayMask( c1.getDayMask() );
}
- if (VUtil.isNotNullOrEmpty(c1.getBeginLockDate()))
+ if ( VUtil.isNotNullOrEmpty( c1.getBeginLockDate() ) )
{
- VUtil.beginDate(c1.getBeginLockDate());
+ VUtil.beginDate( c1.getBeginLockDate() );
}
- if (VUtil.isNotNullOrEmpty(c1.getEndLockDate()))
+ if ( VUtil.isNotNullOrEmpty( c1.getEndLockDate() ) )
{
- VUtil.endDate(c1.getEndLockDate());
+ VUtil.endDate( c1.getEndLockDate() );
}
}
+
/**
* Utility is used during processing of constraint values. The rule used here is if the target constraint will
* accept the source constraint attribute only when not set initially. If target constraint's attribute is set,
@@ -226,73 +267,73 @@ public class CUtil
* @param trgC instantiated object may contain zero or more attributes set. Copy will not be performed on set attrs.
* @throws org.apache.directory.fortress.core.ValidationException on first invalid attribute found.
*/
- public static void validateOrCopy(Constraint srcC, Constraint trgC)
+ public static void validateOrCopy( Constraint srcC, Constraint trgC )
throws ValidationException
{
//VUtil.timeout(trgC.getTimeout());
- if (VUtil.isNotNullOrEmpty(trgC.getTimeout()))
+ if ( VUtil.isNotNullOrEmpty( trgC.getTimeout() ) )
{
- srcC.setTimeout(trgC.getTimeout());
+ srcC.setTimeout( trgC.getTimeout() );
}
- else if (VUtil.isNotNullOrEmpty(srcC.getTimeout()))
+ else if ( VUtil.isNotNullOrEmpty( srcC.getTimeout() ) )
{
- trgC.setTimeout(srcC.getTimeout());
+ trgC.setTimeout( srcC.getTimeout() );
}
- if (VUtil.isNotNullOrEmpty(trgC.getBeginTime()))
+ if ( VUtil.isNotNullOrEmpty( trgC.getBeginTime() ) )
{
- VUtil.beginTime(trgC.getBeginTime());
+ VUtil.beginTime( trgC.getBeginTime() );
}
- else if (VUtil.isNotNullOrEmpty(srcC.getBeginTime()))
+ else if ( VUtil.isNotNullOrEmpty( srcC.getBeginTime() ) )
{
- trgC.setBeginTime(srcC.getBeginTime());
+ trgC.setBeginTime( srcC.getBeginTime() );
}
- if (VUtil.isNotNullOrEmpty(trgC.getEndTime()))
+ if ( VUtil.isNotNullOrEmpty( trgC.getEndTime() ) )
{
- VUtil.endTime(trgC.getEndTime());
+ VUtil.endTime( trgC.getEndTime() );
}
- else if (VUtil.isNotNullOrEmpty(srcC.getEndTime()))
+ else if ( VUtil.isNotNullOrEmpty( srcC.getEndTime() ) )
{
- trgC.setEndTime(srcC.getEndTime());
+ trgC.setEndTime( srcC.getEndTime() );
}
- if (VUtil.isNotNullOrEmpty(trgC.getBeginDate()))
+ if ( VUtil.isNotNullOrEmpty( trgC.getBeginDate() ) )
{
- VUtil.beginDate(trgC.getBeginDate());
+ VUtil.beginDate( trgC.getBeginDate() );
}
- else if (VUtil.isNotNullOrEmpty(srcC.getBeginDate()))
+ else if ( VUtil.isNotNullOrEmpty( srcC.getBeginDate() ) )
{
- trgC.setBeginDate(srcC.getBeginDate());
+ trgC.setBeginDate( srcC.getBeginDate() );
}
- if (VUtil.isNotNullOrEmpty(trgC.getEndDate()))
+ if ( VUtil.isNotNullOrEmpty( trgC.getEndDate() ) )
{
- VUtil.endDate(trgC.getEndDate());
+ VUtil.endDate( trgC.getEndDate() );
}
- else if (VUtil.isNotNullOrEmpty(srcC.getEndDate()))
+ else if ( VUtil.isNotNullOrEmpty( srcC.getEndDate() ) )
{
- trgC.setEndDate(srcC.getEndDate());
+ trgC.setEndDate( srcC.getEndDate() );
}
- if (VUtil.isNotNullOrEmpty(trgC.getDayMask()))
+ if ( VUtil.isNotNullOrEmpty( trgC.getDayMask() ) )
{
- VUtil.dayMask(trgC.getDayMask());
+ VUtil.dayMask( trgC.getDayMask() );
}
- else if (VUtil.isNotNullOrEmpty(srcC.getDayMask()))
+ else if ( VUtil.isNotNullOrEmpty( srcC.getDayMask() ) )
{
- trgC.setDayMask(srcC.getDayMask());
+ trgC.setDayMask( srcC.getDayMask() );
}
- if (VUtil.isNotNullOrEmpty(trgC.getBeginLockDate()))
+ if ( VUtil.isNotNullOrEmpty( trgC.getBeginLockDate() ) )
{
- VUtil.beginDate(trgC.getBeginLockDate());
+ VUtil.beginDate( trgC.getBeginLockDate() );
}
- else if (VUtil.isNotNullOrEmpty(srcC.getBeginLockDate()))
+ else if ( VUtil.isNotNullOrEmpty( srcC.getBeginLockDate() ) )
{
- trgC.setBeginLockDate(srcC.getBeginLockDate());
+ trgC.setBeginLockDate( srcC.getBeginLockDate() );
}
- if (VUtil.isNotNullOrEmpty(trgC.getEndLockDate()))
+ if ( VUtil.isNotNullOrEmpty( trgC.getEndLockDate() ) )
{
- VUtil.endDate(trgC.getEndLockDate());
+ VUtil.endDate( trgC.getEndLockDate() );
}
- else if (VUtil.isNotNullOrEmpty(srcC.getEndLockDate()))
+ else if ( VUtil.isNotNullOrEmpty( srcC.getEndLockDate() ) )
{
- trgC.setEndLockDate(srcC.getEndLockDate());
+ trgC.setEndLockDate( srcC.getEndLockDate() );
}
}
@@ -320,54 +361,55 @@ public class CUtil
{
validators = getValidators();
}
- catch ( SecurityException ex)
+ catch ( SecurityException ex )
{
- LOG.error("static initialzier caught SecurityException=" + ex.getMessage(), ex);
+ LOG.error( "static initialzier caught SecurityException=" + ex.getMessage(), ex );
}
}
+
/**
* Copy source constraint to target. Both must be created before calling this utility.
*
* @param srcC contains constraint source.
* @param trgC contains target constraint.
*/
- public static void copy(Constraint srcC, Constraint trgC)
+ public static void copy( Constraint srcC, Constraint trgC )
{
// Both variables must be instantiated before being passed in to this method.
- trgC.setTimeout(srcC.getTimeout());
+ trgC.setTimeout( srcC.getTimeout() );
- if (VUtil.isNotNullOrEmpty(srcC.getName()))
+ if ( VUtil.isNotNullOrEmpty( srcC.getName() ) )
{
- trgC.setName(srcC.getName());
+ trgC.setName( srcC.getName() );
}
- if (VUtil.isNotNullOrEmpty(srcC.getBeginTime()))
+ if ( VUtil.isNotNullOrEmpty( srcC.getBeginTime() ) )
{
- trgC.setBeginTime(srcC.getBeginTime());
+ trgC.setBeginTime( srcC.getBeginTime() );
}
- if (VUtil.isNotNullOrEmpty(srcC.getEndTime()))
+ if ( VUtil.isNotNullOrEmpty( srcC.getEndTime() ) )
{
- trgC.setEndTime(srcC.getEndTime());
+ trgC.setEndTime( srcC.getEndTime() );
}
- if (VUtil.isNotNullOrEmpty(srcC.getDayMask()))
+ if ( VUtil.isNotNullOrEmpty( srcC.getDayMask() ) )
{
- trgC.setDayMask(srcC.getDayMask());
+ trgC.setDayMask( srcC.getDayMask() );
}
- if (VUtil.isNotNullOrEmpty(srcC.getBeginDate()))
+ if ( VUtil.isNotNullOrEmpty( srcC.getBeginDate() ) )
{
- trgC.setBeginDate(srcC.getBeginDate());
+ trgC.setBeginDate( srcC.getBeginDate() );
}
- if (VUtil.isNotNullOrEmpty(srcC.getEndDate()))
+ if ( VUtil.isNotNullOrEmpty( srcC.getEndDate() ) )
{
- trgC.setEndDate(srcC.getEndDate());
+ trgC.setEndDate( srcC.getEndDate() );
}
- if (VUtil.isNotNullOrEmpty(srcC.getBeginLockDate()))
+ if ( VUtil.isNotNullOrEmpty( srcC.getBeginLockDate() ) )
{
- trgC.setBeginLockDate(srcC.getBeginLockDate());
+ trgC.setBeginLockDate( srcC.getBeginLockDate() );
}
- if (VUtil.isNotNullOrEmpty(srcC.getEndLockDate()))
+ if ( VUtil.isNotNullOrEmpty( srcC.getEndLockDate() ) )
{
- trgC.setEndLockDate(srcC.getEndLockDate());
+ trgC.setEndLockDate( srcC.getEndLockDate() );
}
}
@@ -381,79 +423,83 @@ public class CUtil
* @param checkDsd will check DSD constraints if true
* @throws org.apache.directory.fortress.core.SecurityException in the event validation fails for User or system error occurs.
*/
- public static void validateConstraints(Session session, ConstraintType type, boolean checkDsd)
+ public static void validateConstraints( Session session, ConstraintType type, boolean checkDsd )
throws SecurityException
{
String location = "validateConstraints";
int rc;
- if (validators == null)
+ if ( validators == null )
{
- if(LOG.isDebugEnabled())
+ if ( LOG.isDebugEnabled() )
{
LOG.debug( "{} userId [{}] no constraints enabled", location, session.getUserId() );
}
return;
}
// no need to continue if the role list is empty and we're trying to check role constraints:
- else if (type == ConstraintType.ROLE && !VUtil.isNotNullOrEmpty(session.getRoles()) && !VUtil.isNotNullOrEmpty(session.getAdminRoles()))
+ else if ( type == ConstraintType.ROLE && !VUtil.isNotNullOrEmpty( session.getRoles() )
+ && !VUtil.isNotNullOrEmpty( session.getAdminRoles() ) )
{
- if(LOG.isDebugEnabled())
+ if ( LOG.isDebugEnabled() )
{
LOG.debug( "{} userId [{}] has no roles assigned", location, session.getUserId() );
}
return;
}
- for (Validator val : validators)
+ for ( Validator val : validators )
{
Time currTime = TUtil.getCurrentTime();
// first check the constraint on the user:
- if (type == ConstraintType.USER)
+ if ( type == ConstraintType.USER )
{
- rc = val.validate(session, session.getUser(), currTime);
- if (rc > 0)
+ rc = val.validate( session, session.getUser(), currTime );
+ if ( rc > 0 )
{
- String info = location + " user [" + session.getUserId() + "] was deactivated reason code [" + rc + "]";
- throw new ValidationException(rc, info);
+ String info = location + " user [" + session.getUserId() + "] was deactivated reason code [" + rc
+ + "]";
+ throw new ValidationException( rc, info );
}
}
// Check the constraints for each role assignment:
else
{
- if (VUtil.isNotNullOrEmpty(session.getRoles()))
+ if ( VUtil.isNotNullOrEmpty( session.getRoles() ) )
{
// now check the constraint on every rbac role activation candidate contained within session object:
ListIterator<UserRole> roleItems = session.getRoles().listIterator();
-
- while (roleItems.hasNext())
+
+ while ( roleItems.hasNext() )
{
- Constraint constraint = (Constraint) roleItems.next();
- rc = val.validate(session, constraint, currTime);
-
- if (rc > 0)
+ Constraint constraint = ( Constraint ) roleItems.next();
+ rc = val.validate( session, constraint, currTime );
+
+ if ( rc > 0 )
{
String msg = location + " role [" + constraint.getName() + "] for user ["
+ session.getUserId() + "] was deactivated reason code [" + rc + "]";
- LOG.info(msg);
+ LOG.info( msg );
roleItems.remove();
- session.setWarning( new ObjectFactory().createWarning( rc, msg, Warning.Type.ROLE, constraint.getName() ) );
+ session.setWarning( new ObjectFactory().createWarning( rc, msg, Warning.Type.ROLE,
+ constraint.getName() ) );
}
}
}
- if (VUtil.isNotNullOrEmpty(session.getAdminRoles()))
+ if ( VUtil.isNotNullOrEmpty( session.getAdminRoles() ) )
{
// now check the constraint on every arbac role activation candidate contained within session object:
ListIterator roleItems = session.getAdminRoles().listIterator();
- while (roleItems.hasNext())
+ while ( roleItems.hasNext() )
{
- Constraint constraint = (Constraint) roleItems.next();
- rc = val.validate(session, constraint, currTime);
- if (rc > 0)
+ Constraint constraint = ( Constraint ) roleItems.next();
+ rc = val.validate( session, constraint, currTime );
+ if ( rc > 0 )
{
String msg = location + " admin role [" + constraint.getName() + "] for user ["
+ session.getUserId() + "] was deactivated reason code [" + rc + "]";
- LOG.info(msg);
+ LOG.info( msg );
roleItems.remove();
- session.setWarning( new ObjectFactory().createWarning( rc, msg, Warning.Type.ROLE, constraint.getName() ) );
+ session.setWarning( new ObjectFactory().createWarning( rc, msg, Warning.Type.ROLE,
+ constraint.getName() ) );
}
}
}
@@ -461,15 +507,17 @@ public class CUtil
}
// now perform DSD validation on session's rbac roles:
- if (checkDsd && DSDVALIDATOR != null && DSDVALIDATOR.length() > 0 && type == ConstraintType.ROLE && VUtil.isNotNullOrEmpty( session.getRoles() ))
+ if ( checkDsd && DSDVALIDATOR != null && DSDVALIDATOR.length() > 0 && type == ConstraintType.ROLE
+ && VUtil.isNotNullOrEmpty( session.getRoles() ) )
{
- Validator dsdVal = (Validator) ClassUtil.createInstance(DSDVALIDATOR);
- dsdVal.validate(session, session.getUser(), null);
+ Validator dsdVal = ( Validator ) ClassUtil.createInstance( DSDVALIDATOR );
+ dsdVal.validate( session, session.getUser(), null );
}
// reset the user's last access timestamp:
session.setLastAccess();
}
+
/**
* Utility is used internally by this class to retrieve a list of all Validator class names, instantiate and return.
*
@@ -480,16 +528,16 @@ public class CUtil
throws CfgException
{
List<Validator> validators = new ArrayList<>();
- for (int i = 0; ; i++)
+ for ( int i = 0;; i++ )
{
String prop = GlobalIds.VALIDATOR_PROPS + i;
- String className = Config.getProperty(prop);
- if (className == null)
+ String className = Config.getProperty( prop );
+ if ( className == null )
{
break;
}
- validators.add((Validator) ClassUtil.createInstance(className));
+ validators.add( ( Validator ) ClassUtil.createInstance( className ) );
}
return validators;
}
[2/5] directory-fortress-core git commit: o Fixed many Sonar warnings
o Renamed the Organizat*ii*onalUnitDAO class
Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 81a897c..03baceb 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
@@ -216,7 +216,7 @@ final class AuditDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<AuthZ> searchInvalidAuthNs( UserAudit audit ) throws FinderException
+ List<AuthZ> searchInvalidAuthNs( UserAudit audit ) throws FinderException
{
List<AuthZ> auditList = new ArrayList<>();
LdapConnection ld = null;
@@ -275,7 +275,9 @@ final class AuditDAO extends ApacheDsDataProvider
// todo: fix this workaround. This search will return failed role assign searches as well.
// Work around is to remove the ou=People failed searches from user failed searches on authN.
if ( !AttrHelper.getAuthZId( authZ.getReqDN() ).equalsIgnoreCase( "People" ) )
+ {
auditList.add( authZ );
+ }
}
}
catch ( LdapException e )
@@ -303,7 +305,7 @@ final class AuditDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<AuthZ> searchAuthZs( UserAudit audit ) throws FinderException
+ List<AuthZ> searchAuthZs( UserAudit audit ) throws FinderException
{
List<AuthZ> auditList = new ArrayList<>();
LdapConnection ld = null;
@@ -316,7 +318,8 @@ 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 + "=" + SchemaConstants.UID_AT + "=" + audit.getUserId() + "," + userRoot + ")";
+ reqDn + ")(" + REQUAUTHZID + "=" + SchemaConstants.UID_AT + "=" + audit.getUserId() + "," + userRoot
+ + ")";
if ( audit.isFailedOnly() )
{
@@ -384,7 +387,7 @@ final class AuditDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<AuthZ> getAllAuthZs( UserAudit audit ) throws FinderException
+ List<AuthZ> getAllAuthZs( UserAudit audit ) throws FinderException
{
List<AuthZ> auditList = new ArrayList<>();
LdapConnection ld = null;
@@ -457,7 +460,7 @@ final class AuditDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<Bind> searchBinds( UserAudit audit ) throws FinderException
+ List<Bind> searchBinds( UserAudit audit ) throws FinderException
{
List<Bind> auditList = new ArrayList<>();
LdapConnection ld = null;
@@ -540,7 +543,7 @@ final class AuditDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<Mod> searchUserMods( UserAudit audit ) throws FinderException
+ List<Mod> searchUserMods( UserAudit audit ) throws FinderException
{
List<Mod> modList = new ArrayList<>();
LdapConnection ld = null;
@@ -595,7 +598,7 @@ final class AuditDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final List<Mod> searchAdminMods( UserAudit audit ) throws FinderException
+ List<Mod> searchAdminMods( UserAudit audit ) throws FinderException
{
List<Mod> modList = new ArrayList<>();
LdapConnection ld = null;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/rbac/AuditP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AuditP.java b/src/main/java/org/apache/directory/fortress/core/rbac/AuditP.java
index d1377d9..1b1ce19 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AuditP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AuditP.java
@@ -66,7 +66,7 @@ public final class AuditP
* @return a List of objects of type AuthZ. Each AuthZ object contains one authorization event.
* @throws SecurityException if a runtime system error occurs.
*/
- final List<AuthZ> getAuthZs( UserAudit uAudit ) throws SecurityException
+ List<AuthZ> getAuthZs( UserAudit uAudit ) throws SecurityException
{
return aDao.getAllAuthZs( uAudit );
}
@@ -81,7 +81,7 @@ public final class AuditP
* @return a List of objects of type AuthZ. Each AuthZ object contains one authorization event.
* @throws SecurityException if a runtime system error occurs.
*/
- final List<AuthZ> searchAuthZs( UserAudit uAudit ) throws SecurityException
+ List<AuthZ> searchAuthZs( UserAudit uAudit ) throws SecurityException
{
return aDao.searchAuthZs( uAudit );
}
@@ -95,7 +95,7 @@ public final class AuditP
* @return a List of objects of type Bind. Each Bind object contains one bind event.
* @throws SecurityException if a runtime system error occurs.
*/
- final List<Bind> searchBinds( UserAudit uAudit ) throws SecurityException
+ List<Bind> searchBinds( UserAudit uAudit ) throws SecurityException
{
return aDao.searchBinds( uAudit );
}
@@ -109,7 +109,7 @@ public final class AuditP
* @return a List of objects of type AuthZ. Each AuthZ object contains one authorization event.
* @throws SecurityException if a runtime system error occurs.
*/
- final List<Mod> searchUserMods( UserAudit uAudit ) throws SecurityException
+ List<Mod> searchUserMods( UserAudit uAudit ) throws SecurityException
{
return aDao.searchUserMods( uAudit );
}
@@ -124,7 +124,7 @@ public final class AuditP
* @return a List of objects of type AuthZ. Each AuthZ object contains one authorization event.
* @throws SecurityException if a runtime system error occurs.
*/
- final List<Mod> searchAdminMods( UserAudit uAudit ) throws SecurityException
+ List<Mod> searchAdminMods( UserAudit uAudit ) throws SecurityException
{
return aDao.searchAdminMods( uAudit );
}
@@ -142,7 +142,7 @@ public final class AuditP
* @return a List of objects of type AuthZ. Each AuthZ object contains one failed authentication event.
* @throws SecurityException if a runtime system error occurs.
*/
- final List<AuthZ> searchInvalidAuthNs( UserAudit uAudit ) throws SecurityException
+ List<AuthZ> searchInvalidAuthNs( UserAudit uAudit ) throws SecurityException
{
return aDao.searchInvalidAuthNs( uAudit );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 5839c9e..b32dbcc 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
@@ -128,7 +128,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.CreateException
*
*/
- final OrgUnit create( OrgUnit entity ) throws CreateException
+ OrgUnit create( OrgUnit entity ) throws CreateException
{
LdapConnection ld = null;
Dn dn = getDn( entity );
@@ -189,7 +189,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.UpdateException
*
*/
- final OrgUnit update( OrgUnit entity ) throws UpdateException
+ OrgUnit update( OrgUnit entity ) throws UpdateException
{
LdapConnection ld = null;
Dn dn = getDn( entity );
@@ -243,7 +243,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.UpdateException
*
*/
- final void deleteParent( OrgUnit entity ) throws UpdateException
+ void deleteParent( OrgUnit entity ) throws UpdateException
{
LdapConnection ld = null;
Dn dn = getDn( entity );
@@ -285,7 +285,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.RemoveException
*
*/
- final OrgUnit remove( OrgUnit entity ) throws RemoveException
+ OrgUnit remove( OrgUnit entity ) throws RemoveException
{
LdapConnection ld = null;
Dn dn = getDn( entity );
@@ -327,7 +327,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
* @throws FinderException
*
*/
- final OrgUnit findByKey( OrgUnit entity ) throws FinderException
+ OrgUnit findByKey( OrgUnit entity ) throws FinderException
{
OrgUnit oe = null;
LdapConnection ld = null;
@@ -406,7 +406,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<OrgUnit> findOrgs( OrgUnit orgUnit ) throws FinderException
+ List<OrgUnit> findOrgs( OrgUnit orgUnit ) throws FinderException
{
List<OrgUnit> orgUnitList = new ArrayList<>();
LdapConnection ld = null;
@@ -477,7 +477,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final Set<String> getOrgs( OrgUnit orgUnit ) throws FinderException
+ Set<String> getOrgs( OrgUnit orgUnit ) throws FinderException
{
Set<String> ouSet = new TreeSet<String>( String.CASE_INSENSITIVE_ORDER );
LdapConnection ld = null;
@@ -546,7 +546,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final List<Graphable> getAllDescendants( OrgUnit orgUnit ) throws FinderException
+ List<Graphable> getAllDescendants( OrgUnit orgUnit ) throws FinderException
{
String orgUnitRoot = getOrgRoot( orgUnit );
String[] DESC_ATRS =
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitP.java b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitP.java
index 325794f..390fd5c 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitP.java
@@ -93,10 +93,10 @@ public final class OrgUnitP
* @param entity
* @return true if valid, false otherwise.
*/
- /* No Qualifier */final boolean isValid( OrgUnit entity )
+ /* No Qualifier */boolean isValid( OrgUnit entity )
{
boolean result = false;
-
+
if ( entity.type == OrgUnit.Type.USER )
{
try
@@ -131,7 +131,7 @@ public final class OrgUnitP
permPoolLock.readLock().unlock();
}
}
-
+
return result;
}
@@ -144,7 +144,7 @@ public final class OrgUnitP
private static Set<String> loadUserSet( OrgUnit orgUnit )
{
Set<String> ouUserSet = null;
-
+
try
{
ouUserSet = oDao.getOrgs( orgUnit );
@@ -154,7 +154,7 @@ public final class OrgUnitP
String warning = "loadOrgSet static initializer caught SecurityException=" + se;
LOG.info( warning, se );
}
-
+
ouCache.put( getKey( USER_OUS, orgUnit.getContextId() ), ouUserSet );
return ouUserSet;
@@ -169,7 +169,7 @@ public final class OrgUnitP
private static Set<String> loadPermSet( OrgUnit orgUnit )
{
Set<String> ouPermSet = null;
-
+
try
{
ouPermSet = oDao.getOrgs( orgUnit );
@@ -179,7 +179,7 @@ public final class OrgUnitP
String warning = "loadOrgSet static initializer caught SecurityException=" + se;
LOG.info( warning, se );
}
-
+
ouCache.put( getKey( PERM_OUS, orgUnit.getContextId() ), ouPermSet );
return ouPermSet;
@@ -200,7 +200,7 @@ public final class OrgUnitP
{
permSet = loadPermSet( orgUnit );
}
-
+
return permSet;
}
@@ -219,7 +219,7 @@ public final class OrgUnitP
{
userSet = loadUserSet( orgUnit );
}
-
+
return userSet;
}
@@ -232,10 +232,10 @@ public final class OrgUnitP
* @return OrgUnit entity containing all attributes associated with ou in directory.
* @throws SecurityException in the event OrgUnit not found or DAO search error.
*/
- final OrgUnit read( OrgUnit entity ) throws SecurityException
+ OrgUnit read( OrgUnit entity ) throws SecurityException
{
validate( entity, false );
-
+
return oDao.findByKey( entity );
}
@@ -248,7 +248,7 @@ public final class OrgUnitP
* @return List of type OrgUnit containing fully populated matching OU entities. If no records found this will be empty.
* @throws SecurityException in the event of DAO search error.
*/
- final List<OrgUnit> search( OrgUnit orgUnit ) throws SecurityException
+ List<OrgUnit> search( OrgUnit orgUnit ) throws SecurityException
{
// Call the finder.
return oDao.findOrgs( orgUnit );
@@ -264,11 +264,11 @@ public final class OrgUnitP
* @return OrgUnit entity copy of input + additional attributes (internalId) that were added by op.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final OrgUnit add( OrgUnit entity ) throws SecurityException
+ OrgUnit add( OrgUnit entity ) throws SecurityException
{
validate( entity, false );
OrgUnit oe = oDao.create( entity );
-
+
if ( entity.getType() == OrgUnit.Type.USER )
{
try
@@ -276,7 +276,7 @@ public final class OrgUnitP
userPoolLock.writeLock().lock();
Set<String> userPool = getUserSet( entity );
-
+
if ( userPool != null )
{
userPool.add( entity.getName() );
@@ -294,7 +294,7 @@ public final class OrgUnitP
permPoolLock.writeLock().lock();
Set<String> permPool = getPermSet( entity );
-
+
if ( permPool != null )
{
permPool.add( entity.getName() );
@@ -305,7 +305,7 @@ public final class OrgUnitP
permPoolLock.writeLock().unlock();
}
}
-
+
return oe;
}
@@ -320,10 +320,10 @@ public final class OrgUnitP
* @return OrgUnit entity copy of input + additional attributes (internalId) that were updated by op.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final OrgUnit update( OrgUnit entity ) throws SecurityException
+ OrgUnit update( OrgUnit entity ) throws SecurityException
{
validate( entity, false );
-
+
return oDao.update( entity );
}
@@ -336,7 +336,7 @@ public final class OrgUnitP
* @param entity OrgUnit contains data targeted for updating. Null attributes ignored.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final void deleteParent( OrgUnit entity ) throws SecurityException
+ void deleteParent( OrgUnit entity ) throws SecurityException
{
validate( entity, false );
oDao.deleteParent( entity );
@@ -352,10 +352,10 @@ public final class OrgUnitP
* @return OrgUnit entity copy of input.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final OrgUnit delete( OrgUnit entity ) throws SecurityException
+ OrgUnit delete( OrgUnit entity ) throws SecurityException
{
oDao.remove( entity );
-
+
if ( entity.getType() == OrgUnit.Type.USER )
{
try
@@ -390,7 +390,7 @@ public final class OrgUnitP
permPoolLock.writeLock().unlock();
}
}
-
+
return entity;
}
@@ -402,7 +402,7 @@ public final class OrgUnitP
* @return List of type OrgUnit containing {@link OrgUnit#name} and {@link OrgUnit#parents} populated.
* @throws SecurityException in the event of DAO search error.
*/
- final List<Graphable> getAllDescendants( OrgUnit orgUnit ) throws SecurityException
+ List<Graphable> getAllDescendants( OrgUnit orgUnit ) throws SecurityException
{
return oDao.getAllDescendants( orgUnit );
}
@@ -421,17 +421,17 @@ public final class OrgUnitP
throws SecurityException
{
VUtil.safeText( entity.getName(), GlobalIds.OU_LEN );
-
+
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
{
VUtil.description( entity.getDescription() );
}
-
+
if ( entity.getType() == null )
{
String error = "validate null or empty org unit type";
int errCode;
-
+
if ( entity.getType() == OrgUnit.Type.PERM )
{
errCode = GlobalErrIds.ORG_TYPE_NULL_PERM;
@@ -440,7 +440,7 @@ public final class OrgUnitP
{
errCode = GlobalErrIds.ORG_TYPE_NULL_USER;
}
-
+
throw new SecurityException( errCode, error );
}
}
@@ -456,12 +456,12 @@ public final class OrgUnitP
private static String getKey( String type, String contextId )
{
String key = type;
-
+
if ( VUtil.isNotNullOrEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) )
{
key += ":" + contextId;
}
-
+
return key;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 d0c4e6e..3b4bc28 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
@@ -203,7 +203,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.CreateException
*
*/
- final PermObj createObject( PermObj entity ) throws CreateException
+ PermObj createObject( PermObj entity ) throws CreateException
{
LdapConnection ld = null;
String dn = getDn( entity, entity.getContextId() );
@@ -268,7 +268,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.UpdateException
*
*/
- final PermObj updateObj( PermObj entity )
+ PermObj updateObj( PermObj entity )
throws UpdateException
{
LdapConnection ld = null;
@@ -328,7 +328,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.RemoveException
*
*/
- final void deleteObj( PermObj entity ) throws RemoveException
+ void deleteObj( PermObj entity ) throws RemoveException
{
LdapConnection ld = null;
String dn = getDn( entity, entity.getContextId() );
@@ -363,7 +363,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.CreateException
*
*/
- final Permission createOperation( Permission entity ) throws CreateException
+ Permission createOperation( Permission entity ) throws CreateException
{
LdapConnection ld = null;
String dn = getDn( entity, entity.getContextId() );
@@ -445,7 +445,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.UpdateException
*
*/
- final Permission updateOperation( Permission entity )
+ Permission updateOperation( Permission entity )
throws UpdateException
{
LdapConnection ld = null;
@@ -507,7 +507,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.RemoveException
*
*/
- final void deleteOperation( Permission entity ) throws RemoveException
+ void deleteOperation( Permission entity ) throws RemoveException
{
LdapConnection ld = null;
String dn = getOpRdn( entity.getOpName(), entity.getObjId() ) + "," + GlobalIds.POBJ_NAME + "="
@@ -545,7 +545,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final void grant( Permission pOp, Role role )
+ void grant( Permission pOp, Role role )
throws UpdateException
{
LdapConnection ld = null;
@@ -596,7 +596,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final void revoke( Permission pOp, Role role )
+ void revoke( Permission pOp, Role role )
throws UpdateException, FinderException
{
LdapConnection ld = null;
@@ -638,7 +638,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final void grant( Permission pOp, User user )
+ void grant( Permission pOp, User user )
throws UpdateException
{
LdapConnection ld = null;
@@ -689,7 +689,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final void revoke( Permission pOp, User user )
+ void revoke( Permission pOp, User user )
throws UpdateException, FinderException
{
LdapConnection ld = null;
@@ -730,7 +730,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final Permission getPerm( Permission permission )
+ Permission getPerm( Permission permission )
throws FinderException
{
Permission entity = null;
@@ -773,7 +773,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final PermObj getPerm( PermObj permObj )
+ PermObj getPerm( PermObj permObj )
throws FinderException
{
PermObj entity = null;
@@ -822,7 +822,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
* In the event system error occurs looking up data on ldap server.
*/
- final boolean checkPermission( Session session, Permission inPerm ) throws FinderException
+ boolean checkPermission( Session session, Permission inPerm ) throws FinderException
{
boolean isAuthZd = false;
LdapConnection ld = null;
@@ -1060,7 +1060,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<Permission> findPermissions( Permission permission )
+ List<Permission> findPermissions( Permission permission )
throws FinderException
{
List<Permission> permList = new ArrayList<>();
@@ -1109,7 +1109,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<PermObj> findPermissions( PermObj permObj )
+ List<PermObj> findPermissions( PermObj permObj )
throws FinderException
{
List<PermObj> permList = new ArrayList<>();
@@ -1155,7 +1155,7 @@ final class PermDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final List<PermObj> findPermissions( OrgUnit ou, boolean limitSize ) throws FinderException
+ List<PermObj> findPermissions( OrgUnit ou, boolean limitSize ) throws FinderException
{
List<PermObj> permList = new ArrayList<>();
LdapConnection ld = null;
@@ -1212,7 +1212,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<Permission> findPermissions( Role role ) throws FinderException
+ List<Permission> findPermissions( Role role ) throws FinderException
{
List<Permission> permList = new ArrayList<>();
LdapConnection ld = null;
@@ -1308,7 +1308,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<Permission> findPermissions( User user ) throws FinderException
+ List<Permission> findPermissions( User user ) throws FinderException
{
List<Permission> permList = new ArrayList<>();
LdapConnection ld = null;
@@ -1376,7 +1376,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<Permission> findUserPermissions( User user ) throws FinderException
+ List<Permission> findUserPermissions( User user ) throws FinderException
{
List<Permission> permList = new ArrayList<>();
LdapConnection ld = null;
@@ -1429,7 +1429,7 @@ final class PermDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<Permission> findPermissions( Session session, boolean isAdmin ) throws FinderException
+ List<Permission> findPermissions( Session session, boolean isAdmin ) throws FinderException
{
List<Permission> permList = new ArrayList<>();
LdapConnection ld = null;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/rbac/PermObj.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PermObj.java b/src/main/java/org/apache/directory/fortress/core/rbac/PermObj.java
index 6eb0b14..d912d81 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PermObj.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PermObj.java
@@ -548,14 +548,27 @@ public class PermObj extends FortEntity implements Serializable
{
if ( this == thatObj )
+ {
return true;
+ }
+
if ( this.getObjName() == null )
+ {
return false;
+ }
+
if ( !( thatObj instanceof PermObj ) )
+ {
return false;
+ }
+
PermObj thatPermObj = ( PermObj ) thatObj;
+
if ( thatPermObj.getObjName() == null )
+ {
return false;
+ }
+
return thatPermObj.getObjName().equalsIgnoreCase( this.getObjName() );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/rbac/PermP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PermP.java b/src/main/java/org/apache/directory/fortress/core/rbac/PermP.java
index 046e15f..1cd5a3a 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PermP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PermP.java
@@ -80,7 +80,7 @@ public final class PermP
* @return True of user has access, false otherwise.
* @throws SecurityException in the event of data validation failure, security policy violation or DAO error.
*/
- final boolean checkPermission( Session session, Permission permission ) throws SecurityException
+ boolean checkPermission( Session session, Permission permission ) throws SecurityException
{
return pDao.checkPermission( session, permission );
}
@@ -93,7 +93,7 @@ public final class PermP
* @return List of type Permission containing fully populated matching Permission entities.
* @throws SecurityException in the event of DAO search error.
*/
- final List<Permission> search( Permission permission ) throws SecurityException
+ List<Permission> search( Permission permission ) throws SecurityException
{
return pDao.findPermissions( permission );
}
@@ -106,7 +106,7 @@ public final class PermP
* @return List of type Permission Objects containing fully populated matching entities.
* @throws SecurityException in the event of DAO search error.
*/
- final List<PermObj> search( PermObj permObj ) throws SecurityException
+ List<PermObj> search( PermObj permObj ) throws SecurityException
{
return pDao.findPermissions( permObj );
}
@@ -120,7 +120,7 @@ public final class PermP
* @return List of type Permission Objects containing fully populated matching entities.
* @throws SecurityException in the event of DAO search error.
*/
- final List<PermObj> search( OrgUnit ou, boolean limitSize ) throws SecurityException
+ List<PermObj> search( OrgUnit ou, boolean limitSize ) throws SecurityException
{
return pDao.findPermissions( ou, limitSize );
}
@@ -134,7 +134,7 @@ public final class PermP
* @return List of type Permission containing fully populated matching Permission entities.
* @throws SecurityException in the event of DAO search error.
*/
- final List<Permission> search( Role role ) throws SecurityException
+ List<Permission> search( Role role ) throws SecurityException
{
return pDao.findPermissions( role );
}
@@ -148,7 +148,7 @@ public final class PermP
* @return List of type Permission containing fully populated matching Permission entities.
* @throws SecurityException in the event of DAO search error.
*/
- final List<Permission> search( User user ) throws SecurityException
+ List<Permission> search( User user ) throws SecurityException
{
return pDao.findPermissions( user );
}
@@ -161,7 +161,7 @@ public final class PermP
* @param user contains the userId targeted for attribute removal.
* @throws SecurityException in the event of DAO search error.
*/
- final void remove( User user ) throws SecurityException
+ void remove( User user ) throws SecurityException
{
List<Permission> list;
try
@@ -187,7 +187,7 @@ public final class PermP
* @param role contains the name of Role targeted for attribute removal.
* @throws SecurityException in the event of DAO search error.
*/
- final void remove( Role role ) throws SecurityException
+ void remove( Role role ) throws SecurityException
{
List<Permission> list;
try
@@ -213,7 +213,7 @@ public final class PermP
* @param role contains the name of AdminRole targeted for attribute removal.
* @throws SecurityException in the event of DAO search error.
*/
- final void remove( AdminRole role ) throws SecurityException
+ void remove( AdminRole role ) throws SecurityException
{
List<Permission> list;
try
@@ -241,7 +241,7 @@ public final class PermP
* @return List<Permission> containing permissions (op, obj) active for user's session.
* @throws SecurityException is thrown if runtime error occurs with system.
*/
- final List<Permission> search( Session session ) throws SecurityException
+ List<Permission> search( Session session ) throws SecurityException
{
return search( session, false );
}
@@ -255,7 +255,7 @@ public final class PermP
* @return List<Permission> containing permissions (op, obj) active for user's session.
* @throws org.apache.directory.fortress.core.SecurityException is thrown if runtime error occurs with system.
*/
- final List<Permission> search( Session session, boolean isAdmin )
+ List<Permission> search( Session session, boolean isAdmin )
throws SecurityException
{
return pDao.findPermissions( session, isAdmin );
@@ -269,7 +269,7 @@ public final class PermP
* @return Permission containing fully populated matching object.
* @throws SecurityException is thrown if permission not found or runtime error occurs with system.
*/
- final Permission read( Permission permission ) throws SecurityException
+ Permission read( Permission permission ) throws SecurityException
{
return pDao.getPerm( permission );
}
@@ -282,7 +282,7 @@ public final class PermP
* @return PermObj containing fully populated matching object.
* @throws SecurityException is thrown if perm object not found or runtime error occurs with system.
*/
- final PermObj read( PermObj permObj ) throws SecurityException
+ PermObj read( PermObj permObj ) throws SecurityException
{
return pDao.getPerm( permObj );
}
@@ -297,7 +297,7 @@ public final class PermP
* @return Permission entity copy of input + additional attributes (internalId) that were added by op.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final PermObj add( PermObj entity ) throws SecurityException
+ PermObj add( PermObj entity ) throws SecurityException
{
validate( entity, false );
return pDao.createObject( entity );
@@ -313,7 +313,7 @@ public final class PermP
* @return Permission operation entity copy of input + additional attributes (internalId) that were added by op.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final Permission add( Permission entity ) throws SecurityException
+ Permission add( Permission entity ) throws SecurityException
{
validate( entity, false );
return pDao.createOperation( entity );
@@ -329,7 +329,7 @@ public final class PermP
* @return Permission entity copy of input + additional attributes (internalId) that were updated by op.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final PermObj update( PermObj entity ) throws SecurityException
+ PermObj update( PermObj entity ) throws SecurityException
{
update( entity, true );
return entity;
@@ -366,7 +366,7 @@ public final class PermP
* @return Permission entity copy of input + additional attributes (internalId) that were updated by op.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final Permission update( Permission entity ) throws SecurityException
+ Permission update( Permission entity ) throws SecurityException
{
update( entity, true );
return entity;
@@ -402,7 +402,7 @@ public final class PermP
* @param entity Contains the Permission Object name targeted for deletion.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final void delete( PermObj entity ) throws SecurityException
+ void delete( PermObj entity ) throws SecurityException
{
pDao.deleteObj( entity );
}
@@ -415,7 +415,7 @@ public final class PermP
* @param entity Contains the Permission Operation name targeted for deletion.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final void delete( Permission entity ) throws SecurityException
+ void delete( Permission entity ) throws SecurityException
{
pDao.deleteOperation( entity );
}
@@ -432,7 +432,7 @@ public final class PermP
* @param role contains the role name
* @throws SecurityException Thrown in the event of data validation or system error.
*/
- final void grant( Permission pOp, Role role ) throws SecurityException
+ void grant( Permission pOp, Role role ) throws SecurityException
{
// Now assign it to the perm op:
pDao.grant( pOp, role );
@@ -450,7 +450,7 @@ public final class PermP
* @param role contains role name
* @throws SecurityException Thrown in the event of data validation or system error.
*/
- final void revoke( Permission pOp, Role role ) throws SecurityException
+ void revoke( Permission pOp, Role role ) throws SecurityException
{
pDao.revoke( pOp, role );
}
@@ -463,7 +463,7 @@ public final class PermP
* @param user contains userid of User entity.
* @throws SecurityException Thrown in the event of data validation or system error.
*/
- final void grant( Permission pOp, User user ) throws SecurityException
+ void grant( Permission pOp, User user ) throws SecurityException
{
// call dao to grant userId access to the perm op:
pDao.grant( pOp, user );
@@ -477,7 +477,7 @@ public final class PermP
* @param user contains userid of User entity.
* @throws SecurityException Thrown in the event of data validation or system error.
*/
- final void revoke( Permission pOp, User user ) throws SecurityException
+ void revoke( Permission pOp, User user ) throws SecurityException
{
pDao.revoke( pOp, user );
}
@@ -491,7 +491,7 @@ public final class PermP
* @param isUpdate if true update operation is being performed which specifies a different set of targeted attributes.
* @throws org.apache.directory.fortress.core.ValidationException in the event of data validation error.
*/
- final void validate( PermObj pObj, boolean isUpdate ) throws ValidationException
+ void validate( PermObj pObj, boolean isUpdate ) throws ValidationException
{
if ( !isUpdate )
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/rbac/Permission.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Permission.java b/src/main/java/org/apache/directory/fortress/core/rbac/Permission.java
index b8c11c7..087e44f 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Permission.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Permission.java
@@ -732,14 +732,27 @@ public class Permission extends FortEntity implements Serializable
public boolean equals( Object thatOp )
{
if ( this == thatOp )
+ {
return true;
+ }
+
if ( this.getObjName() == null )
+ {
return false;
+ }
+
if ( !( thatOp instanceof Permission ) )
+ {
return false;
+ }
+
Permission thatPermission = ( Permission ) thatOp;
+
if ( thatPermission.getObjName() == null )
+ {
return false;
+ }
+
return ( ( thatPermission.getObjName().equalsIgnoreCase( this.getObjName() ) ) && ( thatPermission
.getOpName().equalsIgnoreCase( this.getOpName() ) ) );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 fd30a6d..05e2352 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,10 @@ final class PolicyDAO extends ApacheDsDataProvider
*/
private static final String OAM_PWPOLICY_OBJ_CLASS[] =
{
- SchemaConstants.TOP_OC, SchemaConstants.DEVICE_OC, 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";
@@ -147,7 +150,7 @@ final class PolicyDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.CreateException
*
*/
- final PwPolicy create( PwPolicy entity )
+ PwPolicy create( PwPolicy entity )
throws CreateException
{
LdapConnection ld = null;
@@ -265,7 +268,7 @@ final class PolicyDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.UpdateException
*
*/
- final void update( PwPolicy entity ) throws UpdateException
+ void update( PwPolicy entity ) throws UpdateException
{
LdapConnection ld = null;
String dn = getDn( entity );
@@ -406,7 +409,7 @@ final class PolicyDAO extends ApacheDsDataProvider
* @param entity
* @throws org.apache.directory.fortress.core.RemoveException
*/
- final void remove( PwPolicy entity ) throws RemoveException
+ void remove( PwPolicy entity ) throws RemoveException
{
LdapConnection ld = null;
String dn = getDn( entity );
@@ -434,7 +437,7 @@ final class PolicyDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final PwPolicy getPolicy( PwPolicy policy ) throws FinderException
+ PwPolicy getPolicy( PwPolicy policy ) throws FinderException
{
PwPolicy entity = null;
LdapConnection ld = null;
@@ -588,7 +591,7 @@ final class PolicyDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<PwPolicy> findPolicy( PwPolicy policy ) throws FinderException
+ List<PwPolicy> findPolicy( PwPolicy policy ) throws FinderException
{
List<PwPolicy> policyArrayList = new ArrayList<>();
LdapConnection ld = null;
@@ -633,7 +636,7 @@ final class PolicyDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final Set<String> getPolicies( String contextId )
+ Set<String> getPolicies( String contextId )
throws FinderException
{
Set<String> policySet = new TreeSet<>( String.CASE_INSENSITIVE_ORDER );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/rbac/PolicyP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PolicyP.java b/src/main/java/org/apache/directory/fortress/core/rbac/PolicyP.java
index fafd287..ffbfe47 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PolicyP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PolicyP.java
@@ -97,7 +97,7 @@ public final class PolicyP
* @param policy
* @return true if valid, false otherwise.
*/
- final boolean isValid( PwPolicy policy )
+ boolean isValid( PwPolicy policy )
{
boolean result = false;
@@ -129,7 +129,7 @@ public final class PolicyP
* @return PswdPolicy entity returns fully populated with attributes.
* @throws SecurityException In the event policy entry not found, data validation or system error.
*/
- final PwPolicy read( PwPolicy policy ) throws SecurityException
+ PwPolicy read( PwPolicy policy ) throws SecurityException
{
// Call the finder method for the primary key.
return olDao.getPolicy( policy );
@@ -143,7 +143,7 @@ public final class PolicyP
* @param policy Object contains the password policy attributes.
* @throws SecurityException In the event of data validation or system error.
*/
- final void add( PwPolicy policy ) throws SecurityException
+ void add( PwPolicy policy ) throws SecurityException
{
validate( policy );
olDao.create( policy );
@@ -174,7 +174,7 @@ public final class PolicyP
* be updated. null attributes will be ignored.
* @throws SecurityException In the event policy not found , data validation or system error.
*/
- final void update( PwPolicy policy ) throws SecurityException
+ void update( PwPolicy policy ) throws SecurityException
{
validate( policy );
olDao.update( policy );
@@ -189,7 +189,7 @@ public final class PolicyP
* @param policy Object must contain the name of the policy entity.
* @throws SecurityException In the event policy entity not found or system error.
*/
- final void delete( PwPolicy policy ) throws SecurityException
+ void delete( PwPolicy policy ) throws SecurityException
{
olDao.remove( policy );
@@ -219,7 +219,7 @@ public final class PolicyP
* @return List<PswdPolicy> contains all matching password policy entities. If no records found this will be empty.
* @throws SecurityException In the event of data validation or system error.
*/
- final List<PwPolicy> search( PwPolicy policy ) throws SecurityException
+ List<PwPolicy> search( PwPolicy policy ) throws SecurityException
{
return olDao.findPolicy( policy );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 7a00936..c00a473 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
@@ -159,8 +159,11 @@ public final class PsoUtil
String name = ou.getName();
iOUs.add( name );
Set<String> parents = HierUtil.getAscendants( name, getGraph( contextId ) );
+
if ( VUtil.isNotNullOrEmpty( parents ) )
+ {
iOUs.addAll( parents );
+ }
}
}
return iOUs;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 537cfc9..9ef5fe8 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
@@ -137,7 +137,7 @@ final class RoleDAO extends ApacheDsDataProvider
* @return
* @throws CreateException
*/
- final Role create( Role entity ) throws CreateException
+ Role create( Role entity ) throws CreateException
{
LdapConnection ld = null;
String dn = getDn( entity.getName(), entity.getContextId() );
@@ -186,7 +186,7 @@ final class RoleDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.UpdateException
*
*/
- final Role update( Role entity ) throws UpdateException
+ Role update( Role entity ) throws UpdateException
{
LdapConnection ld = null;
String dn = getDn( entity.getName(), entity.getContextId() );
@@ -262,7 +262,7 @@ final class RoleDAO extends ApacheDsDataProvider
* @param entity
* @throws UpdateException
*/
- final void deleteParent( Role entity ) throws UpdateException
+ void deleteParent( Role entity ) throws UpdateException
{
LdapConnection ld = null;
String dn = getDn( entity.getName(), entity.getContextId() );
@@ -293,7 +293,7 @@ final class RoleDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.UpdateException
*
*/
- final Role assign( Role entity, String userDn ) throws UpdateException
+ Role assign( Role entity, String userDn ) throws UpdateException
{
LdapConnection ld = null;
String dn = getDn( entity.getName(), entity.getContextId() );
@@ -329,7 +329,7 @@ final class RoleDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.UpdateException
*
*/
- final Role deassign( Role entity, String userDn ) throws UpdateException
+ Role deassign( Role entity, String userDn ) throws UpdateException
{
LdapConnection ld = null;
String dn = getDn( entity.getName(), entity.getContextId() );
@@ -360,7 +360,7 @@ final class RoleDAO extends ApacheDsDataProvider
* @param role
* @throws RemoveException
*/
- final void remove( Role role )
+ void remove( Role role )
throws RemoveException
{
LdapConnection ld = null;
@@ -389,7 +389,7 @@ final class RoleDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final Role getRole( Role role )
+ Role getRole( Role role )
throws FinderException
{
Role entity = null;
@@ -435,7 +435,7 @@ final class RoleDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<Role> findRoles( Role role )
+ List<Role> findRoles( Role role )
throws FinderException
{
List<Role> roleList = new ArrayList<>();
@@ -484,7 +484,7 @@ final class RoleDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<String> findRoles( Role role, int limit )
+ List<String> findRoles( Role role, int limit )
throws FinderException
{
List<String> roleList = new ArrayList<>();
@@ -533,7 +533,7 @@ final class RoleDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final List<String> findAssignedRoles( String userDn, String contextId )
+ List<String> findAssignedRoles( String userDn, String contextId )
throws FinderException
{
List<String> roleNameList = new ArrayList<>();
@@ -578,7 +578,7 @@ final class RoleDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final List<Graphable> getAllDescendants( String contextId )
+ List<Graphable> getAllDescendants( String contextId )
throws FinderException
{
String[] DESC_ATRS =
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/rbac/RoleP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/RoleP.java b/src/main/java/org/apache/directory/fortress/core/rbac/RoleP.java
index 750c2c8..1e49dd6 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/RoleP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/RoleP.java
@@ -52,6 +52,7 @@ public final class RoleP
{
private static RoleDAO rDao = new RoleDAO();
+
/**
* Package private
*/
@@ -68,7 +69,7 @@ public final class RoleP
* @return Role entity containing all attributes associated with Role in directory.
* @throws SecurityException in the event Role not found or DAO search error.
*/
- final Role read( Role role ) throws SecurityException
+ Role read( Role role ) throws SecurityException
{
return rDao.getRole( role );
}
@@ -81,7 +82,7 @@ public final class RoleP
* @return List of type Role containing fully populated matching RBAC Role entities. If no records found this will be empty.
* @throws SecurityException in the event of DAO search error.
*/
- final List<Role> search( Role role ) throws SecurityException
+ List<Role> search( Role role ) throws SecurityException
{
return rDao.findRoles( role );
}
@@ -96,7 +97,7 @@ public final class RoleP
* @return List of type String containing RBAC Role name of all matching User entities. If no records found this will be empty.
* @throws SecurityException in the event of DAO search error.
*/
- final List<String> search( Role role, int limit ) throws SecurityException
+ List<String> search( Role role, int limit ) throws SecurityException
{
return rDao.findRoles( role, limit );
}
@@ -109,7 +110,7 @@ public final class RoleP
* @return List of type Role containing {@link Role#name} and {@link Role#parents} populated.
* @throws SecurityException in the event of DAO search error.
*/
- final List<Graphable> getAllDescendants( String contextId ) throws SecurityException
+ List<Graphable> getAllDescendants( String contextId ) throws SecurityException
{
return rDao.getAllDescendants( contextId );
}
@@ -123,7 +124,7 @@ public final class RoleP
* @return Role entity copy of input + additional attributes (internalId) that were added by op.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final Role add( Role entity ) throws SecurityException
+ Role add( Role entity ) throws SecurityException
{
validate( entity );
return rDao.create( entity );
@@ -138,7 +139,7 @@ public final class RoleP
* @return Role entity contains fully populated updated entity.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final Role update( Role entity ) throws SecurityException
+ Role update( Role entity ) throws SecurityException
{
validate( entity );
return rDao.update( entity );
@@ -152,7 +153,7 @@ public final class RoleP
* @param entity Role entity contains data targeted for updating.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final void deleteParent( Role entity ) throws SecurityException
+ void deleteParent( Role entity ) throws SecurityException
{
validate( entity );
rDao.deleteParent( entity );
@@ -167,7 +168,7 @@ public final class RoleP
* @return Role containing copy of input data.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final Role assign( Role entity, String userDn ) throws SecurityException
+ Role assign( Role entity, String userDn ) throws SecurityException
{
return rDao.assign( entity, userDn );
}
@@ -181,7 +182,7 @@ public final class RoleP
* @return Role containing copy of input data.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final Role deassign( Role entity, String userDn ) throws SecurityException
+ Role deassign( Role entity, String userDn ) throws SecurityException
{
entity = rDao.deassign( entity, userDn );
return entity;
@@ -197,7 +198,7 @@ public final class RoleP
* @param contextId maps to sub-tree in DIT, for example ou=contextId, dc=jts, dc = com.
* @throws SecurityException in the event of DAO search error.
*/
- final void addOccupant( List<UserRole> uRoles, String userDn, String contextId ) throws SecurityException
+ void addOccupant( List<UserRole> uRoles, String userDn, String contextId ) throws SecurityException
{
if ( VUtil.isNotNullOrEmpty( uRoles ) )
{
@@ -219,7 +220,7 @@ public final class RoleP
* @param contextId maps to sub-tree in DIT, for example ou=contextId, dc=jts, dc = com.
* @throws SecurityException in the event of DAO search error.
*/
- final void removeOccupant( String userDn, String contextId ) throws SecurityException
+ void removeOccupant( String userDn, String contextId ) throws SecurityException
{
List<String> list;
try
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 190535d..904090b 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
@@ -182,7 +182,9 @@ public final class RoleUtil
iRoles.add( rleName );
Set<String> parents = HierUtil.getAscendants( rleName, getGraph( contextId ) );
if ( VUtil.isNotNullOrEmpty( parents ) )
+ {
iRoles.addAll( parents );
+ }
}
}
return iRoles;
@@ -206,7 +208,9 @@ public final class RoleUtil
iRoles.add( role );
Set<String> parents = HierUtil.getAscendants( role, getGraph( contextId ) );
if ( VUtil.isNotNullOrEmpty( parents ) )
+ {
iRoles.addAll( parents );
+ }
}
}
return iRoles;
@@ -230,7 +234,9 @@ public final class RoleUtil
iRoles.add( role );
Set<String> children = HierUtil.getDescendants( role, getGraph( contextId ) );
if ( VUtil.isNotNullOrEmpty( children ) )
+ {
iRoles.addAll( children );
+ }
}
}
return iRoles;
@@ -305,7 +311,7 @@ public final class RoleUtil
inHier.setContextId( contextId );
LOG.info( "loadGraph initializing ROLE context [{}]", inHier.getContextId() );
List<Graphable> descendants = null;
-
+
try
{
descendants = roleP.getAllDescendants( inHier.getContextId() );
@@ -314,13 +320,13 @@ public final class RoleUtil
{
LOG.info( "loadGraph caught SecurityException={}", se );
}
-
+
Hier hier = HierUtil.loadHier( contextId, descendants );
SimpleDirectedGraph<String, Relationship> graph;
-
+
graph = HierUtil.buildGraph( hier );
roleCache.put( getKey( contextId ), graph );
-
+
return graph;
}
@@ -333,12 +339,12 @@ public final class RoleUtil
private static String getKey( String contextId )
{
String key = HierUtil.Type.ROLE.toString();
-
+
if ( VUtil.isNotNullOrEmpty( contextId ) && !contextId.equalsIgnoreCase( GlobalIds.NULL ) )
{
key += ":" + contextId;
}
-
+
return key;
}
@@ -351,14 +357,14 @@ public final class RoleUtil
private static SimpleDirectedGraph<String, Relationship> getGraph( String contextId )
{
ReadWriteLock hierLock = HierUtil.getLock( contextId, HierUtil.Type.ROLE );
- String key = getKey( contextId ) ;
-
+ String key = getKey( contextId );
+
try
{
hierLock.readLock().lock();
SimpleDirectedGraph<String, Relationship> graph = ( SimpleDirectedGraph<String, Relationship> ) roleCache
.get( key );
-
+
if ( graph == null )
{
try
@@ -371,9 +377,9 @@ public final class RoleUtil
//if ( graph == null )
//{
- graph = loadGraph( contextId );
+ graph = loadGraph( contextId );
//}
-
+
hierLock.readLock().lock();
}
finally
@@ -381,7 +387,7 @@ public final class RoleUtil
hierLock.writeLock().unlock();
}
}
-
+
return graph;
}
finally
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 3d91b3b..020a7ba 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
@@ -144,7 +144,7 @@ final class SdDAO extends ApacheDsDataProvider
* @return
* @throws org.apache.directory.fortress.core.CreateException
*/
- final SDSet create( SDSet entity ) throws CreateException
+ SDSet create( SDSet entity ) throws CreateException
{
LdapConnection ld = null;
String dn = getDn( entity.getName(), entity.getContextId() );
@@ -206,7 +206,7 @@ final class SdDAO extends ApacheDsDataProvider
* @return
* @throws org.apache.directory.fortress.core.UpdateException
*/
- final SDSet update( SDSet entity ) throws UpdateException
+ SDSet update( SDSet entity ) throws UpdateException
{
LdapConnection ld = null;
String dn = getDn( entity.getName(), entity.getContextId() );
@@ -264,7 +264,7 @@ final class SdDAO extends ApacheDsDataProvider
* @param entity
* @throws org.apache.directory.fortress.core.RemoveException
*/
- final SDSet remove( SDSet entity ) throws RemoveException
+ SDSet remove( SDSet entity ) throws RemoveException
{
LdapConnection ld = null;
String dn = getDn( entity.getName(), entity.getContextId() );
@@ -304,7 +304,7 @@ final class SdDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final SDSet getSD( SDSet sdSet ) throws FinderException
+ SDSet getSD( SDSet sdSet ) throws FinderException
{
SDSet entity = null;
LdapConnection ld = null;
@@ -357,7 +357,7 @@ final class SdDAO extends ApacheDsDataProvider
* @return List of matching SDSets.
* @throws org.apache.directory.fortress.core.FinderException
*/
- final List<SDSet> search( SDSet sdset ) throws FinderException
+ List<SDSet> search( SDSet sdset ) throws FinderException
{
List<SDSet> sdList = new ArrayList<>();
LdapConnection ld = null;
@@ -430,7 +430,7 @@ final class SdDAO extends ApacheDsDataProvider
* @return
* @throws org.apache.directory.fortress.core.FinderException
*/
- final List<SDSet> search( Role role, SDSet.SDType type ) throws FinderException
+ List<SDSet> search( Role role, SDSet.SDType type ) throws FinderException
{
List<SDSet> sdList = new ArrayList<>();
LdapConnection ld = null;
@@ -539,7 +539,7 @@ final class SdDAO extends ApacheDsDataProvider
* @return
* @throws org.apache.directory.fortress.core.FinderException
*/
- final Set<SDSet> search( Set<String> roles, SDSet sdSet ) throws FinderException
+ Set<SDSet> search( Set<String> roles, SDSet sdSet ) throws FinderException
{
Set<SDSet> sdList = new HashSet<>();
LdapConnection ld = null;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/rbac/SdP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/SdP.java b/src/main/java/org/apache/directory/fortress/core/rbac/SdP.java
index 9f690f2..aa342c5 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/SdP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/SdP.java
@@ -76,7 +76,7 @@ public final class SdP
* @return SDSet entity copy of input + additional attributes (internalId) that were added by op.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final SDSet add( SDSet entity ) throws SecurityException
+ SDSet add( SDSet entity ) throws SecurityException
{
validate( entity );
return sdDao.create( entity );
@@ -93,7 +93,7 @@ public final class SdP
* @return SDSet entity copy of input + additional attributes (internalId) that were updated by op.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final SDSet update( SDSet entity ) throws SecurityException
+ SDSet update( SDSet entity ) throws SecurityException
{
validate( entity );
return sdDao.update( entity );
@@ -109,7 +109,7 @@ public final class SdP
* @return SDSet is a copy of entity.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final SDSet delete( SDSet entity ) throws SecurityException
+ SDSet delete( SDSet entity ) throws SecurityException
{
return sdDao.remove( entity );
}
@@ -123,7 +123,7 @@ public final class SdP
* @return SDSet entity containing all attributes associated with ou in directory.
* @throws SecurityException in the event SDSet not found or DAO search error.
*/
- final SDSet read( SDSet entity ) throws SecurityException
+ SDSet read( SDSet entity ) throws SecurityException
{
SDSet sde;
// The assumption is this method is called from ReviewMgr.ssdRoleSetRoles or ReviewMgr.dsdRoleSetRoles.
@@ -144,7 +144,7 @@ public final class SdP
* @return List of SDSet entities found.
* @throws SecurityException in the event of DAO search error.
*/
- final List<SDSet> search( SDSet sdSet ) throws SecurityException
+ List<SDSet> search( SDSet sdSet ) throws SecurityException
{
return sdDao.search( sdSet );
}
@@ -159,7 +159,7 @@ public final class SdP
* @return List of SDSet entities found.
* @throws SecurityException in the event of DAO search error.
*/
- final List<SDSet> search( Role role, SDSet.SDType type ) throws SecurityException
+ List<SDSet> search( Role role, SDSet.SDType type ) throws SecurityException
{
return sdDao.search( role, type );
}
@@ -174,7 +174,7 @@ public final class SdP
* @return List of SDSet entities found.
* @throws SecurityException in the event of DAO search error.
*/
- final Set<SDSet> search( Set<String> rls, SDSet sdSet ) throws SecurityException
+ Set<SDSet> search( Set<String> rls, SDSet sdSet ) throws SecurityException
{
return sdDao.search( rls, sdSet );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/rbac/User.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/User.java b/src/main/java/org/apache/directory/fortress/core/rbac/User.java
index 2e03651..239962d 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/User.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/User.java
@@ -386,8 +386,11 @@ public class User extends FortEntity implements Constraint, Serializable
public User( String userId, char[] password )
{
this.userId = userId;
+
if ( password != null )
+ {
this.password = password.clone();
+ }
}
@@ -401,8 +404,12 @@ public class User extends FortEntity implements Constraint, Serializable
public User( String userId, char[] password, String roleName )
{
this.userId = userId;
+
if ( password != null )
+ {
this.password = password.clone();
+ }
+
setRole( new UserRole( roleName ) );
}
@@ -417,8 +424,11 @@ public class User extends FortEntity implements Constraint, Serializable
public User( String userId, char[] password, String[] roleNames )
{
this.userId = userId;
+
if ( password != null )
+ {
this.password = password.clone();
+ }
if ( roleNames != null )
{
@@ -441,8 +451,12 @@ public class User extends FortEntity implements Constraint, Serializable
public User( String userId, char[] password, String roleName, String ou )
{
this.userId = userId;
+
if ( password != null )
+ {
this.password = password.clone();
+ }
+
setRole( new UserRole( roleName ) );
this.ou = ou;
}
@@ -1619,7 +1633,9 @@ public class User extends FortEntity implements Constraint, Serializable
public void setJpegPhoto( byte[] jpegPhoto )
{
if ( jpegPhoto != null )
+ {
this.jpegPhoto = jpegPhoto.clone();
+ }
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/rbac/UserAdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/UserAdminRole.java b/src/main/java/org/apache/directory/fortress/core/rbac/UserAdminRole.java
index 5331716..529230a 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/UserAdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/UserAdminRole.java
@@ -253,26 +253,55 @@ public class UserAdminRole extends UserRole implements Administrator
sb.append( GlobalIds.DELIMITER );
sb.append( this.getTimeout() );
sb.append( GlobalIds.DELIMITER );
+
if ( this.getBeginTime() != null )
+ {
sb.append( this.getBeginTime() );
+ }
+
sb.append( GlobalIds.DELIMITER );
+
if ( this.getEndTime() != null )
+ {
sb.append( this.getEndTime() );
+ }
+
sb.append( GlobalIds.DELIMITER );
+
if ( this.getBeginDate() != null )
+ {
sb.append( this.getBeginDate() );
+ }
+
sb.append( GlobalIds.DELIMITER );
+
if ( this.getEndDate() != null )
+ {
sb.append( this.getEndDate() );
+ }
+
sb.append( GlobalIds.DELIMITER );
+
if ( this.getBeginLockDate() != null )
+ {
sb.append( this.getBeginLockDate() );
+
+ }
+
sb.append( GlobalIds.DELIMITER );
+
if ( this.getEndLockDate() != null )
+ {
sb.append( this.getEndLockDate() );
+ }
+
sb.append( GlobalIds.DELIMITER );
+
if ( this.getDayMask() != null )
+ {
sb.append( this.getDayMask() );
+ }
+
if ( this.getOsU() != null )
{
for ( String org : this.getOsU() )
@@ -283,6 +312,7 @@ public class UserAdminRole extends UserRole implements Administrator
sb.append( org );
}
}
+
if ( this.getOsP() != null )
{
for ( String org : this.getOsP() )
@@ -613,6 +643,7 @@ public class UserAdminRole extends UserRole implements Administrator
.equalsIgnoreCase( this.getUserId() ) ) );
}
+
@Override
public int hashCode()
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 2d4c660..bb999aa 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
@@ -388,7 +388,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws CreateException
*/
- final User create( User entity ) throws CreateException
+ User create( User entity ) throws CreateException
{
LdapConnection ld = null;
@@ -530,7 +530,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws UpdateException
*/
- final User update( User entity ) throws UpdateException
+ User update( User entity ) throws UpdateException
{
LdapConnection ld = null;
String userDn = getDn( entity.getUserId(), entity.getContextId() );
@@ -655,7 +655,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws UpdateException
*/
- final User updateProps( User entity, boolean replace ) throws UpdateException
+ User updateProps( User entity, boolean replace ) throws UpdateException
{
LdapConnection ld = null;
String userDn = getDn( entity.getUserId(), entity.getContextId() );
@@ -697,7 +697,7 @@ final class UserDAO extends ApacheDsDataProvider
* @param user
* @throws RemoveException
*/
- final String remove( User user ) throws RemoveException
+ String remove( User user ) throws RemoveException
{
LdapConnection ld = null;
String userDn = getDn( user.getUserId(), user.getContextId() );
@@ -725,7 +725,7 @@ final class UserDAO extends ApacheDsDataProvider
* @param user
* @throws org.apache.directory.fortress.core.UpdateException
*/
- final void lock( User user ) throws UpdateException
+ void lock( User user ) throws UpdateException
{
LdapConnection ld = null;
String userDn = getDn( user.getUserId(), user.getContextId() );
@@ -754,7 +754,7 @@ final class UserDAO extends ApacheDsDataProvider
* @param user
* @throws UpdateException
*/
- final void unlock( User user ) throws UpdateException
+ void unlock( User user ) throws UpdateException
{
LdapConnection ld = null;
String userDn = getDn( user.getUserId(), user.getContextId() );
@@ -789,7 +789,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws org.apache.directory.fortress.core.FinderException
*/
- final User getUser( User user, boolean isRoles ) throws FinderException
+ User getUser( User user, boolean isRoles ) throws FinderException
{
User entity = null;
LdapConnection ld = null;
@@ -860,7 +860,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws org.apache.directory.fortress.core.FinderException
*/
- final List<UserAdminRole> getUserAdminRoles( User user ) throws FinderException
+ List<UserAdminRole> getUserAdminRoles( User user ) throws FinderException
{
List<UserAdminRole> roles = null;
LdapConnection ld = null;
@@ -896,7 +896,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws org.apache.directory.fortress.core.FinderException
*/
- final List<String> getRoles( User user ) throws FinderException
+ List<String> getRoles( User user ) throws FinderException
{
List<String> roles = null;
LdapConnection ld = null;
@@ -940,7 +940,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws org.apache.directory.fortress.core.FinderException, org.apache.directory.fortress.core.PasswordException
*/
- final Session checkPassword( User user ) throws FinderException, PasswordException
+ Session checkPassword( User user ) throws FinderException, PasswordException
{
Session session = null;
LdapConnection ld = null;
@@ -1115,7 +1115,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final List<User> findUsers( User user ) throws FinderException
+ List<User> findUsers( User user ) throws FinderException
{
List<User> userList = new ArrayList<>();
LdapConnection ld = null;
@@ -1159,7 +1159,8 @@ final class UserDAO extends ApacheDsDataProvider
}
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), DEFAULT_ATRS, false,
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(),
+ DEFAULT_ATRS, false,
GlobalIds.BATCH_SIZE );
long sequence = 0;
@@ -1193,7 +1194,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final List<String> findUsers( User user, int limit ) throws FinderException
+ List<String> findUsers( User user, int limit ) throws FinderException
{
List<String> userList = new ArrayList<>();
LdapConnection ld = null;
@@ -1212,7 +1213,8 @@ final class UserDAO extends ApacheDsDataProvider
filterbuf.append( "*))" );
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), USERID, false, GlobalIds
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), USERID,
+ false, GlobalIds
.BATCH_SIZE, limit );
while ( searchResults.next() )
@@ -1245,7 +1247,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final List<User> getAuthorizedUsers( Role role ) throws FinderException
+ List<User> getAuthorizedUsers( Role role ) throws FinderException
{
List<User> userList = new ArrayList<>();
LdapConnection ld = null;
@@ -1290,7 +1292,8 @@ final class UserDAO extends ApacheDsDataProvider
filterbuf.append( ")" );
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), DEFAULT_ATRS, false,
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(),
+ DEFAULT_ATRS, false,
GlobalIds.BATCH_SIZE );
long sequence = 0;
@@ -1325,7 +1328,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final List<User> getAssignedUsers( Role role ) throws FinderException
+ List<User> getAssignedUsers( Role role ) throws FinderException
{
List<User> userList = new ArrayList<>();
LdapConnection ld = null;
@@ -1344,7 +1347,8 @@ final class UserDAO extends ApacheDsDataProvider
filterbuf.append( "))" );
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), DEFAULT_ATRS, false,
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(),
+ DEFAULT_ATRS, false,
GlobalIds.BATCH_SIZE );
long sequence = 0;
@@ -1379,7 +1383,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final Set<String> getAssignedUsers( Set<String> roles, String contextId ) throws FinderException
+ Set<String> getAssignedUsers( Set<String> roles, String contextId ) throws FinderException
{
Set<String> userSet = new HashSet<>();
LdapConnection ld = null;
@@ -1411,7 +1415,8 @@ final class UserDAO extends ApacheDsDataProvider
filterbuf.append( "))" );
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), USERID_ATRS, false,
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), USERID_ATRS,
+ false,
GlobalIds.BATCH_SIZE );
while ( searchResults.next() )
@@ -1443,7 +1448,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final List<User> getAssignedUsers( AdminRole role ) throws FinderException
+ List<User> getAssignedUsers( AdminRole role ) throws FinderException
{
List<User> userList = new ArrayList<>();
LdapConnection ld = null;
@@ -1462,7 +1467,8 @@ final class UserDAO extends ApacheDsDataProvider
filterbuf.append( "))" );
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), DEFAULT_ATRS, false,
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(),
+ DEFAULT_ATRS, false,
GlobalIds.BATCH_SIZE );
long sequence = 0;
@@ -1498,7 +1504,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final List<String> getAuthorizedUsers( Role role, int limit ) throws FinderException
+ List<String> getAuthorizedUsers( Role role, int limit ) throws FinderException
{
List<String> userList = new ArrayList<>();
LdapConnection ld = null;
@@ -1517,7 +1523,8 @@ final class UserDAO extends ApacheDsDataProvider
filterbuf.append( "))" );
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), USERID, false, GlobalIds
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), USERID,
+ false, GlobalIds
.BATCH_SIZE, limit );
while ( searchResults.next() )
@@ -1552,7 +1559,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final List<String> findUsersList( String searchVal, String contextId ) throws FinderException
+ List<String> findUsersList( String searchVal, String contextId ) throws FinderException
{
List<String> userList = new ArrayList<>();
LdapConnection ld = null;
@@ -1571,7 +1578,8 @@ final class UserDAO extends ApacheDsDataProvider
filterbuf.append( "*))" );
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), DEFAULT_ATRS, false,
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(),
+ DEFAULT_ATRS, false,
GlobalIds.BATCH_SIZE );
long sequence = 0;
@@ -1604,7 +1612,7 @@ final class UserDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final List<User> findUsers( OrgUnit ou, boolean limitSize ) throws FinderException
+ List<User> findUsers( OrgUnit ou, boolean limitSize ) throws FinderException
{
List<User> userList = new ArrayList<>();
LdapConnection ld = null;
@@ -1633,7 +1641,8 @@ final class UserDAO extends ApacheDsDataProvider
}
ld = getAdminConnection();
- SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(), DEFAULT_ATRS, false,
+ SearchCursor searchResults = search( ld, userRoot, SearchScope.ONELEVEL, filterbuf.toString(),
+ DEFAULT_ATRS, false,
GlobalIds.BATCH_SIZE, maxLimit );
long sequence = 0;
@@ -1669,7 +1678,7 @@ final class UserDAO extends ApacheDsDataProvider
* @throws SecurityException
* @throws PasswordException
*/
- final boolean changePassword( User entity, char[] newPassword ) throws SecurityException
+ boolean changePassword( User entity, char[] newPassword ) throws SecurityException
{
boolean rc = true;
LdapConnection ld = null;
@@ -1731,7 +1740,7 @@ final class UserDAO extends ApacheDsDataProvider
* @param user
* @throws UpdateException
*/
- final void resetUserPassword( User user ) throws UpdateException
+ void resetUserPassword( User user ) throws UpdateException
{
LdapConnection ld = null;
String userDn = getDn( user.getUserId(), user.getContextId() );
@@ -1767,7 +1776,7 @@ final class UserDAO extends ApacheDsDataProvider
* @throws UpdateException
* @throws FinderException
*/
- final String assign( UserRole uRole ) throws UpdateException, FinderException
+ String assign( UserRole uRole ) throws UpdateException, FinderException
{
LdapConnection ld = null;
String userDn = getDn( uRole.getUserId(), uRole.getContextId() );
@@ -1815,7 +1824,7 @@ final class UserDAO extends ApacheDsDataProvider
* @throws UpdateException
* @throws FinderException
*/
- final String deassign( UserRole uRole ) throws UpdateException, FinderException
+ String deassign( UserRole uRole ) throws UpdateException, FinderException
{
LdapConnection ld = null;
String userDn = getDn( uRole.getUserId(), uRole.getContextId() );
@@ -1880,7 +1889,7 @@ final class UserDAO extends ApacheDsDataProvider
* @throws UpdateException
* @throws FinderException
*/
- final String assign( UserAdminRole uRole ) throws UpdateException, FinderException
+ String assign( UserAdminRole uRole ) throws UpdateException, FinderException
{
LdapConnection ld = null;
String userDn = getDn( uRole.getUserId(), uRole.getContextId() );
@@ -1925,7 +1934,7 @@ final class UserDAO extends ApacheDsDataProvider
* @throws UpdateException
* @throws FinderException
*/
- final String deassign( UserAdminRole uRole ) throws UpdateException, FinderException
+ String deassign( UserAdminRole uRole ) throws UpdateException, FinderException
{
LdapConnection ld = null;
String userDn = getDn( uRole.getUserId(), uRole.getContextId() );
@@ -1994,7 +2003,7 @@ final class UserDAO extends ApacheDsDataProvider
* @throws UpdateException
* @throws Exception
*/
- final String deletePwPolicy( User user ) throws UpdateException
+ String deletePwPolicy( User user ) throws UpdateException
{
LdapConnection ld = null;
String userDn = getDn( user.getUserId(), user.getContextId() );
[3/5] directory-fortress-core git commit: o Fixed many Sonar warnings
o Renamed the Organizat*ii*onalUnitDAO class
Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html b/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
index 18b9800..0b6d9ab 100644
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
@@ -21,15 +21,15 @@
<HTML>
<HEAD>
<title>Apache Fortress Ten Minute Guide</title>
- <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+ <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style"/>
</HEAD>
<BODY>
<p>
<h3>Overview</h3>
The documents linked by this guide provide the instructions to download, build and install Apache Fortress software from source.
It takes about ten minutes after completing the steps on this page.
- <br><br>
-<hr>
+ <br/><br/>
+<hr/>
<h4>Steps</h4>
<fieldset>
<legend><b>Navigation Links</b></legend>
@@ -80,9 +80,9 @@ cd directory-fortress-core/
</pre>
Where [directory-fortress-core] is base folder of the fortress core source package.
</li>
- <br>
+ <br/>
<li>Set java and maven home env variables.</li>
- <br>
+ <br/>
<li>Build the core source:
<pre>
@@ -113,14 +113,14 @@ mvn javadoc:javadoc
</li>
<li>Point your web browser to the javadoc:
- <br>file:///[directory-fortress-core]/target/site/apidocs/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html.
- <br><br>Where [directory-fortress-core] is base folder of the fortress core source package.
+ <br/>file:///[directory-fortress-core]/target/site/apidocs/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html.
+ <br/><br/>Where [directory-fortress-core] is base folder of the fortress core source package.
</li>
- <br>
+ <br/>
<li>Complete the sections under 'Navigation Links'</li>
</ol>
-<hr>
+<hr/>
<h4>Infrastructure Installed</h4>
<ol type="1">
<li><a href="http://directory.apache.org/apacheds/">Apache Directory Server</a></li>
@@ -129,7 +129,7 @@ mvn javadoc:javadoc
<li><a href="http://tomcat.apache.org/">Apache Tomcat Servlet Container</a></li>
</ol>
</p>
-<hr>
+<hr/>
If you find security flaws, or have questions about Apache Fortress, submit to <a href="http://mail-archives.apache.org/mod_mbox/directory-fortress/">Apache Fortress Discussion list</a>.
</BODY>
<p style="font: monospace; color: black; font-size: 6pt">Copyright 2003-2015, The Apache Software Foundation. All Rights Reserved.</p>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 1167b84..599cc7c 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
@@ -51,7 +51,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.exception.LdapInvalidDnException;
import org.apache.directory.api.ldap.model.exception.LdapOperationErrorException;
-import org.apache.directory.api.ldap.model.exception.LdapReferralException;
import org.apache.directory.api.ldap.model.message.BindRequest;
import org.apache.directory.api.ldap.model.message.BindRequestImpl;
import org.apache.directory.api.ldap.model.message.BindResponse;
@@ -105,7 +104,7 @@ public abstract class ApacheDsDataProvider
private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
private static final int MAX_DEPTH = 100;
- private static final LdapCounters counters = new LdapCounters();
+ private static final LdapCounters COUNTERS = new LdapCounters();
// Used for slapd access log {@link org.apache.directory.fortress.core.rbacAuditDAO}
private static final String LDAP_LOG_POOL_UID = "log.admin.user";
@@ -172,10 +171,12 @@ public abstract class ApacheDsDataProvider
config.setUseSsl( IS_SSL );
//config.setTrustManagers( new NoVerificationTrustManager() );
- if ( IS_SSL && VUtil.isNotNullOrEmpty( GlobalIds.TRUST_STORE ) && VUtil.isNotNullOrEmpty( GlobalIds.TRUST_STORE_PW ) )
+ if ( IS_SSL && VUtil.isNotNullOrEmpty( GlobalIds.TRUST_STORE )
+ && VUtil.isNotNullOrEmpty( GlobalIds.TRUST_STORE_PW ) )
{
// validate certificates but allow self-signed certs if within this truststore:
- config.setTrustManagers( new LdapClientTrustStoreManager( GlobalIds.TRUST_STORE, GlobalIds.TRUST_STORE_PW.toCharArray(), null,
+ config.setTrustManagers( new LdapClientTrustStoreManager( GlobalIds.TRUST_STORE, GlobalIds.TRUST_STORE_PW
+ .toCharArray(), null,
true ) );
}
@@ -246,10 +247,12 @@ public abstract class ApacheDsDataProvider
logConfig.setUseSsl( IS_SSL );
- if ( IS_SSL && VUtil.isNotNullOrEmpty( GlobalIds.TRUST_STORE ) && VUtil.isNotNullOrEmpty( GlobalIds.TRUST_STORE_PW ) )
+ if ( IS_SSL && VUtil.isNotNullOrEmpty( GlobalIds.TRUST_STORE )
+ && VUtil.isNotNullOrEmpty( GlobalIds.TRUST_STORE_PW ) )
{
// validate certificates but allow self-signed certs if within this truststore:
- logConfig.setTrustManagers( new LdapClientTrustStoreManager( GlobalIds.TRUST_STORE, GlobalIds.TRUST_STORE_PW.toCharArray(),
+ logConfig.setTrustManagers( new LdapClientTrustStoreManager( GlobalIds.TRUST_STORE,
+ GlobalIds.TRUST_STORE_PW.toCharArray(),
null, true ) );
}
@@ -348,7 +351,7 @@ public abstract class ApacheDsDataProvider
*/
protected Entry read( LdapConnection connection, String dn, String[] attrs ) throws LdapException
{
- counters.incrementRead();
+ COUNTERS.incrementRead();
return connection.lookup( dn, attrs );
}
@@ -365,7 +368,7 @@ public abstract class ApacheDsDataProvider
*/
protected Entry read( LdapConnection connection, Dn dn, String[] attrs ) throws LdapException
{
- counters.incrementRead();
+ COUNTERS.incrementRead();
return connection.lookup( dn, attrs );
}
@@ -386,7 +389,7 @@ public abstract class ApacheDsDataProvider
*/
protected Entry read( LdapConnection connection, String dn, String[] attrs, String userDn ) throws LdapException
{
- counters.incrementRead();
+ COUNTERS.incrementRead();
return connection.lookup( dn, attrs );
}
@@ -401,7 +404,7 @@ public abstract class ApacheDsDataProvider
*/
protected void add( LdapConnection connection, Entry entry ) throws LdapException
{
- counters.incrementAdd();
+ COUNTERS.incrementAdd();
connection.add( entry );
}
@@ -416,7 +419,7 @@ public abstract class ApacheDsDataProvider
*/
protected void add( LdapConnection connection, Entry entry, FortEntity entity ) throws LdapException
{
- counters.incrementAdd();
+ COUNTERS.incrementAdd();
if ( GlobalIds.IS_AUDIT && ( entity != null ) && ( entity.getAdminSession() != null ) )
{
@@ -450,7 +453,7 @@ public abstract class ApacheDsDataProvider
*/
protected void modify( LdapConnection connection, String dn, List<Modification> mods ) throws LdapException
{
- counters.incrementMod();
+ COUNTERS.incrementMod();
connection.modify( dn, mods.toArray( new Modification[]
{} ) );
}
@@ -466,7 +469,7 @@ public abstract class ApacheDsDataProvider
*/
protected void modify( LdapConnection connection, Dn dn, List<Modification> mods ) throws LdapException
{
- counters.incrementMod();
+ COUNTERS.incrementMod();
connection.modify( dn, mods.toArray( new Modification[]
{} ) );
}
@@ -484,7 +487,7 @@ public abstract class ApacheDsDataProvider
protected void modify( LdapConnection connection, String dn, List<Modification> mods,
FortEntity entity ) throws LdapException
{
- counters.incrementMod();
+ COUNTERS.incrementMod();
audit( mods, entity );
connection.modify( dn, mods.toArray( new Modification[]
{} ) );
@@ -503,7 +506,7 @@ public abstract class ApacheDsDataProvider
protected void modify( LdapConnection connection, Dn dn, List<Modification> mods,
FortEntity entity ) throws LdapException
{
- counters.incrementMod();
+ COUNTERS.incrementMod();
audit( mods, entity );
connection.modify( dn, mods.toArray( new Modification[]
{} ) );
@@ -519,7 +522,7 @@ public abstract class ApacheDsDataProvider
*/
protected void delete( LdapConnection connection, String dn ) throws LdapException
{
- counters.incrementDelete();
+ COUNTERS.incrementDelete();
connection.delete( dn );
}
@@ -536,7 +539,7 @@ public abstract class ApacheDsDataProvider
*/
protected void delete( LdapConnection connection, String dn, FortEntity entity ) throws LdapException
{
- counters.incrementDelete();
+ COUNTERS.incrementDelete();
List<Modification> mods = new ArrayList<Modification>();
audit( mods, entity );
@@ -561,7 +564,7 @@ public abstract class ApacheDsDataProvider
*/
protected void delete( LdapConnection connection, Dn dn, FortEntity entity ) throws LdapException
{
- counters.incrementDelete();
+ COUNTERS.incrementDelete();
List<Modification> mods = new ArrayList<Modification>();
audit( mods, entity );
@@ -668,7 +671,7 @@ public abstract class ApacheDsDataProvider
}
// delete the node:
- counters.incrementDelete();
+ COUNTERS.incrementDelete();
delete( connection, dn );
}
@@ -724,7 +727,7 @@ public abstract class ApacheDsDataProvider
protected SearchCursor search( LdapConnection connection, String baseDn, SearchScope scope, String filter,
String[] attrs, boolean attrsOnly ) throws LdapException
{
- counters.incrementSearch();
+ COUNTERS.incrementSearch();
SearchRequest searchRequest = new SearchRequestImpl();
searchRequest.setBase( new Dn( baseDn ) );
@@ -756,7 +759,7 @@ public abstract class ApacheDsDataProvider
protected SearchCursor search( LdapConnection connection, String baseDn, SearchScope scope, String filter,
String[] attrs, boolean attrsOnly, int batchSize ) throws LdapException
{
- counters.incrementSearch();
+ COUNTERS.incrementSearch();
SearchRequest searchRequest = new SearchRequestImpl();
@@ -792,7 +795,7 @@ public abstract class ApacheDsDataProvider
protected SearchCursor search( LdapConnection connection, String baseDn, SearchScope scope, String filter,
String[] attrs, boolean attrsOnly, int batchSize, int maxEntries ) throws LdapException
{
- counters.incrementSearch();
+ COUNTERS.incrementSearch();
SearchRequest searchRequest = new SearchRequestImpl();
@@ -870,7 +873,7 @@ public abstract class ApacheDsDataProvider
protected Entry searchNode( LdapConnection connection, String baseDn, SearchScope scope, String filter,
String[] attrs, boolean attrsOnly, String userDn ) throws LdapException, CursorException, IOException
{
- counters.incrementSearch();
+ COUNTERS.incrementSearch();
SearchRequest searchRequest = new SearchRequestImpl();
@@ -913,7 +916,7 @@ public abstract class ApacheDsDataProvider
protected boolean compareNode( LdapConnection connection, String dn, String userDn,
Attribute attribute ) throws LdapException, UnsupportedEncodingException
{
- counters.incrementCompare();
+ COUNTERS.incrementCompare();
CompareRequest compareRequest = new CompareRequestImpl();
compareRequest.setName( new Dn( dn ) );
@@ -1409,11 +1412,11 @@ public abstract class ApacheDsDataProvider
*/
protected BindResponse bind( LdapConnection connection, String szUserDn, char[] password ) throws LdapException
{
- counters.incrementBind();
+ COUNTERS.incrementBind();
Dn userDn = new Dn( szUserDn );
BindRequest bindReq = new BindRequestImpl();
bindReq.setDn( userDn );
- bindReq.setCredentials( new String ( password ) );
+ bindReq.setCredentials( new String( password ) );
bindReq.addControl( PP_REQ_CTRL );
return connection.bind( bindReq );
}
@@ -1540,6 +1543,6 @@ public abstract class ApacheDsDataProvider
*/
public static LdapCounters getLdapCounters()
{
- return counters;
+ return COUNTERS;
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizatiionalUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizatiionalUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizatiionalUnitDAO.java
deleted file mode 100644
index 3882808..0000000
--- a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizatiionalUnitDAO.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-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;
-import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.fortress.core.CreateException;
-import org.apache.directory.fortress.core.RemoveException;
-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.GlobalErrIds;
-import org.apache.directory.fortress.core.GlobalIds;
-import org.apache.directory.fortress.core.util.attr.VUtil;
-
-
-/**
- * This class provides data access for the standard ldap object class Organizational Unit. This
- * entity is used to provide containers in DIT for organization of related nodes..
- * A container node is used to group other related nodes, i.e. 'ou=People' or 'ou'Roles'.
- * <br />The organizational unit object class is 'organizationalUnit' <br />
- * <p/>
- * The OrganizationalUnitDAO maintains the following structural object class:
- * <p/>
- * organizationalUnit Structural Object Class is used to store basic attributes like ou and description.
- * <ul>
- * <li> ------------------------------------------
- * <li> <code>objectclass ( 2.5.6.5 NAME 'organizationalUnit'</code>
- * <li> <code>DESC 'RFC2256: an organizational unit'</code>
- * <li> <code>SUP top STRUCTURAL</code>
- * <li> <code>MUST ou</code>
- * <li> <code>MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $</code>
- * <li> <code>x121Address $ registeredAddress $ destinationIndicator $</code>
- * <li> <code>preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $</code>
- * <li> <code>telephoneNumber $ internationaliSDNNumber $</code>
- * <li> <code>facsimileTelephoneNumber $ street $ postOfficeBox $ postalCode $</code>
- * <li> <code>postalAddress $ physicalDeliveryOfficeName $ st $ l $ description ) )</code>
- * <li> ------------------------------------------
- * </ul>
- * <p/>
- * This class is thread safe.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
-final class OrganizationalUnitDAO extends ApacheDsDataProvider
-{
- private static final String CLS_NM = OrganizationalUnitDAO.class.getName();
- private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
- //private static final String ORGUNIT_CLASS = "organizationalunit";
-/*
- private static final String[] ORGUNIT_OBJ_CLASS =
- {
- ORGUNIT_CLASS
- };
-*/
-
-
- /**
- * Package private default constructor.
- */
- OrganizationalUnitDAO()
- {
- }
-
-
- private String getSdRoot( String contextId )
- {
- return getRootDn( contextId, GlobalIds.SUFFIX );
- }
-
-
- /**
- * @param oe
- * @throws org.apache.directory.fortress.core.CreateException
- */
- final void create( OrganizationalUnit oe )
- throws CreateException
- {
- LdapConnection ld = null;
- String nodeDn = SchemaConstants.OU_AT + "=" + oe.getName() + ",";
-
- if ( VUtil.isNotNullOrEmpty( oe.getParent() ) )
- {
- nodeDn += SchemaConstants.OU_AT + "=" + oe.getParent() + ",";
- }
-
- nodeDn += getRootDn( oe.getContextId() );
-
- try
- {
- LOG.info( "create container dn [{}]", nodeDn );
-
- Entry myEntry = new DefaultEntry( nodeDn,
- SchemaConstants.OBJECT_CLASS, SchemaConstants.ORGANIZATIONAL_UNIT_OC,
- SchemaConstants.OU_AT, oe.getName(),
- SchemaConstants.DESCRIPTION_AT, oe.getDescription() );
-
- ld = getAdminConnection();
- add( ld, myEntry );
- }
- catch ( LdapException e )
- {
- String error = "create container node dn [" + nodeDn + "] caught LDAPException="
- + e.getMessage();
- throw new CreateException( GlobalErrIds.CNTR_CREATE_FAILED, error, e );
- }
- finally
- {
- closeAdminConnection( ld );
- }
- }
-
-
- /**
- * @param oe
- * @throws org.apache.directory.fortress.core.RemoveException
- */
- final void remove( OrganizationalUnit oe )
- throws RemoveException
- {
- LdapConnection ld = null;
- String nodeDn = SchemaConstants.OU_AT + "=" + oe.getName() + ",";
-
- if ( VUtil.isNotNullOrEmpty( oe.getParent() ) )
- {
- nodeDn += SchemaConstants.OU_AT + "=" + oe.getParent() + ",";
- }
-
- nodeDn += getRootDn( oe.getContextId(), GlobalIds.SUFFIX );
-
- LOG.info( "remove container dn [{}]", nodeDn );
-
- try
- {
- ld = getAdminConnection();
- deleteRecursive( ld, nodeDn );
- }
- catch ( CursorException e )
- {
- String error = "remove container node dn [" + nodeDn + "] caught CursorException="
- + e.getMessage();
- throw new RemoveException( GlobalErrIds.CNTR_DELETE_FAILED, error, e );
- }
- catch ( LdapException e )
- {
- String error = "remove container node dn [" + nodeDn + "] caught LDAPException="
- + e.getMessage();
- throw new RemoveException( GlobalErrIds.CNTR_DELETE_FAILED, error, e );
- }
- finally
- {
- closeAdminConnection( ld );
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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
new file mode 100644
index 0000000..2177306
--- /dev/null
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitDAO.java
@@ -0,0 +1,178 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+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;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.fortress.core.CreateException;
+import org.apache.directory.fortress.core.RemoveException;
+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.GlobalErrIds;
+import org.apache.directory.fortress.core.GlobalIds;
+import org.apache.directory.fortress.core.util.attr.VUtil;
+
+
+/**
+ * This class provides data access for the standard ldap object class Organizational Unit. This
+ * entity is used to provide containers in DIT for organization of related nodes..
+ * A container node is used to group other related nodes, i.e. 'ou=People' or 'ou'Roles'.
+ * <br />The organizational unit object class is 'organizationalUnit' <br />
+ * <p/>
+ * The OrganizationalUnitDAO maintains the following structural object class:
+ * <p/>
+ * organizationalUnit Structural Object Class is used to store basic attributes like ou and description.
+ * <ul>
+ * <li> ------------------------------------------
+ * <li> <code>objectclass ( 2.5.6.5 NAME 'organizationalUnit'</code>
+ * <li> <code>DESC 'RFC2256: an organizational unit'</code>
+ * <li> <code>SUP top STRUCTURAL</code>
+ * <li> <code>MUST ou</code>
+ * <li> <code>MAY ( userPassword $ searchGuide $ seeAlso $ businessCategory $</code>
+ * <li> <code>x121Address $ registeredAddress $ destinationIndicator $</code>
+ * <li> <code>preferredDeliveryMethod $ telexNumber $ teletexTerminalIdentifier $</code>
+ * <li> <code>telephoneNumber $ internationaliSDNNumber $</code>
+ * <li> <code>facsimileTelephoneNumber $ street $ postOfficeBox $ postalCode $</code>
+ * <li> <code>postalAddress $ physicalDeliveryOfficeName $ st $ l $ description ) )</code>
+ * <li> ------------------------------------------
+ * </ul>
+ * <p/>
+ * This class is thread safe.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+final class OrganizationalUnitDAO extends ApacheDsDataProvider
+{
+ private static final String CLS_NM = OrganizationalUnitDAO.class.getName();
+ private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
+
+
+ //private static final String ORGUNIT_CLASS = "organizationalunit";
+ /*
+ private static final String[] ORGUNIT_OBJ_CLASS =
+ {
+ ORGUNIT_CLASS
+ };
+ */
+
+ /**
+ * Package private default constructor.
+ */
+ OrganizationalUnitDAO()
+ {
+ }
+
+
+ private String getSdRoot( String contextId )
+ {
+ return getRootDn( contextId, GlobalIds.SUFFIX );
+ }
+
+
+ /**
+ * @param oe
+ * @throws org.apache.directory.fortress.core.CreateException
+ */
+ void create( OrganizationalUnit oe )
+ throws CreateException
+ {
+ LdapConnection ld = null;
+ String nodeDn = SchemaConstants.OU_AT + "=" + oe.getName() + ",";
+
+ if ( VUtil.isNotNullOrEmpty( oe.getParent() ) )
+ {
+ nodeDn += SchemaConstants.OU_AT + "=" + oe.getParent() + ",";
+ }
+
+ nodeDn += getRootDn( oe.getContextId() );
+
+ try
+ {
+ LOG.info( "create container dn [{}]", nodeDn );
+
+ Entry myEntry = new DefaultEntry( nodeDn,
+ SchemaConstants.OBJECT_CLASS, SchemaConstants.ORGANIZATIONAL_UNIT_OC,
+ SchemaConstants.OU_AT, oe.getName(),
+ SchemaConstants.DESCRIPTION_AT, oe.getDescription() );
+
+ ld = getAdminConnection();
+ add( ld, myEntry );
+ }
+ catch ( LdapException e )
+ {
+ String error = "create container node dn [" + nodeDn + "] caught LDAPException="
+ + e.getMessage();
+ throw new CreateException( GlobalErrIds.CNTR_CREATE_FAILED, error, e );
+ }
+ finally
+ {
+ closeAdminConnection( ld );
+ }
+ }
+
+
+ /**
+ * @param oe
+ * @throws org.apache.directory.fortress.core.RemoveException
+ */
+ void remove( OrganizationalUnit oe )
+ throws RemoveException
+ {
+ LdapConnection ld = null;
+ String nodeDn = SchemaConstants.OU_AT + "=" + oe.getName() + ",";
+
+ if ( VUtil.isNotNullOrEmpty( oe.getParent() ) )
+ {
+ nodeDn += SchemaConstants.OU_AT + "=" + oe.getParent() + ",";
+ }
+
+ nodeDn += getRootDn( oe.getContextId(), GlobalIds.SUFFIX );
+
+ LOG.info( "remove container dn [{}]", nodeDn );
+
+ try
+ {
+ ld = getAdminConnection();
+ deleteRecursive( ld, nodeDn );
+ }
+ catch ( CursorException e )
+ {
+ String error = "remove container node dn [" + nodeDn + "] caught CursorException="
+ + e.getMessage();
+ throw new RemoveException( GlobalErrIds.CNTR_DELETE_FAILED, error, e );
+ }
+ catch ( LdapException e )
+ {
+ String error = "remove container node dn [" + nodeDn + "] caught LDAPException="
+ + e.getMessage();
+ throw new RemoveException( GlobalErrIds.CNTR_DELETE_FAILED, error, e );
+ }
+ finally
+ {
+ closeAdminConnection( ld );
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/ldap/group/Group.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/group/Group.java b/src/main/java/org/apache/directory/fortress/core/ldap/group/Group.java
index 87689ec..88152c3 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/group/Group.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/group/Group.java
@@ -35,8 +35,9 @@ import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
+
@XmlRootElement(name = "fortGroup")
-@XmlAccessorType( XmlAccessType.FIELD)
+@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "group", propOrder =
{
"name",
@@ -44,7 +45,7 @@ import java.util.StringTokenizer;
"protocol",
"members",
"props",
- })
+})
public class Group extends FortEntity implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -55,6 +56,7 @@ public class Group extends FortEntity implements Serializable
private Props props = new Props();
boolean memberDn;
+
/**
* Default constructor used by {@link org.apache.directory.fortress.core.ant.FortressAntTask}
*/
@@ -62,6 +64,7 @@ public class Group extends FortEntity implements Serializable
{
}
+
/**
* Generate instance of group to be loaded as ldap object.
*
@@ -72,6 +75,7 @@ public class Group extends FortEntity implements Serializable
this.name = name;
}
+
/**
* Generate instance of group to be loaded as ldap object.
*
@@ -84,6 +88,7 @@ public class Group extends FortEntity implements Serializable
this.description = description;
}
+
/**
* Get the second level qualifier on the domain component. This attribute is required.
*
@@ -94,16 +99,18 @@ public class Group extends FortEntity implements Serializable
return name;
}
+
/**
* Set the second level qualifier on the domain component. This attribute is required.
*
* @param name maps to 'dcObject' object class.
*/
- public void setName(String name)
+ public void setName( String name )
{
this.name = name;
}
+
/**
* Get the description for the domain component. This value is not required or constrained
* but is validated on reasonability.
@@ -115,17 +122,19 @@ public class Group extends FortEntity implements Serializable
return description;
}
+
/**
* Set the description for the domain component. This value is not required or constrained
* but is validated on reasonability.
*
* @param description maps to 'o' attribute on 'dcObject'.
*/
- public void setDescription(String description)
+ public void setDescription( String description )
{
this.description = description;
}
+
/**
* Get protocol qualifier for this entity.
*
@@ -136,6 +145,7 @@ public class Group extends FortEntity implements Serializable
return protocol;
}
+
/**
* Set the protocol qualifier for this entity.
*
@@ -146,6 +156,7 @@ public class Group extends FortEntity implements Serializable
this.protocol = protocol;
}
+
/**
* Add a single userId as member of this entity.
*
@@ -160,6 +171,7 @@ public class Group extends FortEntity implements Serializable
members.add( userId );
}
+
/**
* Return the members
*
@@ -170,6 +182,7 @@ public class Group extends FortEntity implements Serializable
return members;
}
+
/**
* Set a member on this entity using a comma delimited String.
*
@@ -177,12 +190,12 @@ public class Group extends FortEntity implements Serializable
*/
public void setMembers( String members )
{
- if (members != null)
+ if ( members != null )
{
- StringTokenizer tkn = new StringTokenizer(members, ",");
- if (tkn.countTokens() > 0)
+ StringTokenizer tkn = new StringTokenizer( members, "," );
+ if ( tkn.countTokens() > 0 )
{
- while (tkn.hasMoreTokens())
+ while ( tkn.hasMoreTokens() )
{
String member = tkn.nextToken();
setMember( member );
@@ -191,6 +204,7 @@ public class Group extends FortEntity implements Serializable
}
}
+
/**
* Set members onto this entity using a List of userIds.
*
@@ -201,6 +215,7 @@ public class Group extends FortEntity implements Serializable
this.members = members;
}
+
/**
* Add name/value pair to list of properties associated with PermObj. These values are not constrained by Fortress.
* Properties are optional.
@@ -216,6 +231,7 @@ public class Group extends FortEntity implements Serializable
this.props.getEntry().add( entry );
}
+
/**
* Get a name/value pair attribute from list of properties associated with PermObj. These values are not constrained by Fortress.
* Properties are optional.
@@ -240,6 +256,7 @@ public class Group extends FortEntity implements Serializable
return value;
}
+
/**
* Replace teh collection of name/value pairs to attributes associated with Group entity. These values are not constrained by Fortress.
* Properties are optional.
@@ -252,7 +269,7 @@ public class Group extends FortEntity implements Serializable
{
// reset the existing properties stored in this entity.
props = new Props();
-
+
for ( Enumeration<?> e = properties.propertyNames(); e.hasMoreElements(); )
{
// This LDAP attr is stored as a name-value pair separated by a ':'.
@@ -263,6 +280,7 @@ public class Group extends FortEntity implements Serializable
}
}
+
/**
* Add new collection of name=value pairs to attributes associated with Group. These values are not constrained by Fortress.
* Properties are optional.
@@ -274,6 +292,7 @@ public class Group extends FortEntity implements Serializable
setProperties( AttrHelper.getProperties( properties, '=', "," ) );
}
+
/**
* Return the collection of name/value pairs to attributes associated with PermObj. These values are not constrained by Fortress.
* Properties are optional.
@@ -298,13 +317,14 @@ public class Group extends FortEntity implements Serializable
return properties;
}
+
public List<String> getPropList()
{
List<Props.Entry> props = this.props.getEntry();
List<String> propList = null;
if ( props.size() > 0 )
{
- propList = new ArrayList<>( );
+ propList = new ArrayList<>();
for ( Props.Entry entry : props )
{
String key = entry.getKey();
@@ -316,6 +336,7 @@ public class Group extends FortEntity implements Serializable
return propList;
}
+
/**
* Gets the value of the Props property. This method is used by Fortress and En Masse and should not be called by external programs.
*
@@ -327,6 +348,7 @@ public class Group extends FortEntity implements Serializable
return props;
}
+
/**
* Sets the value of the Props property. This method is used by Fortress and En Masse and should not be called by external programs.
*
@@ -340,6 +362,7 @@ public class Group extends FortEntity implements Serializable
this.props = props;
}
+
/**
* Set if userDn's are loaded in dn format.
*
@@ -350,6 +373,7 @@ public class Group extends FortEntity implements Serializable
return memberDn;
}
+
/**
* Set to 'true' if members are in dn format.
*
@@ -360,6 +384,7 @@ public class Group extends FortEntity implements Serializable
this.memberDn = memberDn;
}
+
@Override
public boolean equals( Object o )
{
@@ -374,33 +399,36 @@ public class Group extends FortEntity implements Serializable
Group group = ( Group ) o;
-/*
- if ( description != null ? !description.equals( group.description ) : group.description != null )
- {
- return false;
- }
- if ( members != null ? !members.equals( group.members ) : group.members != null )
+ /*
+ if ( description != null ? !description.equals( group.description ) : group.description != null )
+ {
+ return false;
+ }
+ if ( members != null ? !members.equals( group.members ) : group.members != null )
+ {
+ return false;
+ }
+ */
+ if ( name == null )
{
return false;
}
-*/
- if(name == null)
- return false;
if ( !name.equals( group.name ) )
{
return false;
}
-/*
- if ( protocol != null ? !protocol.equals( group.protocol ) : group.protocol != null )
- {
- return false;
- }
-*/
+ /*
+ if ( protocol != null ? !protocol.equals( group.protocol ) : group.protocol != null )
+ {
+ return false;
+ }
+ */
return true;
}
+
@Override
public int hashCode()
{
@@ -412,6 +440,7 @@ public class Group extends FortEntity implements Serializable
return result;
}
+
@Override
public String toString()
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 a182780..7984065 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
@@ -52,6 +52,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
import java.util.ArrayList;
import java.util.List;
+
/**
* Contains the Group node for LDAP Directory Information Tree.
* This class is thread safe.
@@ -68,8 +69,16 @@ 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[] = {SchemaConstants.TOP_OC, GROUP_OBJECT_CLASS_IMPL};
- private static final String[] GROUP_ATRS = {SchemaConstants.CN_AT, SchemaConstants.DESCRIPTION_AT, 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,
+ SchemaConstants.DESCRIPTION_AT,
+ GROUP_PROTOCOL_ATTR_IMPL,
+ GROUP_PROPERTY_ATTR_IMPL,
+ SchemaConstants.MEMBER_AT };
+
/**
* Package private default constructor.
@@ -78,31 +87,32 @@ final class GroupDAO extends ApacheDsDataProvider
{
}
+
/**
* @param group
* @throws org.apache.directory.fortress.core.CreateException
*
*/
- final Group create( Group group ) throws CreateException
+ Group create( Group group ) throws CreateException
{
LdapConnection ld = null;
String nodeDn = getDn( group.getName(), group.getContextId() );
-
+
try
{
LOG.debug( "create group dn [{}]", nodeDn );
Entry myEntry = new DefaultEntry( nodeDn );
myEntry.add( SchemaConstants.OBJECT_CLASS_AT, GROUP_OBJ_CLASS );
- myEntry.add( SchemaConstants.CN_AT , group.getName() );
+ 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, '=' );
-
+
if ( VUtil.isNotNullOrEmpty( group.getDescription() ) )
{
myEntry.add( SchemaConstants.DESCRIPTION_AT, group.getDescription() );
}
-
+
ld = getAdminConnection();
add( ld, myEntry );
}
@@ -115,7 +125,7 @@ final class GroupDAO extends ApacheDsDataProvider
{
closeAdminConnection( ld );
}
-
+
return group;
}
@@ -126,31 +136,31 @@ final class GroupDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.CreateException
*
*/
- final Group update( Group group ) throws FinderException, UpdateException
+ Group update( Group group ) throws FinderException, UpdateException
{
LdapConnection ld = null;
String nodeDn = getDn( group.getName(), group.getContextId() );
-
+
try
{
LOG.debug( "update group dn [{}]", nodeDn );
List<Modification> mods = new ArrayList<Modification>();
-
+
if ( VUtil.isNotNullOrEmpty( group.getDescription() ) )
{
mods.add( new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.DESCRIPTION_AT, group.getDescription() ) );
}
-
+
if ( VUtil.isNotNullOrEmpty( group.getProtocol() ) )
{
mods.add( new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, GROUP_PROTOCOL_ATTR_IMPL, group.getProtocol() ) );
}
-
+
loadAttrs( group.getMembers(), mods, SchemaConstants.MEMBER_AT );
loadProperties( group.getProperties(), mods, GROUP_PROPERTY_ATTR_IMPL, true, '=' );
-
+
if ( mods.size() > 0 )
{
ld = getAdminConnection();
@@ -169,11 +179,12 @@ final class GroupDAO extends ApacheDsDataProvider
return get( group );
}
- final Group add( Group group, String key, String value ) throws FinderException, CreateException
+
+ Group add( Group group, String key, String value ) throws FinderException, CreateException
{
LdapConnection ld = null;
String nodeDn = getDn( group.getName(), group.getContextId() );
-
+
try
{
LOG.debug( "add group property dn [{}], key [{}], value [{}]", nodeDn, key, value );
@@ -192,16 +203,16 @@ final class GroupDAO extends ApacheDsDataProvider
{
closeAdminConnection( ld );
}
-
+
return get( group );
}
- final Group delete( Group group, String key, String value ) throws FinderException, RemoveException
+ Group delete( Group group, String key, String value ) throws FinderException, RemoveException
{
LdapConnection ld = null;
String nodeDn = getDn( group.getName(), group.getContextId() );
-
+
try
{
LOG.debug( "delete group property dn [{}], key [{}], value [{}]", nodeDn, key, value );
@@ -223,6 +234,7 @@ final class GroupDAO extends ApacheDsDataProvider
return get( group );
}
+
/**
* This method will remove group node from diretory.
*
@@ -230,7 +242,7 @@ final class GroupDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.RemoveException
*
*/
- final Group remove( Group group ) throws RemoveException
+ Group remove( Group group ) throws RemoveException
{
LdapConnection ld = null;
String nodeDn = getDn( group.getName(), group.getContextId() );
@@ -258,6 +270,7 @@ final class GroupDAO extends ApacheDsDataProvider
return group;
}
+
/**
* @param entity
* @param userDn
@@ -265,7 +278,7 @@ final class GroupDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.UpdateException
*
*/
- final Group assign( Group entity, String userDn ) throws FinderException, UpdateException
+ Group assign( Group entity, String userDn ) throws FinderException, UpdateException
{
LdapConnection ld = null;
String dn = getDn( entity.getName(), entity.getContextId() );
@@ -291,6 +304,7 @@ final class GroupDAO extends ApacheDsDataProvider
return get( entity );
}
+
/**
* @param entity
* @param userDn
@@ -298,12 +312,12 @@ final class GroupDAO extends ApacheDsDataProvider
* @throws org.apache.directory.fortress.core.UpdateException
*
*/
- final Group deassign( Group entity, String userDn ) throws FinderException, UpdateException
+ Group deassign( Group entity, String userDn ) throws FinderException, UpdateException
{
LdapConnection ld = null;
String dn = getDn( entity.getName(), entity.getContextId() );
LOG.debug( "deassign group property dn [{}], member dn [{}]", dn, userDn );
-
+
try
{
List<Modification> mods = new ArrayList<Modification>();
@@ -323,22 +337,23 @@ final class GroupDAO extends ApacheDsDataProvider
{
closeAdminConnection( ld );
}
-
+
return get( entity );
}
+
/**
* @param group
* @return
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final Group get( Group group ) throws FinderException
+ Group get( Group group ) throws FinderException
{
Group entity = null;
LdapConnection ld = null;
String dn = getDn( group.getName(), group.getContextId() );
-
+
try
{
ld = getAdminConnection();
@@ -367,24 +382,26 @@ final class GroupDAO extends ApacheDsDataProvider
return entity;
}
+
/**
* @param group
* @return
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<Group> find( Group group ) throws FinderException
+ List<Group> find( Group group ) throws FinderException
{
List<Group> groupList = new ArrayList<>();
LdapConnection ld = null;
SearchCursor searchResults;
String groupRoot = getRootDn( group.getContextId(), GlobalIds.GROUP_ROOT );
String filter = null;
-
+
try
{
String searchVal = encodeSafeText( group.getName(), GlobalIds.ROLE_LEN );
- filter = GlobalIds.FILTER_PREFIX + GROUP_OBJECT_CLASS_IMPL + ")(" + SchemaConstants.CN_AT + "=" + 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 );
@@ -408,33 +425,35 @@ final class GroupDAO extends ApacheDsDataProvider
{
closeAdminConnection( ld );
}
-
+
return groupList;
}
+
/**
* @param user
* @return
* @throws org.apache.directory.fortress.core.FinderException
*
*/
- final List<Group> find( User user ) throws FinderException
+ List<Group> find( User user ) throws FinderException
{
List<Group> groupList = new ArrayList<>();
LdapConnection ld = null;
SearchCursor searchResults;
String groupRoot = getRootDn( user.getContextId(), GlobalIds.GROUP_ROOT );
String filter = null;
-
+
try
{
encodeSafeText( user.getUserId(), GlobalIds.USERID_LEN );
- filter = GlobalIds.FILTER_PREFIX + GROUP_OBJECT_CLASS_IMPL + ")(" + SchemaConstants.MEMBER_AT + "=" + user.getDn() + "))";
+ filter = GlobalIds.FILTER_PREFIX + GROUP_OBJECT_CLASS_IMPL + ")(" + SchemaConstants.MEMBER_AT + "="
+ + user.getDn() + "))";
ld = getAdminConnection();
searchResults = search( ld, groupRoot, SearchScope.ONELEVEL, filter, GROUP_ATRS, false,
GlobalIds.BATCH_SIZE );
long sequence = 0;
-
+
while ( searchResults.next() )
{
groupList.add( unloadLdapEntry( searchResults.getEntry(), sequence++ ) );
@@ -454,10 +473,10 @@ final class GroupDAO extends ApacheDsDataProvider
{
closeAdminConnection( ld );
}
-
+
return groupList;
}
-
+
/**
* @param le
@@ -476,10 +495,10 @@ final class GroupDAO extends ApacheDsDataProvider
entity.setMemberDn( true );
entity.setProperties( AttrHelper.getProperties( getAttributes( le, GROUP_PROPERTY_ATTR_IMPL ), '=' ) );
entity.setSequenceId( sequence );
-
+
return entity;
}
-
+
private String getDn( String name, String contextId )
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgrImpl.java
index 5e5d192..cb0ad9d 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgrImpl.java
@@ -44,7 +44,7 @@ import java.util.List;
public class GroupMgrImpl extends Manageable implements GroupMgr
{
private static final String CLS_NM = GroupMgrImpl.class.getName();
- private static final GroupP groupP = new GroupP();
+ private static final GroupP GROUP_P = new GroupP();
/**
* Create a new group node. Must have a name and at least one member.
@@ -65,7 +65,7 @@ public class GroupMgrImpl extends Manageable implements GroupMgr
loadUserDns( group );
}
- return groupP.add( group );
+ return GROUP_P.add( group );
}
/**
@@ -84,7 +84,7 @@ public class GroupMgrImpl extends Manageable implements GroupMgr
assertContext(CLS_NM, methodName, group, GlobalErrIds.GROUP_NULL);
checkAccess(CLS_NM, methodName);
- return groupP.update( group );
+ return GROUP_P.update( group );
}
/**
@@ -101,7 +101,7 @@ public class GroupMgrImpl extends Manageable implements GroupMgr
assertContext(CLS_NM, methodName, group, GlobalErrIds.GROUP_NULL);
checkAccess(CLS_NM, methodName);
- return groupP.delete( group );
+ return GROUP_P.delete( group );
}
/**
@@ -119,7 +119,7 @@ public class GroupMgrImpl extends Manageable implements GroupMgr
assertContext(CLS_NM, methodName, group, GlobalErrIds.GROUP_NULL);
checkAccess(CLS_NM, methodName);
- return groupP.add( group, key, value );
+ return GROUP_P.add( group, key, value );
}
/**
@@ -137,7 +137,7 @@ public class GroupMgrImpl extends Manageable implements GroupMgr
assertContext(CLS_NM, methodName, group, GlobalErrIds.GROUP_NULL);
checkAccess(CLS_NM, methodName);
- return groupP.delete( group, key, value );
+ return GROUP_P.delete( group, key, value );
}
/**
@@ -154,7 +154,7 @@ public class GroupMgrImpl extends Manageable implements GroupMgr
assertContext(CLS_NM, methodName, group, GlobalErrIds.GROUP_NULL);
checkAccess(CLS_NM, methodName);
- return groupP.read( group );
+ return GROUP_P.read( group );
}
/**
@@ -171,7 +171,7 @@ public class GroupMgrImpl extends Manageable implements GroupMgr
assertContext(CLS_NM, methodName, group, GlobalErrIds.GROUP_NULL);
checkAccess(CLS_NM, methodName);
- return groupP.search( group );
+ return GROUP_P.search( group );
}
/**
@@ -188,7 +188,7 @@ public class GroupMgrImpl extends Manageable implements GroupMgr
checkAccess(CLS_NM, methodName);
loadUserDn( user );
- return groupP.search( user );
+ return GROUP_P.search( user );
}
/**
@@ -208,7 +208,7 @@ public class GroupMgrImpl extends Manageable implements GroupMgr
ReviewMgr reviewMgr = ReviewMgrFactory.createInstance();
User user = reviewMgr.readUser( new User( member ) );
- return groupP.assign( group, user.getDn() );
+ return GROUP_P.assign( group, user.getDn() );
}
/**
@@ -228,7 +228,7 @@ public class GroupMgrImpl extends Manageable implements GroupMgr
ReviewMgr reviewMgr = ReviewMgrFactory.createInstance();
User user = reviewMgr.readUser( new User( member ) );
- return groupP.deassign( group, user.getDn() );
+ return GROUP_P.deassign( group, user.getDn() );
}
private void loadUserDns( Group group ) throws SecurityException
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupP.java b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupP.java
index 8fea1c7..45151f2 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupP.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupP.java
@@ -45,6 +45,7 @@ final class GroupP
private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
private static GroupDAO gDao = new GroupDAO();
+
/**
* Add a group node to the Directory Information Tree (DIT).
*
@@ -52,13 +53,14 @@ final class GroupP
* @throws org.apache.directory.fortress.core.SecurityException
* in event of validation or system error.
*/
- final Group add( Group group ) throws SecurityException
+ Group add( Group group ) throws SecurityException
{
validate( group );
-
+
return gDao.create( group );
}
+
/**
* Modify a group node within the Directory Information Tree (DIT).
*
@@ -66,24 +68,26 @@ final class GroupP
* @throws org.apache.directory.fortress.core.SecurityException
* in event of validation or system error.
*/
- final Group update( Group group ) throws SecurityException
+ Group update( Group group ) throws SecurityException
{
validate( group );
-
+
return gDao.update( group );
}
+
/**
* Remove the group node.
*
* @param group contains the group entity for target node.
* @throws SecurityException in event of validation or system error.
*/
- final Group delete( Group group ) throws SecurityException
+ Group delete( Group group ) throws SecurityException
{
return gDao.remove( group );
}
+
/**
* Add a new property to an existing Group
*
@@ -94,11 +98,12 @@ final class GroupP
* @throws org.apache.directory.fortress.core.SecurityException
*
*/
- final Group add( Group group, String key, String value ) throws SecurityException
+ Group add( Group group, String key, String value ) throws SecurityException
{
return gDao.add( group, key, value );
}
+
/**
* Remove an existing property value from an existing Group
*
@@ -109,11 +114,12 @@ final class GroupP
* @throws org.apache.directory.fortress.core.SecurityException
*
*/
- final Group delete( Group group, String key, String value ) throws SecurityException
+ Group delete( Group group, String key, String value ) throws SecurityException
{
return gDao.delete( group, key, value );
}
+
/**
* Method will add the "member" attribute on LDAP entry which represents a Group assignment.
*
@@ -122,11 +128,12 @@ final class GroupP
* @return Group containing copy of input data.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final Group assign( Group entity, String userDn ) throws SecurityException
+ Group assign( Group entity, String userDn ) throws SecurityException
{
return gDao.assign( entity, userDn );
}
+
/**
* Method will remove the "member" attribute on LDAP entry which represents a Group assignment.
*
@@ -135,11 +142,12 @@ final class GroupP
* @return Role containing copy of input data.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final Group deassign( Group entity, String userDn ) throws SecurityException
+ Group deassign( Group entity, String userDn ) throws SecurityException
{
return gDao.deassign( entity, userDn );
}
+
/**
* Return a fully populated Group entity for a given name. If matching record not found a
* SecurityException will be thrown.
@@ -148,11 +156,12 @@ final class GroupP
* @return Group entity containing all attributes associated.
* @throws SecurityException in the event not found or DAO search error.
*/
- final Group read( Group group ) throws SecurityException
+ Group read( Group group ) throws SecurityException
{
return gDao.get( group );
}
+
/**
* Takes a search string that contains full or partial Group name in directory.
*
@@ -160,11 +169,12 @@ final class GroupP
* @return List of type Group containing fully populated matching entities. If no records found this will be empty.
* @throws SecurityException in the event of DAO search error.
*/
- final List<Group> search( Group group ) throws SecurityException
+ List<Group> search( Group group ) throws SecurityException
{
return gDao.find( group );
}
+
/**
* Takes a search string that contains full or partial Group name in directory.
*
@@ -172,11 +182,12 @@ final class GroupP
* @return List of type Group containing fully populated matching entities. If no records found this will be empty.
* @throws SecurityException in the event of DAO search error.
*/
- final List<Group> search( User user ) throws SecurityException
+ List<Group> search( User user ) throws SecurityException
{
return gDao.find( user );
}
+
/**
* Method will perform simple validations to ensure the integrity of the {@link Group} entity targeted for insertion
* or deletion in directory.
@@ -193,7 +204,7 @@ final class GroupP
LOG.warn( error );
throw new ValidationException( GlobalErrIds.GROUP_NAME_NULL, error );
}
-
+
if ( entity.getName().length() > GlobalIds.OU_LEN )
{
String name = entity.getName();
@@ -201,7 +212,7 @@ final class GroupP
LOG.warn( error );
throw new ValidationException( GlobalErrIds.GROUP_NAME_INVLD, error );
}
-
+
if ( entity.getProtocol().length() > GlobalIds.OU_LEN )
{
String error = "validate protocol [" + entity.getProtocol() + "] invalid length [" + entity.getProtocol()
@@ -209,7 +220,7 @@ final class GroupP
LOG.warn( error );
throw new ValidationException( GlobalErrIds.GROUP_PROTOCOL_INVLD, error );
}
-
+
if ( !Strings.isEmpty( entity.getDescription() ) )
{
VUtil.description( entity.getDescription() );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 7afc01e..16cfc7f 100644
--- 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
@@ -86,7 +86,7 @@ final class SuffixDAO extends ApacheDsDataProvider
* @param se
* @throws org.apache.directory.fortress.core.CreateException
*/
- final void create( Suffix se )
+ void create( Suffix se )
throws CreateException
{
LdapConnection ld = null;
@@ -127,7 +127,7 @@ final class SuffixDAO extends ApacheDsDataProvider
* @param se
* @throws org.apache.directory.fortress.core.RemoveException
*/
- final void remove( Suffix se )
+ void remove( Suffix se )
throws RemoveException
{
LdapConnection ld = null;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 4b98eae..f8d5dfb 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
@@ -65,6 +65,7 @@ final class AcceleratorDAO extends ApacheDsDataProvider
{
private static final Logger LOG = LoggerFactory.getLogger( AcceleratorDAO.class.getName() );
+
/**
* Authenticate user and return sessionId inside {@link Session#sessionId}.
* This function follows the pattern from: {@link org.apache.directory.fortress.core.AccessMgr#createSession(org.apache.directory.fortress.core.rbac.User, boolean)}
@@ -81,11 +82,11 @@ final class AcceleratorDAO extends ApacheDsDataProvider
* @throws SecurityException rethrows {@code LdapException} with {@code GlobalErrIds.ACEL_CREATE_SESSION_ERR}.
*
*/
- final Session createSession( User user ) throws SecurityException
+ Session createSession( User user ) throws SecurityException
{
Session session = null;
LdapConnection ld = null;
-
+
try
{
ld = getAdminConnection();
@@ -95,32 +96,34 @@ final class AcceleratorDAO extends ApacheDsDataProvider
//rbacCreateSessionRequest.setTenantId( "jts" );
rbacCreateSessionRequest.setTenantId( user.getContextId() );
rbacCreateSessionRequest.setUserIdentity( user.getUserId() );
- rbacCreateSessionRequest.setPassword( new String(user.getPassword()) );
-
- if( VUtil.isNotNullOrEmpty( user.getRoles() ))
+ rbacCreateSessionRequest.setPassword( new String( user.getPassword() ) );
+
+ if ( VUtil.isNotNullOrEmpty( user.getRoles() ) )
{
- for ( UserRole userRole : user.getRoles())
+ for ( UserRole userRole : user.getRoles() )
{
rbacCreateSessionRequest.addRole( userRole.getName() );
}
}
-
+
// Send the request
RbacCreateSessionResponse rbacCreateSessionResponse = ( RbacCreateSessionResponse ) ld.extended(
rbacCreateSessionRequest );
LOG.debug( "createSession userId: {}, sessionId: {}, resultCode: {}",
- user.getUserId(), rbacCreateSessionResponse.getSessionId(),
- rbacCreateSessionResponse.getLdapResult().getResultCode());
+ user.getUserId(), rbacCreateSessionResponse.getSessionId(),
+ rbacCreateSessionResponse.getLdapResult().getResultCode() );
session = new Session( user, rbacCreateSessionResponse.getSessionId() );
-
+
if ( rbacCreateSessionResponse.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS )
{
- session.setAuthenticated(true);
+ session.setAuthenticated( true );
}
else
{
- session.setAuthenticated(false);
- String info = "createSession UserId [" + user.getUserId() + "] failed: " + rbacCreateSessionResponse.getLdapResult() + " , resultCode: " + rbacCreateSessionResponse.getLdapResult().getResultCode().getResultCode();
+ session.setAuthenticated( false );
+ String info = "createSession UserId [" + user.getUserId() + "] failed: "
+ + rbacCreateSessionResponse.getLdapResult() + " , resultCode: "
+ + rbacCreateSessionResponse.getLdapResult().getResultCode().getResultCode();
throw new SecurityException( GlobalErrIds.USER_PW_INVLD, info );
}
}
@@ -134,7 +137,7 @@ final class AcceleratorDAO extends ApacheDsDataProvider
{
closeAdminConnection( ld );
}
-
+
return session;
}
@@ -158,39 +161,40 @@ final class AcceleratorDAO extends ApacheDsDataProvider
{
boolean result = false;
LdapConnection ld = null;
-
+
try
{
ld = getAdminConnection();
RbacCheckAccessRequest rbacCheckAccessRequest = new RbacCheckAccessRequestImpl();
rbacCheckAccessRequest.setSessionId( session.getSessionId() );
rbacCheckAccessRequest.setObject( perm.getObjName() );
-
+
// objectId is optional
- if(VUtil.isNotNullOrEmpty( perm.getObjId()))
+ if ( VUtil.isNotNullOrEmpty( perm.getObjId() ) )
{
rbacCheckAccessRequest.setObjectId( perm.getObjId() );
}
-
+
rbacCheckAccessRequest.setOperation( perm.getOpName() );
// Send the request
RbacCheckAccessResponse rbacCheckAccessResponse = ( RbacCheckAccessResponse ) ld.extended(
rbacCheckAccessRequest );
LOG.debug( "checkAccess result: {}", rbacCheckAccessResponse.getLdapResult().getResultCode() );
-
+
result = rbacCheckAccessResponse.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS;
}
catch ( LdapException e )
{
- String error = "checkAccess perm obj [" + perm.getObjName() + "], operation [" + perm.getOpName() + "] caught LDAPException=" + " msg=" + e
- .getMessage();
+ String error = "checkAccess perm obj [" + perm.getObjName() + "], operation [" + perm.getOpName()
+ + "] caught LDAPException=" + " msg=" + e
+ .getMessage();
throw new SecurityException( GlobalErrIds.ACEL_CHECK_ACCESS_ERR, error, e );
}
finally
{
closeAdminConnection( ld );
}
-
+
return result;
}
@@ -208,7 +212,7 @@ final class AcceleratorDAO extends ApacheDsDataProvider
void dropActiveRole( Session session, UserRole userRole ) throws SecurityException
{
LdapConnection ld = null;
-
+
try
{
ld = getAdminConnection();
@@ -220,7 +224,7 @@ final class AcceleratorDAO extends ApacheDsDataProvider
RbacDropRoleResponse rbacDropRoleResponse = ( RbacDropRoleResponse ) ld.extended(
dropRoleRequest );
LOG.debug( "dropActiveRole result: {}", rbacDropRoleResponse.getLdapResult().getResultCode() );
-
+
if ( rbacDropRoleResponse.getLdapResult().getResultCode() != ResultCodeEnum.SUCCESS )
{
String info = "dropActiveRole Role [" + userRole.getName() + "] User ["
@@ -239,7 +243,7 @@ final class AcceleratorDAO extends ApacheDsDataProvider
closeAdminConnection( ld );
}
}
-
+
/**
* Activate user role into rbac session
@@ -254,7 +258,7 @@ final class AcceleratorDAO extends ApacheDsDataProvider
void addActiveRole( Session session, UserRole userRole ) throws SecurityException
{
LdapConnection ld = null;
-
+
try
{
ld = getAdminConnection();
@@ -266,13 +270,13 @@ final class AcceleratorDAO extends ApacheDsDataProvider
RbacAddRoleResponse rbacAddRoleResponse = ( RbacAddRoleResponse ) ld.extended(
addRoleRequest );
LOG.debug( "addActiveRole result: {}", rbacAddRoleResponse.getLdapResult().getResultCode() );
-
+
if ( rbacAddRoleResponse.getLdapResult().getResultCode() != ResultCodeEnum.SUCCESS )
{
String info;
int rc;
-
- if( rbacAddRoleResponse.getLdapResult().getResultCode() == ResultCodeEnum.ATTRIBUTE_OR_VALUE_EXISTS )
+
+ if ( rbacAddRoleResponse.getLdapResult().getResultCode() == ResultCodeEnum.ATTRIBUTE_OR_VALUE_EXISTS )
{
info = "addActiveRole Role [" + userRole.getName() + "] User ["
+ session.getUserId() + "], already activated.";
@@ -284,7 +288,7 @@ final class AcceleratorDAO extends ApacheDsDataProvider
+ session.getUserId() + "], not authorized for user.";
rc = GlobalErrIds.URLE_ACTIVATE_FAILED;
}
-
+
throw new SecurityException( rc, info );
}
}
@@ -299,7 +303,7 @@ final class AcceleratorDAO extends ApacheDsDataProvider
closeAdminConnection( ld );
}
}
-
+
/**
* Delete the stored session on rbac accelerator server.
@@ -311,7 +315,7 @@ final class AcceleratorDAO extends ApacheDsDataProvider
void deleteSession( Session session ) throws SecurityException
{
LdapConnection ld = null;
-
+
try
{
ld = getAdminConnection();
@@ -321,7 +325,7 @@ final class AcceleratorDAO extends ApacheDsDataProvider
// Send the request
RbacDeleteSessionResponse deleteSessionResponse = ( RbacDeleteSessionResponse ) ld.extended(
deleteSessionRequest );
- LOG.debug( "deleteSession result: {}", deleteSessionResponse.getLdapResult().getResultCode());
+ LOG.debug( "deleteSession result: {}", deleteSessionResponse.getLdapResult().getResultCode() );
}
catch ( LdapException e )
{
@@ -350,7 +354,7 @@ final class AcceleratorDAO extends ApacheDsDataProvider
{
LdapConnection ld = null;
List<UserRole> userRoleList = null;
-
+
try
{
ld = getAdminConnection();
@@ -360,13 +364,13 @@ final class AcceleratorDAO extends ApacheDsDataProvider
// Send the request
RbacSessionRolesResponse sessionRolesResponse = ( RbacSessionRolesResponse ) ld.extended(
sessionRolesRequest );
- LOG.debug( "sessionRoles result: {}", sessionRolesResponse.getLdapResult().getResultCode().getResultCode());
-
+ LOG.debug( "sessionRoles result: {}", sessionRolesResponse.getLdapResult().getResultCode().getResultCode() );
+
if ( VUtil.isNotNullOrEmpty( sessionRolesResponse.getRoles() ) )
{
userRoleList = new ArrayList<UserRole>();
-
- for( String roleNm : sessionRolesResponse.getRoles() )
+
+ for ( String roleNm : sessionRolesResponse.getRoles() )
{
userRoleList.add( new UserRole( session.getUserId(), roleNm ) );
// todo: add temporal constraints here
@@ -383,7 +387,7 @@ final class AcceleratorDAO extends ApacheDsDataProvider
{
closeAdminConnection( ld );
}
-
+
return userRoleList;
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 2c3977b..4e14bd4 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
@@ -316,7 +316,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
* @return input record back to client.
* @throws UpdateException in the event LDAP errors occur.
*/
- final AdminRole assign( AdminRole entity, String userDn ) throws UpdateException
+ AdminRole assign( AdminRole entity, String userDn ) throws UpdateException
{
LdapConnection ld = null;
String dn = getDn( entity );
@@ -352,7 +352,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
* @return input record back to client.
* @throws UpdateException in the event LDAP errors occur.
*/
- final AdminRole deassign( AdminRole entity, String userDn ) throws UpdateException
+ AdminRole deassign( AdminRole entity, String userDn ) throws UpdateException
{
LdapConnection ld = null;
String dn = getDn( entity );
@@ -386,7 +386,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
* @param role record contains {@link AdminRole#name}.
* @throws RemoveException in the event LDAP errors occur.
*/
- final void remove( AdminRole role ) throws RemoveException
+ void remove( AdminRole role ) throws RemoveException
{
LdapConnection ld = null;
String dn = getDn( role );
@@ -415,7 +415,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
* @return AdminRole back to client.
* @throws FinderException in the event LDAP errors occur.
*/
- final AdminRole getRole( AdminRole adminRole ) throws FinderException
+ AdminRole getRole( AdminRole adminRole ) throws FinderException
{
AdminRole entity = null;
LdapConnection ld = null;
@@ -461,7 +461,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
* @throws FinderException
*
*/
- final List<AdminRole> findRoles( AdminRole adminRole ) throws FinderException
+ List<AdminRole> findRoles( AdminRole adminRole ) throws FinderException
{
List<AdminRole> roleList = new ArrayList<AdminRole>();
LdapConnection ld = null;
@@ -509,7 +509,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
* @throws FinderException
*
*/
- final List<String> findRoles( AdminRole adminRole, int limit ) throws FinderException
+ List<String> findRoles( AdminRole adminRole, int limit ) throws FinderException
{
List<String> roleList = new ArrayList<String>();
LdapConnection ld = null;
@@ -556,7 +556,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final List<String> findAssignedRoles( String userDn, String contextId ) throws FinderException
+ List<String> findAssignedRoles( String userDn, String contextId ) throws FinderException
{
List<String> roleNameList = new ArrayList<>();
LdapConnection ld = null;
@@ -600,7 +600,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
* @return
* @throws FinderException
*/
- final List<Graphable> getAllDescendants( String contextId )
+ List<Graphable> getAllDescendants( String contextId )
throws FinderException
{
String[] DESC_ATRS =
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleP.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleP.java
index 346972d..4bde7ee 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleP.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleP.java
@@ -75,7 +75,7 @@ public final class AdminRoleP
* @return AdminRole entity containing all attributes associated with Administrative Role in directory.
* @throws SecurityException in the event AdminRole not found or DAO search error.
*/
- final AdminRole read( AdminRole adminRole ) throws SecurityException
+ AdminRole read( AdminRole adminRole ) throws SecurityException
{
return rDao.getRole( adminRole );
}
@@ -88,7 +88,7 @@ public final class AdminRoleP
* @return List of type Role containing fully populated matching Admin Role entities. If no records found this will be empty.
* @throws SecurityException in the event of DAO search error.
*/
- final List<AdminRole> search( AdminRole adminRole )
+ List<AdminRole> search( AdminRole adminRole )
throws SecurityException
{
return rDao.findRoles( adminRole );
@@ -103,7 +103,7 @@ public final class AdminRoleP
* @return List of type String containing Admin Role name of all matching User entities. If no records found this will be empty.
* @throws SecurityException in the event of DAO search error.
*/
- final List<String> search( AdminRole adminRole, int limit )
+ List<String> search( AdminRole adminRole, int limit )
throws SecurityException
{
return rDao.findRoles( adminRole, limit );
@@ -117,7 +117,7 @@ public final class AdminRoleP
* @return List of type AdminRole containing {@link AdminRole#name} and {@link AdminRole#parents} populated.
* @throws SecurityException in the event of DAO search error.
*/
- final List<Graphable> getAllDescendants( String contextId )
+ List<Graphable> getAllDescendants( String contextId )
throws SecurityException
{
return rDao.getAllDescendants( contextId );
@@ -132,7 +132,7 @@ public final class AdminRoleP
* @return AdminRole entity copy of input + additional attributes (internalId) that were added by op.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final AdminRole add( AdminRole entity )
+ AdminRole add( AdminRole entity )
throws SecurityException
{
validate( entity );
@@ -148,7 +148,7 @@ public final class AdminRoleP
* @return AdminRole entity contains fully populated updated entity.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final AdminRole update( AdminRole entity ) throws SecurityException
+ AdminRole update( AdminRole entity ) throws SecurityException
{
validate( entity );
entity = rDao.update( entity );
@@ -163,7 +163,7 @@ public final class AdminRoleP
* @param entity Admin Role entity contains data targeted for updating.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final void deleteParent( AdminRole entity ) throws SecurityException
+ void deleteParent( AdminRole entity ) throws SecurityException
{
validate( entity );
rDao.deleteParent( entity );
@@ -195,7 +195,7 @@ public final class AdminRoleP
* @return AdminRole contains copy of input entity and additional data processed by request.
* @throws SecurityException in the event data error in user or role objects or system error.
*/
- final AdminRole assign( AdminRole entity, String userDn ) throws SecurityException
+ AdminRole assign( AdminRole entity, String userDn ) throws SecurityException
{
return rDao.assign( entity, userDn );
}
@@ -233,7 +233,7 @@ public final class AdminRoleP
* @param contextId maps to sub-tree in DIT, for example ou=contextId, dc=jts, dc = com.
* @throws SecurityException in the event of DAO search error.
*/
- final void removeOccupant( String userDn, String contextId )
+ void removeOccupant( String userDn, String contextId )
throws SecurityException
{
List<String> list;
@@ -266,7 +266,7 @@ public final class AdminRoleP
* @return AdminRole contains copy of input entity and additional data processed by request.
* @throws SecurityException - in the event data error in user or role objects or system error.
*/
- final AdminRole deassign( AdminRole entity, String userDn ) throws SecurityException
+ AdminRole deassign( AdminRole entity, String userDn ) throws SecurityException
{
return rDao.deassign( entity, userDn );
}
@@ -279,7 +279,7 @@ public final class AdminRoleP
* @param entity Contains the name of the Admin Role targeted for deletion.
* @throws SecurityException in the event of data validation or DAO system error.
*/
- final void delete( AdminRole entity ) throws SecurityException
+ void delete( AdminRole entity ) throws SecurityException
{
try
{
@@ -306,12 +306,12 @@ public final class AdminRoleP
throws SecurityException
{
VUtil.safeText( entity.getName(), GlobalIds.ROLE_LEN );
-
+
if ( VUtil.isNotNullOrEmpty( entity.getBeginRange() ) && VUtil.isNotNullOrEmpty( entity.getEndRange() ) )
{
VUtil.safeText( entity.getBeginRange(), GlobalIds.ROLE_LEN );
VUtil.safeText( entity.getEndRange(), GlobalIds.ROLE_LEN );
-
+
if ( entity.getBeginRange().equalsIgnoreCase( entity.getEndRange() )
&& ( !entity.isBeginInclusive() || !entity.isEndInclusive() ) )
{
@@ -343,52 +343,52 @@ public final class AdminRoleP
LOG.warn( error );
throw new SecurityException( GlobalErrIds.ARLE_END_RANGE_NULL, error );
}
-
+
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
{
VUtil.description( entity.getDescription() );
}
-
+
if ( entity.getTimeout() >= 0 )
{
VUtil.timeout( entity.getTimeout() );
}
-
+
if ( VUtil.isNotNullOrEmpty( entity.getBeginTime() ) )
{
VUtil.beginTime( entity.getBeginTime() );
}
-
+
if ( VUtil.isNotNullOrEmpty( entity.getEndTime() ) )
{
VUtil.endTime( entity.getEndTime() );
}
-
+
if ( VUtil.isNotNullOrEmpty( entity.getBeginDate() ) )
{
VUtil.beginDate( entity.getBeginDate() );
}
-
+
if ( VUtil.isNotNullOrEmpty( entity.getEndDate() ) )
{
VUtil.endDate( entity.getEndDate() );
}
-
+
if ( VUtil.isNotNullOrEmpty( entity.getDayMask() ) )
{
VUtil.dayMask( entity.getDayMask() );
}
-
+
if ( VUtil.isNotNullOrEmpty( entity.getBeginLockDate() ) )
{
VUtil.beginDate( entity.getBeginDate() );
}
-
+
if ( VUtil.isNotNullOrEmpty( entity.getEndLockDate() ) )
{
VUtil.endDate( entity.getEndLockDate() );
}
-
+
if ( VUtil.isNotNullOrEmpty( entity.getOsU() ) )
{
for ( String ou : entity.getOsU() )
@@ -399,7 +399,7 @@ public final class AdminRoleP
op.read( inOe );
}
}
-
+
if ( VUtil.isNotNullOrEmpty( entity.getOsP() ) )
{
for ( String ou : entity.getOsP() )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleUtil.java
index 0aad4b8..e04bdcd 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleUtil.java
@@ -168,6 +168,7 @@ public final class AdminRoleUtil
{
// create Set with case insensitive comparator:
Set<String> iRoles = new TreeSet<>( String.CASE_INSENSITIVE_ORDER );
+
if ( VUtil.isNotNullOrEmpty( uRoles ) )
{
for ( UserAdminRole uRole : uRoles )
@@ -175,8 +176,11 @@ public final class AdminRoleUtil
String rleName = uRole.getName();
iRoles.add( rleName );
Set<String> parents = HierUtil.getAscendants( rleName, getGraph( contextId ) );
+
if ( VUtil.isNotNullOrEmpty( parents ) )
+ {
iRoles.addAll( parents );
+ }
}
}
return iRoles;
@@ -235,7 +239,7 @@ public final class AdminRoleUtil
inHier.setContextId( contextId );
LOG.info( "loadGraph initializing ADMIN ROLE context [{}]", inHier.getContextId() );
List<Graphable> descendants = null;
-
+
try
{
descendants = adminRoleP.getAllDescendants( inHier.getContextId() );
@@ -244,13 +248,13 @@ public final class AdminRoleUtil
{
LOG.info( "loadGraph caught SecurityException={}", se );
}
-
+
Hier hier = HierUtil.loadHier( contextId, descendants );
SimpleDirectedGraph<String, Relationship> graph;
graph = HierUtil.buildGraph( hier );
adminRoleCache.put( getKey( contextId ), graph );
-
+
return graph;
}
@@ -266,13 +270,13 @@ public final class AdminRoleUtil
{
ReadWriteLock hierLock = HierUtil.getLock( contextId, HierUtil.Type.ARLE );
String key = getKey( contextId );
-
+
try
{
hierLock.readLock().lock();
SimpleDirectedGraph<String, Relationship> graph = ( SimpleDirectedGraph<String, Relationship> ) adminRoleCache
.get( key );
-
+
if ( graph == null )
{
try
@@ -285,7 +289,7 @@ public final class AdminRoleUtil
//if ( graph == null )
//{
- graph = loadGraph( contextId );
+ graph = loadGraph( contextId );
//}
hierLock.readLock().lock();
@@ -295,7 +299,7 @@ public final class AdminRoleUtil
hierLock.writeLock().unlock();
}
}
-
+
return graph;
}
finally
[4/5] directory-fortress-core git commit: o Fixed many Sonar warnings
o Renamed the Organizat*ii*onalUnitDAO class
Posted by el...@apache.org.
o Fixed many Sonar warnings
o Renamed the Organizat*ii*onalUnitDAO 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/33477ff6
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/33477ff6
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/33477ff6
Branch: refs/heads/master
Commit: 33477ff6078ea61564bb5b176243a23991fe56f4
Parents: 99a6ab3
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Wed May 20 09:35:06 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Wed May 20 09:35:06 2015 +0200
----------------------------------------------------------------------
.../fortress/core/BaseRuntimeException.java | 4 +
.../directory/fortress/core/ObjectFactory.java | 225 +++++++-----
.../fortress/core/ant/FortressAntTask.java | 86 ++---
.../directory/fortress/core/cfg/ConfigDAO.java | 15 +-
.../directory/fortress/core/cfg/ConfigP.java | 8 +-
.../directory/fortress/core/cli/package.html | 271 ++++++++-------
.../core/doc-files/apache-directory-server.html | 134 +++----
.../core/doc-files/apache-directory-studio.html | 20 +-
.../core/doc-files/apache-fortress-core.html | 58 ++--
.../core/doc-files/apache-fortress-realm.html | 6 +-
.../core/doc-files/apache-fortress-rest.html | 14 +-
.../fortress/core/doc-files/apache-tomcat.html | 18 +-
.../core/doc-files/ten-minute-guide.html | 20 +-
.../core/ldap/ApacheDsDataProvider.java | 57 +--
.../ldap/container/OrganizatiionalUnitDAO.java | 177 ----------
.../ldap/container/OrganizationalUnitDAO.java | 178 ++++++++++
.../fortress/core/ldap/group/Group.java | 79 +++--
.../fortress/core/ldap/group/GroupDAO.java | 95 +++--
.../fortress/core/ldap/group/GroupMgrImpl.java | 22 +-
.../fortress/core/ldap/group/GroupP.java | 41 ++-
.../fortress/core/ldap/suffix/SuffixDAO.java | 4 +-
.../fortress/core/rbac/AcceleratorDAO.java | 82 ++---
.../fortress/core/rbac/AdminRoleDAO.java | 16 +-
.../fortress/core/rbac/AdminRoleP.java | 48 +--
.../fortress/core/rbac/AdminRoleUtil.java | 18 +-
.../directory/fortress/core/rbac/AuditDAO.java | 17 +-
.../directory/fortress/core/rbac/AuditP.java | 12 +-
.../fortress/core/rbac/OrgUnitDAO.java | 16 +-
.../directory/fortress/core/rbac/OrgUnitP.java | 60 ++--
.../directory/fortress/core/rbac/PermDAO.java | 40 +--
.../directory/fortress/core/rbac/PermObj.java | 13 +
.../directory/fortress/core/rbac/PermP.java | 48 +--
.../fortress/core/rbac/Permission.java | 13 +
.../directory/fortress/core/rbac/PolicyDAO.java | 17 +-
.../directory/fortress/core/rbac/PolicyP.java | 12 +-
.../directory/fortress/core/rbac/PsoUtil.java | 3 +
.../directory/fortress/core/rbac/RoleDAO.java | 22 +-
.../directory/fortress/core/rbac/RoleP.java | 23 +-
.../directory/fortress/core/rbac/RoleUtil.java | 30 +-
.../directory/fortress/core/rbac/SdDAO.java | 14 +-
.../directory/fortress/core/rbac/SdP.java | 14 +-
.../directory/fortress/core/rbac/User.java | 16 +
.../fortress/core/rbac/UserAdminRole.java | 31 ++
.../directory/fortress/core/rbac/UserDAO.java | 79 +++--
.../directory/fortress/core/rbac/UserP.java | 54 +--
.../directory/fortress/core/rest/RestUtils.java | 22 +-
.../fortress/core/util/attr/VUtil.java | 10 +-
.../fortress/core/util/time/CUtil.java | 348 +++++++++++--------
48 files changed, 1447 insertions(+), 1163 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/BaseRuntimeException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/BaseRuntimeException.java b/src/main/java/org/apache/directory/fortress/core/BaseRuntimeException.java
index f46edcb..1fac065 100755
--- a/src/main/java/org/apache/directory/fortress/core/BaseRuntimeException.java
+++ b/src/main/java/org/apache/directory/fortress/core/BaseRuntimeException.java
@@ -72,8 +72,12 @@ public abstract class BaseRuntimeException extends RuntimeException
public String getMsg()
{
String msg = null;
+
if ( this.msgParams != null )
+ {
msg = this.msgParams[0];
+ }
+
return msg;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ObjectFactory.java b/src/main/java/org/apache/directory/fortress/core/ObjectFactory.java
index 8ca7553..cfeef2c 100755
--- a/src/main/java/org/apache/directory/fortress/core/ObjectFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/ObjectFactory.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.core;
+
import org.apache.directory.fortress.core.ldap.group.Group;
import org.apache.directory.fortress.core.rbac.*;
import org.apache.directory.fortress.core.rest.FortRequest;
@@ -48,242 +49,269 @@ import javax.xml.namespace.QName;
@XmlRegistry
public class ObjectFactory
{
- private final static QName _FortUser_QNAME = new QName("", "fortUser");
- private final static QName _FortSession_QNAME = new QName("", "fortSession");
- private final static QName _FortRole_QNAME = new QName("", "fortRole");
- private final static QName _FortGrant_QNAME = new QName("", "fortGrant");
- private final static QName _FortOrgUnit_QNAME = new QName("", "fortOrgUnit");
- private final static QName _FortEntity_QNAME = new QName("", "fortEntity");
- private final static QName _FortAdminRole_QNAME = new QName("", "fortAdminRole");
- private final static QName _FortUserRole_QNAME = new QName("", "fortUserRole");
- private final static QName _FortObject_QNAME = new QName("", "fortObject");
- private final static QName _FortPermission_QNAME = new QName("", "fortPermission");
- private final static QName _FortRoleRelationship_QNAME = new QName("", "fortRoleRelationship");
- private final static QName _FortSet_QNAME = new QName("", "fortSet");
- private final static QName _FortPolicy_QNAME = new QName("", "fortPolicy");
- private final static QName _FortUserAdminRole_QNAME = new QName("", "fortUserAdminRole");
- private final static QName _FortAdminRoleRelationship_QNAME = new QName("", "fortAdminRoleRelationship");
- private final static QName _FortOrgUnitRelationship_QNAME = new QName("", "fortOrgUnitRelationship");
- private final static QName _FortBind_QNAME = new QName("", "fortBind");
- private final static QName _FortUserAudit_QNAME = new QName("", "fortUserAudit");
- private final static QName _FortAuthZ_QNAME = new QName("", "fortAuthZ");
- private final static QName _FortMod_QNAME = new QName("", "fortMod");
- private final static QName _FortRolePerm_QNAME = new QName("", "fortRolePerm");
- private final static QName _FortResponse_QNAME = new QName("", "fortResponse");
- private final static QName FortRequest_QNAME = new QName("", "fortRequest");
- private final static QName FortAddress_QNAME = new QName("", "fortAddress");
- private final static QName _FortProps_QNAME = new QName("", "fortProps");
- private final static QName _FortWarning_QNAME = new QName("", "fortWarning");
- private final static QName _FortGroup_QNAME = new QName("", "fortGroup");
+ private static final QName FORTUSER_QNAME = new QName( "", "fortUser" );
+ private static final QName FORTSESSION_QNAME = new QName( "", "fortSession" );
+ private static final QName FORTROLE_QNAME = new QName( "", "fortRole" );
+ private static final QName FORTGRANT_QNAME = new QName( "", "fortGrant" );
+ private static final QName FORTORGUNIT_QNAME = new QName( "", "fortOrgUnit" );
+ private static final QName FORTENTITY_QNAME = new QName( "", "fortEntity" );
+ private static final QName FORTADMINROLE_QNAME = new QName( "", "fortAdminRole" );
+ private static final QName FORTUSERROLE_QNAME = new QName( "", "fortUserRole" );
+ private static final QName FORTOBJECT_QNAME = new QName( "", "fortObject" );
+ private static final QName FORTPERMISSION_QNAME = new QName( "", "fortPermission" );
+ private static final QName FORTROLERELATIONSHIP_QNAME = new QName( "", "fortRoleRelationship" );
+ private static final QName FORTSET_QNAME = new QName( "", "fortSet" );
+ private static final QName FORTPOLICY_QNAME = new QName( "", "fortPolicy" );
+ private static final QName FORTUSERADMINROLE_QNAME = new QName( "", "fortUserAdminRole" );
+ private static final QName FORTADMINROLERELATIONSHIP_QNAME = new QName( "", "fortAdminRoleRelationship" );
+ private static final QName FORTORGUNITRELATIONSHIP_QNAME = new QName( "", "fortOrgUnitRelationship" );
+ private static final QName FORTBIND_QNAME = new QName( "", "fortBind" );
+ private static final QName FORTUSERAUDIT_QNAME = new QName( "", "fortUserAudit" );
+ private static final QName FORTAUTHZ_QNAME = new QName( "", "fortAuthZ" );
+ private static final QName FORTMOD_QNAME = new QName( "", "fortMod" );
+ private static final QName FORTROLEPERM_QNAME = new QName( "", "fortRolePerm" );
+ private static final QName FORTRESPONSE_QNAME = new QName( "", "fortResponse" );
+ private static final QName FORTREQUEST_QNAME = new QName( "", "fortRequest" );
+ private static final QName FORTADDRESS_QNAME = new QName( "", "fortAddress" );
+ private static final QName FORTPROPS_QNAME = new QName( "", "fortProps" );
+ private static final QName FORTWARNING_QNAME = new QName( "", "fortWarning" );
+ private static final QName FORTGROUP_QNAME = new QName( "", "fortGroup" );
@XmlElementDecl(namespace = "", name = "fortEntity")
- public JAXBElement<FortEntity> createFortEntity(FortEntity value)
+ public JAXBElement<FortEntity> createFortEntity( FortEntity value )
{
- return new JAXBElement<>(_FortEntity_QNAME, FortEntity.class, null, value);
+ return new JAXBElement<>( FORTENTITY_QNAME, FortEntity.class, null, value );
}
+
@XmlElementDecl(namespace = "", name = "fortResponse")
- public JAXBElement<FortResponse> createFortResponse(FortResponse value)
+ public JAXBElement<FortResponse> createFortResponse( FortResponse value )
{
- return new JAXBElement<>(_FortResponse_QNAME, FortResponse.class, null, value);
+ return new JAXBElement<>( FORTRESPONSE_QNAME, FortResponse.class, null, value );
}
+
@XmlElementDecl(namespace = "", name = "fortRequest")
- public JAXBElement<FortRequest> createFortRequest(FortRequest value)
+ public JAXBElement<FortRequest> createFortRequest( FortRequest value )
{
- return new JAXBElement<>(FortRequest_QNAME, FortRequest.class, null, value);
+ return new JAXBElement<>( FORTREQUEST_QNAME, FortRequest.class, null, value );
}
+
/**
* Create an instance of {@link JAXBElement }{@code <}{@link org.apache.directory.fortress.core.rbac.SDSet }{@code >}}
*/
@XmlElementDecl(namespace = "", name = "fortSet")
- public JAXBElement<SDSet> createFortSet(SDSet value)
+ public JAXBElement<SDSet> createFortSet( SDSet value )
{
- return new JAXBElement<>(_FortSet_QNAME, SDSet.class, null, value);
+ return new JAXBElement<>( FORTSET_QNAME, SDSet.class, null, value );
}
+
/**
* Create an instance of {@link JAXBElement }{@code <}{@link org.apache.directory.fortress.core.rbac.PwPolicy }{@code >}}
*/
@XmlElementDecl(namespace = "", name = "fortPolicy")
- public JAXBElement<PwPolicy> createFortPolicy(PwPolicy value)
+ public JAXBElement<PwPolicy> createFortPolicy( PwPolicy value )
{
- return new JAXBElement<>(_FortPolicy_QNAME, PwPolicy.class, null, value);
+ return new JAXBElement<>( FORTPOLICY_QNAME, PwPolicy.class, null, value );
}
+
/**
* Create an instance of {@link JAXBElement }{@code <}{@link org.apache.directory.fortress.core.rbac.Session }{@code >}}
*/
@XmlElementDecl(namespace = "", name = "fortSession")
- public JAXBElement<Session> createFortSession(Session value)
+ public JAXBElement<Session> createFortSession( Session value )
{
- return new JAXBElement<>(_FortSession_QNAME, Session.class, null, value);
+ return new JAXBElement<>( FORTSESSION_QNAME, Session.class, null, value );
}
+
/**
* Create an instance of {@link JAXBElement }{@code <}{@link org.apache.directory.fortress.core.rbac.User }{@code >}}
*/
@XmlElementDecl(namespace = "", name = "fortUser")
- public JAXBElement<User> createFortUser(User value)
+ public JAXBElement<User> createFortUser( User value )
{
- return new JAXBElement<>(_FortUser_QNAME, User.class, null, value);
+ return new JAXBElement<>( FORTUSER_QNAME, User.class, null, value );
}
+
/**
* Create an instance of {@link JAXBElement }{@code <}{@link org.apache.directory.fortress.core.rbac.UserRole }{@code >}}
*/
@XmlElementDecl(namespace = "", name = "fortUserRole")
- public JAXBElement<UserRole> createFortUserRole(UserRole value)
+ public JAXBElement<UserRole> createFortUserRole( UserRole value )
{
- return new JAXBElement<>(_FortUserRole_QNAME, UserRole.class, null, value);
+ return new JAXBElement<>( FORTUSERROLE_QNAME, UserRole.class, null, value );
}
+
@XmlElementDecl(namespace = "", name = "fortOrgUnit")
- public JAXBElement<OrgUnit> createFortOrgUnit(OrgUnit value)
+ public JAXBElement<OrgUnit> createFortOrgUnit( OrgUnit value )
{
- return new JAXBElement<>(_FortOrgUnit_QNAME, OrgUnit.class, null, value);
+ return new JAXBElement<>( FORTORGUNIT_QNAME, OrgUnit.class, null, value );
}
+
/**
* Create an instance of {@link JAXBElement }{@code <}{@link org.apache.directory.fortress.core.rbac.Role }{@code >}}
*/
@XmlElementDecl(namespace = "", name = "fortRole")
- public JAXBElement<Role> createFortRole(Role value)
+ public JAXBElement<Role> createFortRole( Role value )
{
- return new JAXBElement<>(_FortRole_QNAME, Role.class, null, value);
+ return new JAXBElement<>( FORTROLE_QNAME, Role.class, null, value );
}
+
/**
* Create an instance of {@link JAXBElement }{@code <}{@link org.apache.directory.fortress.core.rbac.Role }{@code >}}
*/
@XmlElementDecl(namespace = "", name = "fortGrant")
- public JAXBElement<PermGrant> createFortGrant(PermGrant value)
+ public JAXBElement<PermGrant> createFortGrant( PermGrant value )
{
- return new JAXBElement<>(_FortGrant_QNAME, PermGrant.class, null, value);
+ return new JAXBElement<>( FORTGRANT_QNAME, PermGrant.class, null, value );
}
+
/**
* Create an instance of {@link JAXBElement }{@code <}{@link org.apache.directory.fortress.core.rbac.OrgUnitRelationship}{@code >}}
*/
@XmlElementDecl(namespace = "", name = "fortAdminRoleRelationship")
- public JAXBElement<AdminRoleRelationship> createFortAdminRoleRelationship(AdminRoleRelationship value)
+ public JAXBElement<AdminRoleRelationship> createFortAdminRoleRelationship( AdminRoleRelationship value )
{
- return new JAXBElement<>(_FortAdminRoleRelationship_QNAME, AdminRoleRelationship.class, null, value);
+ return new JAXBElement<>( FORTADMINROLERELATIONSHIP_QNAME, AdminRoleRelationship.class, null, value );
}
+
/**
* Create an instance of {@link JAXBElement }{@code <}{@link org.apache.directory.fortress.core.rbac.OrgUnitRelationship}{@code >}}
*/
@XmlElementDecl(namespace = "", name = "fortOrgUnitRelationship")
- public JAXBElement<OrgUnitRelationship> createFortOrgUnitRelationship(OrgUnitRelationship value)
+ public JAXBElement<OrgUnitRelationship> createFortOrgUnitRelationship( OrgUnitRelationship value )
{
- return new JAXBElement<>(_FortOrgUnitRelationship_QNAME, OrgUnitRelationship.class, null, value);
+ return new JAXBElement<>( FORTORGUNITRELATIONSHIP_QNAME, OrgUnitRelationship.class, null, value );
}
+
/**
* Create an instance of {@link JAXBElement }{@code <}{@link org.apache.directory.fortress.core.rbac.RoleRelationship}{@code >}}
*/
@XmlElementDecl(namespace = "", name = "fortRoleRelationship")
- public JAXBElement<RoleRelationship> createFortRoleRelationship(RoleRelationship value)
+ public JAXBElement<RoleRelationship> createFortRoleRelationship( RoleRelationship value )
{
- return new JAXBElement<>(_FortRoleRelationship_QNAME, RoleRelationship.class, null, value);
+ return new JAXBElement<>( FORTROLERELATIONSHIP_QNAME, RoleRelationship.class, null, value );
}
+
/**
* Create an instance of {@link JAXBElement }{@code <}{@link org.apache.directory.fortress.core.rbac.Role }{@code >}}
*/
@XmlElementDecl(namespace = "", name = "fortAdminRole")
- public JAXBElement<AdminRole> createFortAdminRole(AdminRole value)
+ public JAXBElement<AdminRole> createFortAdminRole( AdminRole value )
{
- return new JAXBElement<>(_FortAdminRole_QNAME, AdminRole.class, null, value);
+ return new JAXBElement<>( FORTADMINROLE_QNAME, AdminRole.class, null, value );
}
+
/**
* Create an instance of {@link JAXBElement }{@code <}{@link org.apache.directory.fortress.core.rbac.UserAdminRole }{@code >}}
*/
@XmlElementDecl(namespace = "", name = "fortUserAdminRole")
- public JAXBElement<UserAdminRole> createFortUserRole(UserAdminRole value)
+ public JAXBElement<UserAdminRole> createFortUserRole( UserAdminRole value )
{
- return new JAXBElement<>(_FortUserAdminRole_QNAME, UserAdminRole.class, null, value);
+ return new JAXBElement<>( FORTUSERADMINROLE_QNAME, UserAdminRole.class, null, value );
}
+
/**
* Create an instance of {@link JAXBElement }{@code <}{@link org.apache.directory.fortress.core.rbac.PermObj }{@code >}}
*/
@XmlElementDecl(namespace = "", name = "fortObject")
- public JAXBElement<PermObj> createFortObject(PermObj value)
+ public JAXBElement<PermObj> createFortObject( PermObj value )
{
- return new JAXBElement<>(_FortObject_QNAME, PermObj.class, null, value);
+ return new JAXBElement<>( FORTOBJECT_QNAME, PermObj.class, null, value );
}
+
/**
* Create an instance of {@link JAXBElement }{@code <}{@link org.apache.directory.fortress.core.rbac.Permission }{@code >}}
*/
@XmlElementDecl(namespace = "", name = "fortPermission")
- public JAXBElement<Permission> createFortPermission(Permission value)
+ public JAXBElement<Permission> createFortPermission( Permission value )
{
- return new JAXBElement<>(_FortPermission_QNAME, Permission.class, null, value);
+ return new JAXBElement<>( FORTPERMISSION_QNAME, Permission.class, null, value );
}
+
@XmlElementDecl(namespace = "", name = "fortBind")
- public JAXBElement<Bind> createFortEntity(Bind value)
+ public JAXBElement<Bind> createFortEntity( Bind value )
{
- return new JAXBElement<>(_FortBind_QNAME, Bind.class, null, value);
+ return new JAXBElement<>( FORTBIND_QNAME, Bind.class, null, value );
}
+
@XmlElementDecl(namespace = "", name = "fortUserAudit")
- public JAXBElement<UserAudit> createFortUserAudit(UserAudit value)
+ public JAXBElement<UserAudit> createFortUserAudit( UserAudit value )
{
- return new JAXBElement<>(_FortUserAudit_QNAME, UserAudit.class, null, value);
+ return new JAXBElement<>( FORTUSERAUDIT_QNAME, UserAudit.class, null, value );
}
+
@XmlElementDecl(namespace = "", name = "fortAuthZ")
- public JAXBElement<AuthZ> createFortAuthZ(AuthZ value)
+ public JAXBElement<AuthZ> createFortAuthZ( AuthZ value )
{
- return new JAXBElement<>(_FortAuthZ_QNAME, AuthZ.class, null, value);
+ return new JAXBElement<>( FORTAUTHZ_QNAME, AuthZ.class, null, value );
}
+
@XmlElementDecl(namespace = "", name = "fortMod")
- public JAXBElement<Mod> createFortMod(Mod value)
+ public JAXBElement<Mod> createFortMod( Mod value )
{
- return new JAXBElement<>(_FortMod_QNAME, Mod.class, null, value);
+ return new JAXBElement<>( FORTMOD_QNAME, Mod.class, null, value );
}
+
@XmlElementDecl(namespace = "", name = "fortRolePerm")
- public JAXBElement<RolePerm> createFortRolePerm(RolePerm value)
+ public JAXBElement<RolePerm> createFortRolePerm( RolePerm value )
{
- return new JAXBElement<>(_FortRolePerm_QNAME, RolePerm.class, null, value);
+ return new JAXBElement<>( FORTROLEPERM_QNAME, RolePerm.class, null, value );
}
+
@XmlElementDecl(namespace = "", name = "fortAddress")
- public JAXBElement<Address> createFortAddress(Address value)
+ public JAXBElement<Address> createFortAddress( Address value )
{
- return new JAXBElement<>(FortAddress_QNAME, Address.class, null, value);
+ return new JAXBElement<>( FORTADDRESS_QNAME, Address.class, null, value );
}
+
@XmlElementDecl(namespace = "", name = "fortProps")
- public JAXBElement<Props> createFortProps(Props value)
+ public JAXBElement<Props> createFortProps( Props value )
{
- return new JAXBElement<>(_FortProps_QNAME, Props.class, null, value);
+ return new JAXBElement<>( FORTPROPS_QNAME, Props.class, null, value );
}
+
@XmlElementDecl(namespace = "", name = "fortWarning")
- public JAXBElement<Warning> createFortWarning(Warning value)
+ public JAXBElement<Warning> createFortWarning( Warning value )
{
- return new JAXBElement<Warning>(_FortWarning_QNAME, Warning.class, null, value);
+ return new JAXBElement<Warning>( FORTWARNING_QNAME, Warning.class, null, value );
}
+
/**
* Create an instance of {@link JAXBElement }{@code <}{@link org.apache.directory.fortress.core.ldap.group.Group }{@code >}}
*/
@XmlElementDecl(namespace = "", name = "fortGroup")
- public JAXBElement<Group> createFortGroup(Group value)
+ public JAXBElement<Group> createFortGroup( Group value )
{
- return new JAXBElement<>(_FortGroup_QNAME, Group.class, null, value);
+ return new JAXBElement<>( FORTGROUP_QNAME, Group.class, null, value );
}
+
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.directory.fortress.model2
*/
@@ -291,6 +319,7 @@ public class ObjectFactory
{
}
+
/**
* Create an instance of {@link User }
*/
@@ -299,6 +328,7 @@ public class ObjectFactory
return new User();
}
+
/**
* Create an instance of {@link org.apache.directory.fortress.core.rbac.PwPolicy }
*/
@@ -307,6 +337,7 @@ public class ObjectFactory
return new PwPolicy();
}
+
/**
* Create an instance of {@link Session }
*/
@@ -315,6 +346,7 @@ public class ObjectFactory
return new Session();
}
+
/**
* Create an instance of {@link SDSet }
*/
@@ -323,6 +355,7 @@ public class ObjectFactory
return new SDSet();
}
+
/**
* Create an instance of {@link Role }
*/
@@ -331,6 +364,7 @@ public class ObjectFactory
return new Role();
}
+
/**
* Create an instance of {@link Group }
*/
@@ -339,6 +373,7 @@ public class ObjectFactory
return new Group();
}
+
/**
* Create an instance of {@link PermGrant }
*/
@@ -347,6 +382,7 @@ public class ObjectFactory
return new PermGrant();
}
+
/**
* Create an instance of {@link RoleRelationship }
*/
@@ -355,6 +391,7 @@ public class ObjectFactory
return new RoleRelationship();
}
+
/**
* Create an instance of {@link AdminRoleRelationship }
*/
@@ -363,6 +400,7 @@ public class ObjectFactory
return new AdminRoleRelationship();
}
+
/**
* Create an instance of {@link OrgUnitRelationship }
*/
@@ -371,6 +409,7 @@ public class ObjectFactory
return new OrgUnitRelationship();
}
+
/**
* Create an instance of {@link PermObj }
*/
@@ -379,6 +418,7 @@ public class ObjectFactory
return new PermObj();
}
+
/**
* Create an instance of {@link Permission }
*/
@@ -387,6 +427,7 @@ public class ObjectFactory
return new Permission();
}
+
/**
* Create an instance of {@link Role }
*/
@@ -395,6 +436,7 @@ public class ObjectFactory
return new AdminRole();
}
+
/**
* Create an instance of {@link UserRole }
*/
@@ -403,6 +445,7 @@ public class ObjectFactory
return new UserRole();
}
+
/**
* Create an instance of {@link OrgUnit }
*/
@@ -411,6 +454,7 @@ public class ObjectFactory
return new OrgUnit();
}
+
/**
* Create an instance of {@link UserAdminRole }
*/
@@ -419,58 +463,69 @@ public class ObjectFactory
return new UserAdminRole();
}
+
public UserAudit createUserAudit()
{
return new UserAudit();
}
+
public Bind createBind()
{
return new Bind();
}
+
public AuthZ createAuthZ()
{
return new AuthZ();
}
+
public Mod createMod()
{
return new Mod();
}
+
public RolePerm createRolePerm()
{
return new RolePerm();
}
+
public FortResponse createFortResponse()
{
return new FortResponse();
}
+
public FortRequest createFortRequest()
{
return new FortRequest();
}
+
public Address createAddress()
{
return new Address();
}
+
public Props createProps()
{
return new Props();
}
- public Warning createWarning(int id, String msg, Warning.Type type)
+
+ public Warning createWarning( int id, String msg, Warning.Type type )
{
- return new Warning(id, msg, type);
+ return new Warning( id, msg, type );
}
- public Warning createWarning(int id, String msg, Warning.Type type, String name)
+
+ public Warning createWarning( int id, String msg, Warning.Type type, String name )
{
- return new Warning(id, msg, type, name);
+ return new Warning( id, msg, type, name );
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 3a416b8..a2270a9 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
@@ -193,49 +193,49 @@ public class FortressAntTask extends Task implements InputHandler
public static final boolean DEBUG = ( ( System.getProperty( "debug.admin" ) != null ) && ( System.getProperty(
"debug.admin" ).equalsIgnoreCase( "true" ) ) );
private static final String SEMICOLON = ";";
- final private List<Addconfig> addconfig = new ArrayList<>();
- final private List<Delconfig> delconfig = new ArrayList<>();
- final private List<Adduser> addusers = new ArrayList<>();
- final private List<Deluser> delusers = new ArrayList<>();
- final private List<Adduserrole> adduserroles = new ArrayList<>();
- final private List<Deluserrole> deluserroles = new ArrayList<>();
- final private List<Addrole> addroles = new ArrayList<>();
- final private List<Delrole> delroles = new ArrayList<>();
- final private List<Addsdset> addsdsets = new ArrayList<>();
- final private List<Addroleinheritance> addroleinheritances = new ArrayList<>();
- final private List<Delroleinheritance> delroleinheritances = new ArrayList<>();
- final private List<Delsdset> delsdsets = new ArrayList<>();
- final private List<AddpermOp> addpermOps = new ArrayList<>();
- final private List<DelpermOp> delpermOps = new ArrayList<>();
- final private List<AddpermObj> addpermObjs = new ArrayList<>();
- final private List<DelpermObj> delpermObjs = new ArrayList<>();
- final private List<AddpermGrant> addpermGrants = new ArrayList<>();
- final private List<DelpermGrant> delpermGrants = new ArrayList<>();
- final private List<Addpwpolicy> addpolicies = new ArrayList<>();
- final private List<Delpwpolicy> delpolicies = new ArrayList<>();
- final private List<Addcontainer> addcontainers = new ArrayList<>();
- final private List<Delcontainer> delcontainers = new ArrayList<>();
- final private List<Addsuffix> addsuffixes = new ArrayList<>();
- final private List<Delsuffix> delsuffixes = new ArrayList<>();
- final private List<Addorgunit> addorgunits = new ArrayList<>();
- final private List<Delorgunit> delorgunits = new ArrayList<>();
- final private List<Adduserorgunitinheritance> adduserorgunitinheritances = new ArrayList<>();
- final private List<Deluserorgunitinheritance> deluserorgunitinheritances = new ArrayList<>();
- final private List<Addpermorgunitinheritance> addpermorgunitinheritances = new ArrayList<>();
- final private List<Delpermorgunitinheritance> delpermorgunitinheritances = new ArrayList<>();
- final private List<Addadminrole> addadminroles = new ArrayList<>();
- final private List<Deladminrole> deladminroles = new ArrayList<>();
- final private List<Adduseradminrole> adduseradminroles = new ArrayList<>();
- final private List<Addadminroleinheritance> addadminroleinheritances = new ArrayList<>();
- final private List<Deladminroleinheritance> deladminroleinheritances = new ArrayList<>();
- final private List<Deluseradminrole> deluseradminroles = new ArrayList<>();
- final private List<Addcontext> addcontexts = new ArrayList<>();
- final protected List<Addgroup> addgroups = new ArrayList<>();
- final protected List<Delgroup> delgroups = new ArrayList<>();
- final protected List<Addgroupmember> addgroupmembers = new ArrayList<>();
- final protected List<Delgroupmember> delgroupmembers = new ArrayList<>();
- final protected List<Addgroupproperty> addgroupproperties = new ArrayList<>();
- final protected List<Delgroupproperty> delgroupproperties = new ArrayList<>();
+ private final List<Addconfig> addconfig = new ArrayList<>();
+ private final List<Delconfig> delconfig = new ArrayList<>();
+ private final List<Adduser> addusers = new ArrayList<>();
+ private final List<Deluser> delusers = new ArrayList<>();
+ private final List<Adduserrole> adduserroles = new ArrayList<>();
+ private final List<Deluserrole> deluserroles = new ArrayList<>();
+ private final List<Addrole> addroles = new ArrayList<>();
+ private final List<Delrole> delroles = new ArrayList<>();
+ private final List<Addsdset> addsdsets = new ArrayList<>();
+ private final List<Addroleinheritance> addroleinheritances = new ArrayList<>();
+ private final List<Delroleinheritance> delroleinheritances = new ArrayList<>();
+ private final List<Delsdset> delsdsets = new ArrayList<>();
+ private final List<AddpermOp> addpermOps = new ArrayList<>();
+ private final List<DelpermOp> delpermOps = new ArrayList<>();
+ private final List<AddpermObj> addpermObjs = new ArrayList<>();
+ private final List<DelpermObj> delpermObjs = new ArrayList<>();
+ private final List<AddpermGrant> addpermGrants = new ArrayList<>();
+ private final List<DelpermGrant> delpermGrants = new ArrayList<>();
+ private final List<Addpwpolicy> addpolicies = new ArrayList<>();
+ private final List<Delpwpolicy> delpolicies = new ArrayList<>();
+ private final List<Addcontainer> addcontainers = new ArrayList<>();
+ private final List<Delcontainer> delcontainers = new ArrayList<>();
+ private final List<Addsuffix> addsuffixes = new ArrayList<>();
+ private final List<Delsuffix> delsuffixes = new ArrayList<>();
+ private final List<Addorgunit> addorgunits = new ArrayList<>();
+ private final List<Delorgunit> delorgunits = new ArrayList<>();
+ private final List<Adduserorgunitinheritance> adduserorgunitinheritances = new ArrayList<>();
+ private final List<Deluserorgunitinheritance> deluserorgunitinheritances = new ArrayList<>();
+ private final List<Addpermorgunitinheritance> addpermorgunitinheritances = new ArrayList<>();
+ private final List<Delpermorgunitinheritance> delpermorgunitinheritances = new ArrayList<>();
+ private final List<Addadminrole> addadminroles = new ArrayList<>();
+ private final List<Deladminrole> deladminroles = new ArrayList<>();
+ private final List<Adduseradminrole> adduseradminroles = new ArrayList<>();
+ private final List<Addadminroleinheritance> addadminroleinheritances = new ArrayList<>();
+ private final List<Deladminroleinheritance> deladminroleinheritances = new ArrayList<>();
+ private final List<Deluseradminrole> deluseradminroles = new ArrayList<>();
+ private final List<Addcontext> addcontexts = new ArrayList<>();
+ protected final List<Addgroup> addgroups = new ArrayList<>();
+ protected final List<Delgroup> delgroups = new ArrayList<>();
+ protected final List<Addgroupmember> addgroupmembers = new ArrayList<>();
+ protected final List<Delgroupmember> delgroupmembers = new ArrayList<>();
+ protected final List<Addgroupproperty> addgroupproperties = new ArrayList<>();
+ protected final List<Delgroupproperty> delgroupproperties = new ArrayList<>();
protected ConfigMgr cfgMgr = null;
protected AdminMgr adminMgr = null;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/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 c8e60c9..ed037a3 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
@@ -44,6 +44,7 @@ import org.apache.directory.fortress.core.UpdateException;
import org.apache.directory.fortress.core.util.attr.AttrHelper;
import org.apache.directory.fortress.core.util.attr.VUtil;
+
/**
* This class provides data access for the standard ldap object device that has been extended to support name/value pairs.
* Fortress uses this data structure to store its remote cfg parameters.
@@ -89,7 +90,7 @@ final class ConfigDAO extends ApacheDsDataProvider
private static final String CONFIG_OBJ_CLASS[] =
{
- SchemaConstants.DEVICE_OC, GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME
+ SchemaConstants.DEVICE_OC, GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME
};
private static final String[] CONFIG_ATRS =
@@ -97,6 +98,7 @@ final class ConfigDAO extends ApacheDsDataProvider
SchemaConstants.CN_AT, GlobalIds.PROPS
};
+
/**
* Package private default constructor.
*/
@@ -104,13 +106,14 @@ final class ConfigDAO extends ApacheDsDataProvider
{
}
+
/**
* @param name
* @param props
* @return
* @throws org.apache.directory.fortress.core.CreateException
*/
- final Properties create( String name, Properties props )
+ Properties create( String name, Properties props )
throws CreateException
{
LdapConnection ld = null;
@@ -152,7 +155,7 @@ final class ConfigDAO extends ApacheDsDataProvider
* @return
* @throws org.apache.directory.fortress.core.UpdateException
*/
- final Properties update( String name, Properties props )
+ Properties update( String name, Properties props )
throws UpdateException
{
LdapConnection ld = null;
@@ -189,7 +192,7 @@ final class ConfigDAO extends ApacheDsDataProvider
* @param name
* @throws org.apache.directory.fortress.core.RemoveException
*/
- final void remove( String name )
+ void remove( String name )
throws RemoveException
{
LdapConnection ld = null;
@@ -218,7 +221,7 @@ final class ConfigDAO extends ApacheDsDataProvider
* @return
* @throws org.apache.directory.fortress.core.UpdateException
*/
- final Properties remove( String name, Properties props )
+ Properties remove( String name, Properties props )
throws UpdateException
{
LdapConnection ld = null;
@@ -255,7 +258,7 @@ final class ConfigDAO extends ApacheDsDataProvider
* @return
* @throws org.apache.directory.fortress.core.FinderException
*/
- final Properties getConfig( String name )
+ Properties getConfig( String name )
throws FinderException
{
Properties props = null;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/cfg/ConfigP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigP.java b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigP.java
index 2f1e846..3e2be8e 100755
--- a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigP.java
+++ b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigP.java
@@ -78,7 +78,7 @@ final class ConfigP
* @return {@link Properties} containing the collection of name/value pairs just added.
* @throws SecurityException in the event entry already present or other system error.
*/
- final Properties add( String name, Properties inProps )
+ Properties add( String name, Properties inProps )
throws SecurityException
{
validate( name, inProps );
@@ -96,7 +96,7 @@ final class ConfigP
* @return {@link Properties} containing the collection of name/value pairs to be added to existing node.
* @throws org.apache.directory.fortress.core.SecurityException in the event entry not present or other system error.
*/
- final Properties update( String name, Properties inProps )
+ Properties update( String name, Properties inProps )
throws SecurityException
{
validate( name, inProps );
@@ -120,7 +120,7 @@ final class ConfigP
* @return {@link Properties} containing the collection of name/value pairs to be added to existing node.
* @throws SecurityException in the event entry not present or other system error.
*/
- final void delete( String name )
+ void delete( String name )
throws SecurityException
{
if ( !VUtil.isNotNullOrEmpty( name ) )
@@ -158,7 +158,7 @@ final class ConfigP
* @return {@link Properties} containing the collection of name/value pairs just added. Maps to 'ftProps' attribute in 'ftProperties' object class.
* @throws org.apache.directory.fortress.core.SecurityException in the event entry doesn't exist or other system error.
*/
- final Properties read( String name )
+ Properties read( String name )
throws SecurityException
{
Properties outProps;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/cli/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/package.html b/src/main/java/org/apache/directory/fortress/core/cli/package.html
index 7414fc0..6bec747 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/package.html
+++ b/src/main/java/org/apache/directory/fortress/core/cli/package.html
@@ -18,80 +18,83 @@
*
-->
<html>
-<head>
+ <head>
<title>Fortress Command Line Interpreter Reference Manual</title>
-</head>
-<body>
-<p>
- <A HREF="package-summary.html">Click here</A> for Reference Manual which shows how the Command Line Interpreter
- drives the Fortress APIs from a command prompt.
-</p>
+ </head>
+ <body>
+ <p>
+ <A HREF="package-summary.html">Click here</A>
+ for Reference Manual which shows how the Command Line Interpreter
+ drives the Fortress APIs from a command prompt.
+ </p>
-<h2>Instructions to start and use the Fortress CLI program</h2>
-<br>Note: Information to set up environment of Fortress runtime, check out file named <b>README.txt</b> found in root
-folder of Fortress SDK package.
-<ol>
- <li>Open shell prompt within FORTRESS_HOME folder and enter the following</li>
- <li>export JAVA_HOME=/path to the root folder of your java SDK, version 7 and beyond required</li>
- <li>export M2_HOME=/path to the root folder of your Apache Maven installation, version 3 and beyond required</li>
- <li>$M2_HOME/bin/mvn -Pcli test</li>
- <li>This will fire Fortress ant target which then starts the CLI. The CLI syntax will be described in detail
- below.
- </li>
-</ol>
-<h2>Command Line Interpreter Reference Manual</h2>
-Once started, the Fortress CLI runs in interactive mode which means it runs continously waiting for user to enter a
-valid commands or terminate. Every CLI command is structured in the following format:<br>
+ <h2>Instructions to start and use the Fortress CLI program</h2>
+ <br/>Note: Information to set up environment of Fortress runtime, check out file named <b>README.txt</b>
+ found in root folder of Fortress SDK package.
+ <ol>
+ <li>Open shell prompt within FORTRESS_HOME folder and enter the following</li>
+ <li>export JAVA_HOME=/path to the root folder of your java SDK, version 7 and beyond required</li>
+ <li>export M2_HOME=/path to the root folder of your Apache Maven installation, version 3 and beyond required</li>
+ <li>$M2_HOME/bin/mvn -Pcli test</li>
+ <li>This will fire Fortress ant target which then starts the CLI. The CLI syntax will be described in detail
+ below.</li>
+ </ol>
-<p>
- <b>group function options</b><br><br>
- For example:
-<pre>admin auser -u hounddog42 -p myNewP@$$w0rd -o development</pre>
-In this example the group is 'admin', the function is 'auser' or add user, and the options are -u for userid, -p for
-password and -o that points to a valid USERS OrgUnit node.
-Despite being called an 'option', so named parameters may or may not be required for a given function. Option names are
-always preceded by a dash ('-') when entered. Option values
-must be enclosed within single quotes '' or double quotes "" iff value contains multiple Strings separated by
-whitespace. For example the user description value can be entered like
-this: -d "This description contains more than one word" or this: -d 'This description also contains more than one word'.
-<br>
-<br>Below is reference manual for Fortress' CLI commands
-</p>
+ <h2>Command Line Interpreter Reference Manual</h2>
+ Once started, the Fortress CLI runs in interactive mode which means it runs continuously waiting for user to enter
+ a valid commands or terminate. Every CLI command is structured in the following format:<br/>
-<h2>Groups</h2>
+ <p><b>group function options</b><br/><br/>
+
+ For example:
+ <pre>admin auser -u hounddog42 -p myNewP@$$w0rd -o development</pre>
+ In this example the group is 'admin', the function is 'auser' or add user, and the options are -u for userid,
+ -p for password and -o that points to a valid USERS OrgUnit node.
+ Despite being called an 'option', so named parameters may or may not be required for a given function. Option
+ names are always preceded by a dash ('-') when entered. Option values must be enclosed within single quotes ''
+ or double quotes "" if value contains multiple Strings separated by whitespace. For example the user description
+ value can be entered like this: -d "This description contains more than one word" or this: -d 'This description
+ also contains more than one word'.
+ <br/>
+ <br/>Below is reference manual for Fortress' CLI commands
+ </p>
-Currently the following groups of functions are supported:
-<ul>
- <li>admin - used to setup RBAC policies</li>
- <li>review - used to interrogate RBAC policies</li>
- <li>system - used to test RBAC policies</li>
- <li>dadmin - used to setup ARBAC (administrative role based access control) policies</li>
- <li>group - used to setup LDAP Group policies</li>
-</ul>
-<h2>Sample run to add new User to LDAP</h2>
- <pre>
-[echo] Run the Fortress Command Line Interpreter
-[java] 2011-12-03 21:10:02,431 (INFO ) CLI Options include admin, review, system, dadmin
-[java] 2011-12-03 21:10:02,431 (INFO ) Enter one from above or 'q' to quit
-<b>admin auser -u hounddog42 -p myNewP@$$w0rd -o development</b>
- [java] 2011-12-03 21:41:37,614 (INFO ) arg:admin
- [java] 2011-12-03 21:41:37,614 (INFO ) arg:auser
- [java] 2011-12-03 21:41:37,615 (INFO ) arg:-u
- [java] 2011-12-03 21:41:37,615 (INFO ) arg:hounddog42
- [java] 2011-12-03 21:41:37,615 (INFO ) arg:-p
- [java] 2011-12-03 21:41:37,616 (INFO ) arg:-o
- [java] 2011-12-03 21:41:37,616 (INFO ) arg:development
- [java] 2011-12-03 21:41:37,617 (INFO ) auser
- [java] 2011-12-03 21:41:37,750 (INFO ) command:auser was successful
- [java] 2011-12-03 21:41:37,750 (INFO ) CLI Options include admin, review, system, dadmin
- [java] 2011-12-03 21:41:37,751 (INFO ) Enter one from above or 'q' to quit
- </pre>
+ <h2>Groups</h2>
+
+ Currently the following groups of functions are supported:
+ <ul>
+ <li>admin - used to setup RBAC policies</li>
+ <li>review - used to interrogate RBAC policies</li>
+ <li>system - used to test RBAC policies</li>
+ <li>dadmin - used to setup ARBAC (administrative role based access control) policies</li>
+ <li>group - used to setup LDAP Group policies</li>
+ </ul>
+
+ <h2>Sample run to add new User to LDAP</h2>
+ <pre>
+ [echo] Run the Fortress Command Line Interpreter
+ [java] 2011-12-03 21:10:02,431 (INFO ) CLI Options include admin, review, system, dadmin
+ [java] 2011-12-03 21:10:02,431 (INFO ) Enter one from above or 'q' to quit
+ <b>admin auser -u hounddog42 -p myNewP@$$w0rd -o development</b>
+ [java] 2011-12-03 21:41:37,614 (INFO ) arg:admin
+ [java] 2011-12-03 21:41:37,614 (INFO ) arg:auser
+ [java] 2011-12-03 21:41:37,615 (INFO ) arg:-u
+ [java] 2011-12-03 21:41:37,615 (INFO ) arg:hounddog42
+ [java] 2011-12-03 21:41:37,615 (INFO ) arg:-p
+ [java] 2011-12-03 21:41:37,616 (INFO ) arg:-o
+ [java] 2011-12-03 21:41:37,616 (INFO ) arg:development
+ [java] 2011-12-03 21:41:37,617 (INFO ) auser
+ [java] 2011-12-03 21:41:37,750 (INFO ) command:auser was successful
+ [java] 2011-12-03 21:41:37,750 (INFO ) CLI Options include admin, review, system, dadmin
+ [java] 2011-12-03 21:41:37,751 (INFO ) Enter one from above or 'q' to quit
+ </pre>
+
+ <p>
+ This remainder of document is a command reference document to show how the Fortress CLI works.
+ <ol type="I">
+ <li>
-<p>
- This remainder of document is a command reference document to show how the Fortress CLI works.
-<ol type="I">
-<li>
-<h2>Adminstrative Commands</h2>
+<h2>Administrative Commands</h2>
This section contains a guide for the <b>functions</b> and <b>options</b> that fall in the <b>admin</b> group.
<ol type="A">
<li>
@@ -155,7 +158,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>uuser : function to update an existing user in LDAP</h3>
@@ -214,7 +217,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>duser : function to delete a user from LDAP</h3>
@@ -236,7 +239,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin duser -u testuser1</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>change : function to change a user's password</h3>
@@ -256,7 +259,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin change -u testuser1 -p mypasword123 -V mynewpassword456</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>reset : function to perform an administrative reset on user password</h3>
@@ -276,7 +279,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin reset -u testuser1 -V temp777</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>lock : LOCK_USER_ACCOUNT</h3>
@@ -293,7 +296,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin lock -u testuser1</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>unlock : UNLOCK_USER_ACCOUNT</h3>
@@ -311,7 +314,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin unlock -u testuser1</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>arole : Add a new Role</h3>
@@ -345,7 +348,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin arole -n trole2 -d roledescription -b 0900 -e 1800 -B 20120101 -E 20990101 -m 1234567</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>urole : Update an existing Role</h3>
@@ -377,7 +380,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin urole -n trole2 -b 0800 -B 20111231 -m 23456</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>drole : Delete a Role</h3>
@@ -397,7 +400,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin drole -n trole1</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>asgnrole : Assign a Role to a User</h3>
@@ -456,7 +459,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin asgnrole -u testuser2 -n trole2 -b 1200 -e 2359 -B 20120101 -E 20120131 -m 1234567</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>dsgnrole : Deassign a Role from a User</h3>
@@ -467,7 +470,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
the ROLES data set, and the user is assigned to the role.
Any sessions that currently have this role activated will not be effected.
</p>
- <br>Successful completion includes:
+ <br/>Successful completion includes:
<ul>
<li>User entity in USER data set has role assignment removed.</li>
<li>Role entity in ROLE data set has userId removed as role occupant.</li>
@@ -483,7 +486,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin dsgnrole -u testuser2 -n trole2</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>arel : ADD_ROLE_INHERITANCE</h3>
@@ -511,7 +514,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin arel -A trole1 -D trole2</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>drel : DELETE_ROLE_INHERITANCE</h3>
@@ -536,7 +539,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin drel -A trole1 -D trole2</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>asset : CREATE_SSD_SET</h3>
@@ -572,7 +575,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin asset -n mytestssd -r trole1 -r trole3 -r trole5 -r trole6 -c 3 -d only2of4canAssign</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>dsset : DELETE_SSD_SET</h3>
@@ -590,7 +593,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin dsset -n mytestssd</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>adset : CREATE_DSD_SET</h3>
@@ -627,7 +630,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin adset -n mytestdsd -r trole1 -r trole3 -r trole5 -r trole6 -c 2 -d only1of4canActivate</li>
<li>admin adset -n mytestdsd -r trole1 -r trole3 -r trole5 -r trole6 -c 3 -d only2of4canActivate</li>
</ul>
-</li><br>
+</li><br/>
<li>
<h3>ddset : DELETE_DSD_SET</h3>
@@ -645,7 +648,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin ddset -n mytestdsd</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>aobj : ADD_POBJ</h3>
@@ -675,7 +678,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin aobj -n myobject2 -o app1 -d TestObject -t anything -v key1:val1 -v key2:val2</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>uobj : UPDATE_POBJ</h3>
@@ -705,7 +708,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin uobj -n myobject2 -o app1 -d ChangeDescription</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>dobj : DELETE_POBJ</h3>
@@ -724,7 +727,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin dobj -n mytestobject -o app1</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>aperm : ADD_PERM</h3>
@@ -756,7 +759,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin aperm -n myobject2 -O myoperation2 -r trole1 -r trole5</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>uperm : UPDATE_PERM</h3>
@@ -786,7 +789,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin uperm -n myobject2 -O myoperation2 -r trole6 -D ReplaceExistingGrantsWithThisRole</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>dperm : DELETE_PERM</h3>
@@ -807,7 +810,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin dperm -n mytestobject -O myoperation -d CreateNewPermission</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>grant : GRANT</h3>
@@ -830,7 +833,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin grant -n mytestobject -O myoperation -R trole1</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>revoke : REVOKE </h3>
@@ -854,7 +857,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>admin revoke -n mytestobject -O myoperation -R trole1</li>
</ul>
</li>
-<br>
+<br/>
</ol>
</li>
@@ -913,7 +916,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>urole : Update an existing ADMIN_Role</h3>
@@ -960,7 +963,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin urole -n arole2 -x role4 -w role1 -y true -z false</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>drole : Delete an ADMIN_Role</h3>
@@ -980,7 +983,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin drole -n arole1</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>asgnrole : Assign an ADMIN_Role to a User</h3>
@@ -1029,7 +1032,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin asgnrole -u testuser2 -n arole2 -b 1200 -e 2359 -B 20120101 -E 20120131 -m 1234567</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>dsgnrole : Deassign a ADMIN_Role from a User</h3>
@@ -1054,7 +1057,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin dsgnrole -u testuser2 -n arole1</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>arel : ADD_ADMIN_ROLE_INHERITANCE</h3>
@@ -1080,7 +1083,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin arel -A arole1 -D arole2</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>drel : DELETE_ADMIN_ROLE_INHERITANCE</h3>
@@ -1107,7 +1110,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin drel -A arole1 -D arole2</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>auou : ADD_USERORG</h3>
@@ -1127,7 +1130,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin auou -n UserOrg2 -d description-contains-any-safe-text</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>uuou : UPDATE_USERORG</h3>
@@ -1149,7 +1152,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin uuou -n UserOrg2 -d updated-description-contains-any-safe-text</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>duou : DELETE_USERORG</h3>
@@ -1167,7 +1170,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin duou -n UserOrg1</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>aurel : ADD_USERORG_INHERITANCE</h3>
@@ -1194,7 +1197,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin aurel -A UserOrg1 -D UserOrg2</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>durel : DELETE_USERORG_INHERITANCE</h3>
@@ -1220,7 +1223,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin durel -A UserOrg1 -D UserOrg2</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>apou : ADD_PERMORG</h3>
@@ -1240,7 +1243,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin apou -n PermOrg2 -d description-contains-any-safe-text</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>upou : UPDATE_PERMORG</h3>
@@ -1262,7 +1265,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin upou -n PermOrg1 -d description-contains-any-safe-text</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>dpou : DELETE_PERMORG</h3>
@@ -1280,7 +1283,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin dpou -n PermOrg2</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>aprel : ADD_PERMORG_INHERITANCE</h3>
@@ -1306,7 +1309,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin aprel -A PermOrg1 -D PermOrg2</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>dprel : DELETE_PERMORG_INHERITANCE</h3>
@@ -1332,7 +1335,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin dprel -A PermOrg1 -D PermOrg2</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>aobj : ADD_ADMIN_POBJ</h3>
@@ -1363,7 +1366,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin aobj -n myobject2 -o app1 -d TestObject -t anything -v key1:val1 -v key2:val2</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>uobj : UPDATE_ADMIN_POBJ</h3>
@@ -1393,7 +1396,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin uobj -n myobject2 -o app1 -d ChangeDescription</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>dobj : DELETE_POBJ</h3>
@@ -1413,7 +1416,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin dobj -n mytestobject -o app1</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>aperm : ADD_ADMIN_PERM</h3>
@@ -1442,7 +1445,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin aperm -n mytestobject -O myoperation -d CreateNewAdminPermission</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>uperm : UPDATE_ADMIN_PERM</h3>
@@ -1470,7 +1473,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin uperm -n mytestobject -O myoperation -d new-description</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>dperm : DELETE_ADMIN_PERM</h3>
@@ -1491,7 +1494,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin dperm -n mytestobject -O myoperation -d CreateNewAdminPermission</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>grant : GRANT ADMIN</h3>
@@ -1514,7 +1517,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin grant -n mytestobject -O myoperation -R arole1</li>
</ul>
</li>
-<br>
+<br/>
<li>
<h3>revoke : REVOKE ADMIN</h3>
@@ -1538,7 +1541,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>dadmin revoke -n mytestobject -O myoperation -R arole1</li>
</ul>
</li>
-<br>
+<br/>
</ol>
</li>
@@ -1563,7 +1566,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>review ruser -u testuser1</li>
</ul>
</li>
- <br>
+ <br/>
<li>
<h3>fuser : FIND_USERS</h3>
@@ -1585,7 +1588,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>review fuser -u test</li>
</ul>
</li>
- <br>
+ <br/>
<li>
<h3>asgnuser : ASSIGNED_USERS</h3>
@@ -1604,7 +1607,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>review asgnuser -n -role1</li>
</ul>
</li>
- <br>
+ <br/>
<li>
<h3>rrole : READ_ROLE</h3>
@@ -1622,7 +1625,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>review rrole -n role1</li>
</ul>
</li>
- <br>
+ <br/>
<li>
<h3>frole : FIND_ROLES</h3>
@@ -1645,7 +1648,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>review frole -n role</li>
</ul>
</li>
- <br>
+ <br/>
<li>
<h3>robj : READ_POBJ</h3>
@@ -1663,7 +1666,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>review robj -n mytestobject</li>
</ul>
</li>
- <br>
+ <br/>
<li>
<h3>fobj : FIND_POBJS</h3>
@@ -1686,7 +1689,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>review robj -n my</li>
</ul>
</li>
- <br>
+ <br/>
<li>
<h3>rperm : READ_PERM</h3>
@@ -1706,7 +1709,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>review rperm -n mytestobject -O myoperation</li>
</ul>
</li>
- <br>
+ <br/>
<li>
<h3>fperm : FIND_PERMS</h3>
@@ -1734,7 +1737,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li>review fperm -n mytest -O my</li>
</ul>
</li>
- <br>
+ <br/>
</ol>
</li>
@@ -1919,7 +1922,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
</ul>
</li>
- <br>
+ <br/>
</ol>
<!-- end group -->
</li>
@@ -1953,7 +1956,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li></li>
</ul>
</li>
- <br>
+ <br/>
<li>
<h3>authenticate : AUTHENTICATE</h3>
@@ -1978,7 +1981,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li></li>
</ul>
</li>
- <br>
+ <br/>
<li>
<h3>assignedroles : ASSIGNED_ROLES</h3>
@@ -2003,7 +2006,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li></li>
</ul>
</li>
- <br>
+ <br/>
<li>
<h3>checkaccess : CHECK_ACCESS</h3>
@@ -2028,7 +2031,7 @@ This section contains a guide for the <b>functions</b> and <b>options</b> that f
<li></li>
</ul>
</li>
- <br>
+ <br/>
</ol>
</li>
<p>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
index 4332fee..fe53020 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
@@ -18,118 +18,122 @@
*
-->
<html>
-<head>
+ <head>
<title>Apache Fortress Ten Minute Guide</title>
- <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-</head>
-<body>
-<hr>
-<fieldset>
- <legend><b>Navigation Links</b></legend>
- <ul>
- <li><a href="./apache-directory-server.html">Setup Apache Directory Server</a></li>
- <li><a href="./apache-directory-studio.html">Setup Apache Directory Studio</a></li>
- <li><a href="./apache-fortress-core.html">Build Apache Fortress Core</a></li>
- <li><a href="./apache-fortress-realm.html">Build Apache Fortress Realm</a></li>
- <li><a href="./apache-tomcat.html">Setup Apache Tomcat Web Server</a></li>
- <li><a href="./apache-fortress-web.html">Build Apache Fortress Web</a></li>
- <li><a href="./apache-fortress-rest.html">Build Apache Fortress Rest</a></li>
- </ul>
- <li><a href="./ten-minute-guide.html">Ten Minute Guide</a></li>
-</fieldset>
-<hr>
-<p>
-
-<h3>Setup Apache Directory Server</h3>
-<img src="apacheds-logo.jpeg">
-<br><br>
-<h4>This section provides instructions to install the Apache Directory Server which is needed by Fortress</h4>
-Steps to install:
-<ol>
-
- <li>
+ <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style"/>
+ </head>
+
+ <body>
+ <hr>
+ <fieldset>
+ <legend><b>Navigation Links</b></legend>
+ <ul>
+ <li><a href="./apache-directory-server.html">Setup Apache Directory Server</a></li>
+ <li><a href="./apache-directory-studio.html">Setup Apache Directory Studio</a></li>
+ <li><a href="./apache-fortress-core.html">Build Apache Fortress Core</a></li>
+ <li><a href="./apache-fortress-realm.html">Build Apache Fortress Realm</a></li>
+ <li><a href="./apache-tomcat.html">Setup Apache Tomcat Web Server</a></li>
+ <li><a href="./apache-fortress-web.html">Build Apache Fortress Web</a></li>
+ <li><a href="./apache-fortress-rest.html">Build Apache Fortress Rest</a></li>
+ </ul>
+ <li><a href="./ten-minute-guide.html">Ten Minute Guide</a></li>
+ </fieldset>
+ <hr>
+ <p>
+
+ <h3>Setup Apache Directory Server</h3>
+ <img src="apacheds-logo.jpeg"/>
+ <br/><br/>
+
+ <h4>This section provides instructions to install the Apache Directory Server which is needed by Fortress</h4>
+ Steps to install:
+ <ol>
+
+ <li>
Download and install Apache Directory Server
- <br><br>
+ <br/><br/>
For 32-bit (as root):
<pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
wget http://mirror.nexcess.net/apache//directory/apacheds/dist/2.0.0-M19/apacheds-2.0.0-M19-32bit.bin
chmod a+x *.bin
./apacheds-2.0.0-M19-32bit.bin
- </p>
+ </p>
</pre>
+
For 64-bit (as root):
<pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
wget http://mirror.nexcess.net/apache//directory/apacheds/dist/2.0.0-M19/apacheds-2.0.0-M19-64bit.bin
chmod a+x *.bin
./apacheds-2.0.0-M19-64bit.bin
- </p>
+ </p>
</pre>
Unless you know what you're doing, accept the defaults.
- </li>
+ </li>
- <br>
+ <br/>
- <li>
- If you have trouble pulling you can get binaries here: <a href="http://directory.apache.org/apacheds/downloads.html">Apache Directory Downloads Page</a>.
- </li>
+ <li>
+ If you have trouble pulling you can get binaries here:
+ <a href="http://directory.apache.org/apacheds/downloads.html">Apache Directory Downloads Page</a>.
+ </li>
- <br>
+ <br/>
- <li>
+ <li>
Edit ApacheDS conf file
<pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
sudo vi /opt/apacheds-2.0.0-M19/conf/wrapper.conf
- </p>
+ </p>
</pre>
- </li>
+ </li>
- <li>
+ <li>
Add location of java:
<pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
wrapper.java.command=/path/java/bin/java
- </p>
+ </p>
</pre>
Where 'path' equals fully qualified location of target machine's java.
- </li>
+ </li>
- <br>
+ <br/>
- <li>
+ <li>
Save and exit.
- </li>
+ </li>
- <br>
+ <br/>
- <li>
+ <li>
After installation start the directory server process.
From system command prompt (as root):
<pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
/etc/init.d/apacheds-2.0.0-M19-default start
- </p>
+ </p>
</pre>
- </li>
+ </li>
- <li>
+ <li>
Check the status of server process.
From system command prompt (as root):
<pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
/etc/init.d/apacheds-2.0.0-M19-default status
ApacheDS - default is running (70041).
- </p>
+ </p>
</pre>
- </li>
+ </li>
- <br>
-</ol>
-</body>
-<p style="font: monospace; color: black; font-size: 6pt">Copyright 2003-2015, The Apache Software Foundation. All Rights
- Reserved.</p>
+ <br/>
+ </ol>
+ </body>
+ <p style="font: monospace; color: black; font-size: 6pt">Copyright 2003-2015, The Apache Software Foundation.
+ All RightsReserved.</p>
</html>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html
index 0f23383..c7c46dc 100644
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html
@@ -20,7 +20,7 @@
<html>
<head>
<title>Apache Fortress Ten Minute Guide</title>
- <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+ <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style"/>
</head>
<body>
<hr>
@@ -42,14 +42,14 @@
<h3>Setup Apache Directory Studio</h3>
<img src="apache-studio-logo.jpeg">
-<br><br>
+<br/><br/>
<h4>This section provides instructions to install and configure Apache Directory Studio LDAP Browser</h4>
Steps to install:
<ol>
<li>
Download and install Apache Directory Studio
- <br><br>
+ <br/><br/>
For 32-bit:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
@@ -72,7 +72,7 @@ cd ApacheDirectoryStudio-linux-x86_64-2.0.0.v20130628/
If you have trouble pulling you can get binaries here: <a href="http://directory.apache.org/studio/downloads.html">Apache Directory Studio Downloads Page</a>
</li>
- <br>
+ <br/>
<li>
After installation start the directory studio process.
@@ -83,28 +83,28 @@ cd ApacheDirectoryStudio-linux-x86_64-2.0.0.v20130628/
</pre>
</li>
- <br>
+ <br/>
<li>
From the LDAP Browser perspective create a new connection. Enter an arbitrary name for connection, e.g.
'apacheds'. If apache directory server is running locally you may use 'localhost' and default port is
'10389'.
</li>
- <br><img src="./connection-create-screenshot1.png" height="75%" width="50%"/><br><br>
+ <br/><img src="./connection-create-screenshot1.png" height="75%" width="50%"/><br/><br/>
- <br>
+ <br/>
<li>
The default creds for apache directory server are 'uid=admin,ou=system' and 'secret' for the password.
It's a good idea to verify this info by clicking on the 'Check Authentication' button.
</li>
- <br><img src="./connection-create-screenshot2.png" height="75%" width="50%"/><br><br>
+ <br/><img src="./connection-create-screenshot2.png" height="75%" width="50%"/><br/><br/>
- <br>
+ <br/>
<li>
After all the info has been entered, you should be able to browse the directory.
</li>
- <br><img src="./connection-create-screenshot3.png" height="75%" width="50%"/><br><br>
+ <br/><img src="./connection-create-screenshot3.png" height="75%" width="50%"/><br/><br/>
</ol>
</body>
<p style="font: monospace; color: black; font-size: 6pt">Copyright 2003-2015, The Apache Software Foundation. All Rights
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-core.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-core.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-core.html
index f8dcd0d..1f4d44f 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-core.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-core.html
@@ -20,7 +20,7 @@
<html>
<head>
<title>Apache Fortress Ten Minute Guide</title>
- <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+ <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style"/>
</head>
<body>
<hr>
@@ -42,13 +42,13 @@
<h3>Build Apache Fortress Core</h3>
<img src="fortress100.gif">
-<br><br>
+<br/><br/>
<h4>This section provides instructions to install Fortress Core, setup usage with ApacheDS, and run the junit tests</h4>
Steps to complete:
<ol>
<li>Set java and maven home env variables.</li>
- <br>
+ <br/>
<li>
Change directory:
@@ -71,7 +71,7 @@ cp build.properties.example build.properties
<li>
Edit the build.properties in root folder of package.
These parameters will be used to generate config artifacts: <b>config/fortress.properties</b> and <b>ldap/setup/refreshLDAPData.xml</b>, needed later on.
- <br>
+ <br/>
Change the settings to:
<pre>
@@ -108,47 +108,47 @@ ls -l ldap/setup/refreshLDAPData.xml
Load the fortress schema contained in <b>ldap/schema/apacheds-fortress.ldif</b> to ApacheDS instance using
Apache Directory Studio.
- <br><br>
+ <br/><br/>
<ol type="A">
<li>
In Apache Directory Studio LDAP Browser perspective, select Root DSE, right-click, and choose
Import->LDIF Import
</li>
- <br><img src="./schema-import-screenshot1.png" height="50%" width="50%"/><br><br>
+ <br/><img src="./schema-import-screenshot1.png" height="50%" width="50%"/><br/><br/>
- <br>
+ <br/>
<li>
Next a dialog box will appear where you can enter the fully qualified file name of the fortress schema.
</li>
- <br><img src="./schema-import-screenshot2.png" height="50%" width="50%"/><br><br>
+ <br/><img src="./schema-import-screenshot2.png" height="50%" width="50%"/><br/><br/>
- <br>
+ <br/>
<li>
The schema file is located under the fortress core base package/ldap/schema/apacheds-fortress.ldif
</li>
- <br><img src="./schema-import-screenshot3.png" height="50%" width="50%"/><br><br>
+ <br/><img src="./schema-import-screenshot3.png" height="50%" width="50%"/><br/><br/>
- <br>
+ <br/>
<li>
Verify success by viewing the cn=fortress schema node.
</li>
- <br><img src="./schema-import-screenshot4.png" height="50%" width="50%"/><br><br>
+ <br/><img src="./schema-import-screenshot4.png" height="50%" width="50%"/><br/><br/>
</ol>
</li>
- <br>
+ <br/>
<li>
Setup partition in ApacheDS server matching ldap server params in <b>config/fortress.properties</b> file.
</li>
- <br>
+ <br/>
<li>
Build the fortress LDAP DIT, create its config node and load the A/RBAC policies:
@@ -170,7 +170,7 @@ mvn test -Dtest=FortressJUnitTest
Tests should run with no errors.
</li>
- <br>
+ <br/>
<li>
Run the Fortress Command Line Interface:
@@ -183,7 +183,7 @@ mvn test -Pcli
<a href="../cli/package-summary.html">Fortress CLI Instruction Manual</a>
</li>
- <br>
+ <br/>
<li>
Run the Fortress Console:
@@ -193,28 +193,28 @@ mvn test -Pconsole
</p>
</pre>
This program provides an interfactive console for driving the fortress functions. It is useful for testing and ad-hoc updates to the data.
- <br><br>
+ <br/><br/>
<ol type="a">
<li>Start at the Main Menu:
- <br><img src="./screenshot-fortress-console-main.png" height="50%" width="40%"/>
- <br>Enter option to perform a particular manager function.
+ <br/><img src="./screenshot-fortress-console-main.png" height="50%" width="40%"/>
+ <br/>Enter option to perform a particular manager function.
</li>
- <br>
+ <br/>
<li>Option '1' for RBAC Admin Manager Functions:
- <br><img src="./screenshot-fortress-console-rbac-admin.png" height="50%" width="25%"/>
- <br>Add, Update and Delete RBAC entities.
+ <br/><img src="./screenshot-fortress-console-rbac-admin.png" height="50%" width="25%"/>
+ <br/>Add, Update and Delete RBAC entities.
</li>
- <br>
+ <br/>
<li>Option '2' for RBAC Review Manager Functions:
- <br><img src="./screenshot-fortress-console-rbac-review.png" height="50%" width="35%"/>
- <br>Read and Search RBAC entities.
+ <br/><img src="./screenshot-fortress-console-rbac-review.png" height="50%" width="35%"/>
+ <br/>Read and Search RBAC entities.
</li>
- <br>
+ <br/>
<li>Option '3' for RBAC Access Manager Functions:
- <br><img src="./screenshot-fortress-console-rbac-access.png" height="50%" width="35%"/>
- <br>Test RBAC runtime functions like createSession and checkAccess.
+ <br/><img src="./screenshot-fortress-console-rbac-access.png" height="50%" width="35%"/>
+ <br/>Test RBAC runtime functions like createSession and checkAccess.
</li>
- <br>
+ <br/>
<li>etc</li>
</ol>
</li>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-realm.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-realm.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-realm.html
index 693d300..6d09c58 100644
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-realm.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-realm.html
@@ -20,7 +20,7 @@
<html>
<head>
<title>Apache Fortress Ten Minute Guide</title>
- <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+ <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style"/>
</head>
<body>
<hr>
@@ -38,7 +38,7 @@
<li><a href="./ten-minute-guide.html">Ten Minute Guide</a></li>
</fieldset>
<hr>
-<p>
+<p/>
<h3>Build Apache Fortress Realm</h3>
@@ -48,7 +48,7 @@
<li>Set java and maven home env variables.</li>
- <br>
+ <br/>
<li>
Change directory:
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-rest.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-rest.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-rest.html
index e95daf8..321e482 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-rest.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-rest.html
@@ -20,7 +20,7 @@
<html>
<head>
<title>Apache Fortress Ten Minute Guide</title>
- <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+ <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style"/>
</head>
<body>
<hr>
@@ -41,7 +41,7 @@
<p>
<h3>Build Apache Fortress Rest</h3>
-<img src="screenshot-fortress-rest-javadoc.png" height="40%" width="40%">
+<img src="screenshot-fortress-rest-javadoc.png" height="40%" width="40%"/>
<h4>This section describes how to install and use the Fortress Rest Application. It provides a RESTful wrapper around
the Fortress Core apis.</h4>
@@ -49,7 +49,7 @@
<li>Set java and maven home env variables.</li>
- <br>
+ <br/>
<li>
Change directory:
@@ -60,7 +60,7 @@ cd directory-fortress-enmasse/
</pre>
</li>
- <br>
+ <br/>
<li>
Copy the fortress.properties, created on step <a href="./apache-fortress-core.html">Build Apache Fortress
@@ -74,7 +74,7 @@ cp [directory-fortress-core]/config/fortress.properties [directory-fortress-enma
[directory-fortress-enmasse] is the current package's home folder.
</li>
- <br>
+ <br/>
<li>
To load policies for testing into ldap, run this command:
@@ -113,7 +113,7 @@ mvn test -Dtest=EmTest
Checkout the README.txt in [directory-fortress-enmasse] package for other ways to test fortress-rest component.
</li>
- <br>
+ <br/>
<li>
Generate the javadoc
@@ -124,7 +124,7 @@ mvn javadoc:javadoc
</pre>
Point your web browser to the following location:
file:///[directory-fortress-enmasse]/target/site/apidocs.
- <br><br>
+ <br/><br/>
javadoc note: If using JDK 8, you must turn off doclint to get past errors. Add the following to project's pom:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/33477ff6/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
index 4e8987a..ec9f941 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
@@ -20,7 +20,7 @@
<html>
<head>
<title>Apache Fortress Ten Minute Guide</title>
- <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+ <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style"/>
</head>
<body>
<hr>
@@ -42,14 +42,14 @@
<h3>Setup Apache Tomcat Web Server</h3>
<img src="tomcat.png">
-<br><br>
+<br/><br/>
This document contains instructions to install Tomcat 7 and configure for use with Fortress Realm.
<hr>
<h4>This section covers installation to Linux distros</h4>
<ol>
<li>
If Tomcat is already installed skip this step.
- <br><br>
+ <br/><br/>
As root, issue the following commands:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
@@ -84,7 +84,7 @@ cp [directory-fortress-realm]/proxy/target/fortress-realm-proxy-[VERSION]-proxy.
[VERSION] matches [directory-fortress-realm] package pom.xml file. At the time of this writing the current version was 1.0-RC40.
</li>
- <br>
+ <br/>
<li>
Edit tomcat-users.xml:
@@ -110,13 +110,13 @@ vi /usr/local/tomcat7/conf/tomcat-users.xml
security <b>antipattern</b>. In production, the fortress realm should be used globally by Tomcat.
</li>
- <br>
+ <br/>
<li>
Save and exit.
</li>
- <br>
+ <br/>
<li>
Restart Tomcat:
@@ -141,14 +141,14 @@ tail -f -n10000 /usr/local/tomcat7/logs/catalina.out
UnsupportedClassVersionError. This is a sure sign that your Tomcat is running under the wrong version of java. Remember Java 7 or greater is required to run this tutorial.
</li>
- <br>
+ <br/>
<li>
Verify setup by signing onto the Tomcat Manager app with credentials <b>userId</b>: <i>tcmanagergui</i>, <b>password</b>:
<i>m@nager123</i>
- <br><br>
+ <br/><br/>
<a href="http://localhost:8080/manager">http://localhost:8080/manager</a>
- <br>
+ <br/>
</li>
</ol>
[5/5] directory-fortress-core git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/directory-fortress-core
Posted by el...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-fortress-core
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/195bcc1e
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/195bcc1e
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/195bcc1e
Branch: refs/heads/master
Commit: 195bcc1eeca2914b3b3559dbc1420a79b3a92a2e
Parents: 33477ff d48b33c
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Wed May 20 09:35:25 2015 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Wed May 20 09:35:25 2015 +0200
----------------------------------------------------------------------
.../directory/fortress/core/rbac/PermDAO.java | 72 ++++++++++++++------
.../directory/fortress/core/rbac/SdDAO.java | 4 +-
.../directory/fortress/core/rbac/UserDAO.java | 14 ++--
3 files changed, 59 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/195bcc1e/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/195bcc1e/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/195bcc1e/src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java
----------------------------------------------------------------------