You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/01/27 13:54:28 UTC
[01/23] directory-fortress-core git commit: FC-29 -
AuditMgr.getUserAuthZ cannot pull back failedOnly
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 94935f564 -> 2a464183a
FC-29 - AuditMgr.getUserAuthZ cannot pull back failedOnly
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/3966a151
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/3966a151
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/3966a151
Branch: refs/heads/master
Commit: 3966a15188bc8b2ccd6ed99e7be0af0664cdc33e
Parents: 94935f5
Author: Shawn McKinney <sm...@apache.org>
Authored: Sat Dec 20 10:19:56 2014 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sat Dec 20 10:19:56 2014 -0600
----------------------------------------------------------------------
build.properties | 26 ++--
build.xml | 3 +-
ivy.xml | 2 +-
pom.xml | 2 +-
.../directory/fortress/core/GlobalIds.java | 15 ++-
.../core/ldap/ApacheDsDataProvider.java | 15 ++-
.../directory/fortress/core/rbac/AuditDAO.java | 4 +-
.../directory/fortress/core/rbac/PermDAO.java | 14 +-
.../fortress/core/rbac/Permission.java | 1 +
.../directory/fortress/core/rbac/User.java | 63 ++++++++-
.../fortress/core/util/attr/AttrHelper.java | 133 ++++++-------------
.../fortress/core/AccessMgrConsole.java | 17 ++-
.../fortress/core/AdminMgrConsole.java | 27 ++++
.../fortress/core/AuditMgrConsole.java | 121 +++++++++++++++--
.../fortress/core/ReviewMgrConsole.java | 18 +++
.../fortress/core/rbac/AccessMgrImplTest.java | 91 +++++++------
.../fortress/core/rbac/AuditMgrImplTest.java | 14 +-
17 files changed, 390 insertions(+), 176 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index 70c4b89..ba4cb7a 100644
--- a/build.properties
+++ b/build.properties
@@ -32,7 +32,7 @@
########################################################################
# Use this Fortress Core version:
-version=1.0-RC39
+version=1.0-RC40-SNAPSHOT
# Enable local.mode property if your machine does not have connection to Internet and runtime dependencies have already downloaded to FORTRESS_HOME/lib folder on this machine:
#local.mode=true
@@ -63,14 +63,16 @@ http.protocol=http
########################################################################
# This param tells fortress what type of ldap server in use:
-#ldap.server.type=openldap
-ldap.server.type=apacheds
+ldap.server.type=openldap
+#ldap.server.type=apacheds
# This is the default:
ldap.client.type=apache
# These parameters point fortress to LDAP host:
ldap.host=localhost
-ldap.port=10389
+ldap.port=389
+#ldap.host=fortressdemo2.com
+#ldap.port=10636
#ldap.uris=ldap://${ldap.host}:${ldap.port}
# These are needed for client SSL connections with LDAP Server:
@@ -79,7 +81,7 @@ ldap.port=10389
#enable.ldap.ssl.debug=true
#key.store=/home/smckinn/fortress/builder/src/test/resources/certs/mykeystore
#key.store.password=changeit
-#trust.store=/home/smckinn/fortress/builder/src/test/resources/certs/mytruststore
+#trust.store=/home/smckinn/GIT/fortressDev/directory-fortress-core/src/test/resources/certs/mytruststore
#trust.store.password=changeit
#trust.store.set.prop=true
@@ -112,8 +114,8 @@ audits.dn=cn=log
groups.dn=ou=Groups,${suffix}
# These are the connection parameters used for LDAP service account:
-#root.dn=cn=Manager,${suffix}
-root.dn=uid=admin,ou=system
+root.dn=cn=Manager,${suffix}
+#root.dn=uid=admin,ou=system
# Used to load OpenLDAP admin root password in slapd.conf and was encrypted using 'slappasswd' command:
root.pw={SSHA}pSOV2TpCxj2NMACijkcMko4fGrFopctU
# This OpenLDAP admin root pass is bound for fortress.properties used by 'admin' pooled connections:
@@ -127,9 +129,13 @@ admin.max.conn=10
user.min.conn=1
user.max.conn=10
-# Used for searching slapd logger. Leave zeros when using apacheds:
-min.log.conn=0
-max.log.conn=0
+# Used for searching slapd logger. Comment out for ApacheDS or other directory servers:
+log.admin.user=cn=Manager,cn=log
+log.admin.pw=secret
+
+# Used for slapd logger connection pool. Leave zeros when using apacheds:
+min.log.conn=1
+max.log.conn=3
########################################################################
# 9. GROUP OBJECT CLASS DEFINITIONS
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 1cd1b6a..1ac04d7 100644
--- a/build.xml
+++ b/build.xml
@@ -174,7 +174,8 @@
<property name="apacheJMeter_core.jar" value="${lib.dir}/ApacheJMeter_core-2.11.jar"/>
<property name="apacheJMeter_java.jar" value="${lib.dir}/ApacheJMeter_java-2.11.jar"/>
<property name="apacheds-all.jar" value="${lib.dir}/apacheds-all-2.0.0-M18.jar"/>
- <property name="apacheds-api-all.jar" value="${lib.dir}/api-all-1.0.0-M25.jar"/>
+ <property name="apacheds-api-all.jar" value="${lib.dir}/api-all-1.0.0-M27-SNAPSHOT.jar"/>
+<!-- <property name="apacheds-api-all.jar" value="${lib.dir}/api-all-1.0.0-M25.jar"/>-->
<property name="mina-core.jar" value="${lib.dir}/mina-core-2.0.7.jar"/>
<property name="opencsv.jar" value="${lib.dir}/opencsv-2.3.jar"/>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 3f14d97..1f4f876 100755
--- a/ivy.xml
+++ b/ivy.xml
@@ -48,7 +48,7 @@
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.5" conf="default->master"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.5" conf="default->master"/>
<dependency org="org.slf4j" name="slf4j-jcl" rev="1.7.5" conf="default->master"/>
- <dependency org="org.apache.directory.api" name="api-all" rev="1.0.0-M25" conf="default->master"/>
+<!-- <dependency org="org.apache.directory.api" name="api-all" rev="1.0.0-M25" conf="default->master"/>-->
<dependency org="org.apache.directory.server" name="apacheds-all" rev="2.0.0-M18" conf="default->master"/>
<dependency org="net.sf.opencsv" name="opencsv" rev="2.3" conf="default->master" />
<dependency org="org.apache.jmeter" name="ApacheJMeter_core" rev="2.11" conf="default->master" />
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cd17188..666b18d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
<version.ant.launcher>1.9.1</version.ant.launcher>
<version.antlr>2.7.7</version.antlr>
<version.apacheds>2.0.0-M18</version.apacheds>
- <version.api.all>1.0.0-M25</version.api.all>
+ <version.api.all>1.0.0-M27-SNAPSHOT</version.api.all>
<version.commons.beanutils>1.7.0</version.commons.beanutils>
<version.commons.beanutils-core>1.8.0</version.commons.beanutils-core>
<version.commons.codec>1.2</version.commons.codec>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
index 7e12f20..d4a02c8 100755
--- a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
@@ -272,6 +272,12 @@ public class GlobalIds
* ** OpenAccessMgr AUDIT
* ************************************************************************
*/
+
+ public final static int AUTHZ_COMPARE_FAILURE_FLAG = 5;
+ /**
+ * This string will be appended to the operation name to force failure on compare.
+ */
+ public final static String FAILED_AUTHZ_INDICATOR = "%failed%";
/**
* This object class contains Fortress audit contextual information.
*/
@@ -383,6 +389,11 @@ public class GlobalIds
public final static String POBJ_NAME = "ftObjNm";
/**
+ * Attribute name for storing Fortress permission object id.
+ */
+ public static final String POBJ_ID = "ftObjId";
+
+ /**
* Attribute name for storing parent node names for hierarchical processing.
*/
public final static String PARENT_NODES = "ftParents";
@@ -473,7 +484,8 @@ public class GlobalIds
.getProperty( LDAP_FILTER_SIZE_PROP ) != null );
public static final String APACHE_LDAP_API = "apache";
public static final String AUTH_Z_FAILED = "authzfailed";
- public static final String AUTH_Z_FAILED_VALUE = "ftOpNm=" + AUTH_Z_FAILED;
+ public static final String POP_NAME = "ftOpNm";
+ public static final String AUTH_Z_FAILED_VALUE = POP_NAME + "=" + AUTH_Z_FAILED;
/**
* maximum number of entries allowed for ldap filter replacements.
@@ -539,5 +551,4 @@ public class GlobalIds
*/
public static final String ALL = "all";
public static final String NULL = "null";
- public static final String POP_NAME = "ftOpNm";
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/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 a0280d2..753c346 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
@@ -64,6 +64,9 @@ import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
import org.apache.directory.api.ldap.model.message.SearchRequest;
import org.apache.directory.api.ldap.model.message.SearchRequestImpl;
import org.apache.directory.api.ldap.model.message.SearchScope;
+import org.apache.directory.api.ldap.model.message.controls.ProxiedAuthz;
+import org.apache.directory.api.ldap.model.message.controls.ProxiedAuthzImpl;
+
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.ldap.client.api.DefaultPoolableLdapConnectionFactory;
import org.apache.directory.ldap.client.api.LdapConnection;
@@ -83,6 +86,8 @@ import org.apache.directory.fortress.core.util.time.Constraint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.naming.ldap.ExtendedResponse;
+
/**
* Abstract class contains methods to perform low-level entity to ldap persistence. These methods are called by the
@@ -153,6 +158,7 @@ public abstract class ApacheDsDataProvider
private static final PasswordPolicy PP_REQ_CTRL = new PasswordPolicyImpl();
+
static
{
String host = Config.getProperty( LDAP_HOST, "localhost" );
@@ -909,6 +915,10 @@ public abstract class ApacheDsDataProvider
* This method uses the compare ldap func to assert audit record into the directory server's configured audit
* logger.
*
+ * This is for one reason - to force the ldap server to maintain an audit trail on checkAccess api.
+ *
+ * Use proxy authz control (RFC4370) to assert the caller's id onto the record.
+ *
* @param connection is LdapConnection object used for all communication with host.
* @param dn contains address of distinguished name to begin ldap search
* @param userDn dn for user node
@@ -927,8 +937,11 @@ public abstract class ApacheDsDataProvider
compareRequest.setAttributeId( attribute.getId() );
compareRequest.setAssertionValue( attribute.getString() );
+ // Assert the end user's dn onto the reqest using proxy authZ control so openldap can log who the user was (for authZ audit trail)
+ ProxiedAuthz proxiedAuthzControl = new ProxiedAuthzImpl();
+ proxiedAuthzControl.setAuthzId( "dn: " + userDn );
+ compareRequest.addControl( proxiedAuthzControl );
CompareResponse response = connection.compare( compareRequest );
-
return response.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/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 e273559..c8667ce 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
@@ -320,7 +320,7 @@ final class AuditDAO extends ApacheDsDataProvider
if ( audit.isFailedOnly() )
{
- filter += "(!(" + REQRESULT + "=" + 6 + "))";
+ filter += "(" + REQRESULT + "=" + GlobalIds.AUTHZ_COMPARE_FAILURE_FLAG + ")";
}
if ( audit.getBeginDate() != null )
@@ -409,7 +409,7 @@ final class AuditDAO extends ApacheDsDataProvider
// TODO: fix this so filter by only the Fortress AuthZ entries and not the others:
if ( audit.isFailedOnly() )
{
- filter += "(!(" + REQRESULT + "=" + 6 + "))";
+ filter += "(" + REQRESULT + "=" + GlobalIds.AUTHZ_COMPARE_FAILURE_FLAG + ")";
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/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 1a7f1e9..b5a41ab 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
@@ -173,13 +173,12 @@ final class PermDAO extends ApacheDsDataProvider
};
private static final String PERM_NAME = "ftPermName";
- private static final String POBJ_ID = "ftObjId";
private static final String ROLES = "ftRoles";
private static final String USERS = "ftUsers";
private static final String[] PERMISSION_OP_ATRS =
{
GlobalIds.FT_IID, PERM_NAME, GlobalIds.POBJ_NAME, GlobalIds.POP_NAME, GlobalIds.DESC, SchemaConstants.OU_AT,
- POBJ_ID, TYPE, ROLES, USERS, GlobalIds.PROPS
+ GlobalIds.POBJ_ID, TYPE, ROLES, USERS, GlobalIds.PROPS
};
private static final String[] PERMISION_OBJ_ATRS =
@@ -390,7 +389,7 @@ final class PermDAO extends ApacheDsDataProvider
// objectid is optional:
if ( VUtil.isNotNullOrEmpty( entity.getObjId() ) )
{
- entry.add( POBJ_ID, entity.getObjId() );
+ entry.add( GlobalIds.POBJ_ID, entity.getObjId() );
}
// type is optional:
@@ -854,6 +853,7 @@ final class PermDAO extends ApacheDsDataProvider
isAuthZd = isAuthorized( session, outPerm );
// This is done to leave an audit trail in ldap server log:
+ attributeValue = outPerm.getOpName();
if ( isAuthZd )
{
// Yes, set the operation name onto this attribute for storage into audit trail:
@@ -861,8 +861,8 @@ final class PermDAO extends ApacheDsDataProvider
}
else
{
- // No, set a simple error message onto this attribute for storage into audit trail:
- attributeValue = "AuthZ Failed";
+ // Changing this attribute value forces the compare to fail. This facilitates tracking of authorization failures events in the slapd access log (by searching for compare failures).
+ attributeValue = outPerm.getOpName() + GlobalIds.FAILED_AUTHZ_INDICATOR;
}
// There is a switch in fortress config to disable audit ops like this one.
@@ -1002,7 +1002,7 @@ final class PermDAO extends ApacheDsDataProvider
entity.setSequenceId( sequence );
entity.setAbstractName( getAttribute( le, PERM_NAME ) );
entity.setObjName( getAttribute( le, GlobalIds.POBJ_NAME ) );
- entity.setObjId( getAttribute( le, POBJ_ID ) );
+ entity.setObjId( getAttribute( le, GlobalIds.POBJ_ID ) );
entity.setOpName( getAttribute( le, GlobalIds.POP_NAME ) );
entity.setInternalId( getAttribute( le, GlobalIds.FT_IID ) );
entity.setRoles( getAttributeSet( le, ROLES ) );
@@ -1460,7 +1460,7 @@ final class PermDAO extends ApacheDsDataProvider
if ( objId != null && objId.length() > 0 )
{
- rDn = GlobalIds.POP_NAME + "=" + opName + "+" + POBJ_ID + "=" + objId;
+ rDn = GlobalIds.POP_NAME + "=" + opName + "+" + GlobalIds.POBJ_ID + "=" + objId;
}
else
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/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 a933947..e266778 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
@@ -751,6 +751,7 @@ public class Permission extends FortEntity implements Serializable
return "Permission{" +
"objName='" + objName + '\'' +
", opName='" + opName + '\'' +
+ ", objId='" + objId + '\'' +
'}';
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/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 4f00ac1..235eecb 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
@@ -47,7 +47,7 @@ import org.apache.directory.fortress.core.util.time.Constraint;
* <ol>
* <li>Manager layer: {@link AdminMgrImpl}, {@link AccessMgrImpl}, {@link ReviewMgrImpl},...</li>
* <li>Process layer: {@link UserP}, {@link RoleP}, {@link PermP},...</li>
- * <li>DAO layer: {@link UserDAO}, {@link org.apache.directory.fortress.core.rbac.dao.RoleDAO}, {@link org.apache.directory.fortress.core.rbac.dao.PermDAO},...</li>
+ * <li>DAO layer: {@link UserDAO}, {@link org.apache.directory.fortress.core.rbac.RoleDAO}, {@link org.apache.directory.fortress.core.rbac.PermDAO},...</li>
* </ol>
* Fortress clients must first instantiate the data entity before invoking one of the Manager APIs. The caller must first
* provide enough information to uniquely identity target record for the particular ldap operation performed.<br />
@@ -280,6 +280,67 @@ public class User extends FortEntity implements Constraint, Serializable
@XmlTransient
private byte[] jpegPhoto;
+ // RFC2307bis:
+ /*
+ MUST ( cn $ uid $ uidNumber $ gidNumber $ homeDirectory )
+ MAY ( userPassword $ loginShell $ gecos $ description ) )
+ */
+ private String uidNumber;
+ private String gidNumber;
+ private String homeDirectory;
+ private String loginShell;
+ private String gecos;
+
+ public String getUidNumber()
+ {
+ return uidNumber;
+ }
+
+ public void setUidNumber( String uidNumber )
+ {
+ this.uidNumber = uidNumber;
+ }
+
+ public String getGidNumber()
+ {
+ return gidNumber;
+ }
+
+ public void setGidNumber( String gidNumber )
+ {
+ this.gidNumber = gidNumber;
+ }
+
+ public String getHomeDirectory()
+ {
+ return homeDirectory;
+ }
+
+ public void setHomeDirectory( String homeDirectory )
+ {
+ this.homeDirectory = homeDirectory;
+ }
+
+ public String getLoginShell()
+ {
+ return loginShell;
+ }
+
+ public void setLoginShell( String loginShell )
+ {
+ this.loginShell = loginShell;
+ }
+
+ public String getGecos()
+ {
+ return gecos;
+ }
+
+ public void setGecos( String gecos )
+ {
+ this.gecos = gecos;
+ }
+
/**
* Default constructor not intended for external use and is typically used by internal Fortress classes.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/src/main/java/org/apache/directory/fortress/core/util/attr/AttrHelper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/attr/AttrHelper.java b/src/main/java/org/apache/directory/fortress/core/util/attr/AttrHelper.java
index f1ab501..3b9ef0c 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/attr/AttrHelper.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/attr/AttrHelper.java
@@ -19,6 +19,9 @@
*/
package org.apache.directory.fortress.core.util.attr;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.name.Rdn;
import org.apache.directory.api.util.DateUtils;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.rbac.Administrator;
@@ -185,6 +188,44 @@ public class AttrHelper
/**
+ * Break the authZ eqDn attribute into 1. permission object name, 2. op name and 3. object id (optional).
+ *
+ * @param authZ contains the raw dn format from openldap slapo access log data
+ * @return Permisison containing objName, opName and optionally the objId populated from the raw data.
+ */
+ public static Permission getAuthZPerm(AuthZ authZ) throws LdapInvalidDnException
+ {
+ // This will be returned to the caller:
+ Permission pOp = new Permission();
+ // Break dn into rdns for leaf and parent. Use the 'type' field in rdn.
+ // The objId value is optional. If present it will be part of the parent's relative distinguished name..
+ // Here the sample reqDN=ftOpNm=TOP2_2+ftObjId=002,ftObjNm=TOB2_1,ou=Permissions,ou=RBAC,dc=example,dc=com
+ // Will be mapped to objName=TOB2_1, opName=TOP2_2, objId=002, in the returned permission object.
+ Dn dn = new Dn( authZ.getReqDN() );
+ if(dn != null && dn.getRdns() != null && VUtil.isNotNullOrEmpty( dn.getRdns() ) )
+ {
+ for( Rdn rdn : dn.getRdns() )
+ {
+ // The rdn type attribute will be mapped to objName, opName and objId fields.
+ switch ( rdn.getType() )
+ {
+ case GlobalIds.POP_NAME:
+ pOp.setOpName( rdn.getType() );
+ break;
+ case GlobalIds.POBJ_NAME:
+ pOp.setObjName( rdn.getType() );
+ break;
+ case GlobalIds.POBJ_ID:
+ pOp.setObjId( rdn.getType() );
+ break;
+ }
+ }
+ }
+ return pOp;
+ }
+
+
+ /**
* Convert from raw ldap generalized time format to {@link java.util.Date}.
* to decode the string.
*
@@ -212,96 +253,4 @@ public class AttrHelper
szTime = DateUtils.getGeneralizedTime( date );
return szTime;
}
-
- /**
- * Parse slapd access raw data to pull the permission name out.
- *
- * @param authZ raw data contained in Fortress audit entity.
- * @return Permission contains {@link org.apache.directory.fortress.core.rbac.Permission#objName} and {@link org.apache.directory.fortress.core.rbac.Permission#opName}
- */
- public static Permission getAuthZPerm(AuthZ authZ)
- {
- int indx = 0;
- //final int objectClass = 1;
- final int oPNm = 2;
- final int oBjNm = 3;
- final int user = 4;
- final int roles = 6;
-
- // reqFilter
- // <(&(objectClass=ftOperation)
- // (ftOpNm=top1_10)(ftObjNm=tob2_4)
- // (|(ftUsers=fttu3user4)
- // (ftRoles=ftt3role1)
- // (ftRoles=ftt3role2)
- // (ftRoles=ftt3role3)
- // (ftRoles=ftt3role4)
- // (ftRoles=ftt3role5)
- // (ftRoles=ftt3role6)
- // (ftRoles=ftt3role7)
- // (ftRoles=ftt3role8)
- // (ftRoles=ftt3role9)
- // (ftRoles=ftt3role10)))>
-
- Permission pOp = new Permission();
- if (authZ.getReqFilter() != null && authZ.getReqFilter().length() > 0)
- {
- StringTokenizer maxTkn = new StringTokenizer(authZ.getReqFilter(), "(");
- //System.out.println("maxTken size=" + maxTkn.countTokens());
- int numTokens = maxTkn.countTokens();
- for (int i = 0; i < numTokens; i++)
- {
- String val = maxTkn.nextToken();
- //System.out.println("token[" + i + "]=" + val);
- switch (i)
- {
- //case objectClass:
- // indx = val.indexOf('=');
- // if (indx >= 1)
- // {
- // String value = val.substring(indx + 1, val.length() - 1);
- // }
- // break;
-
- case oPNm:
- indx = val.indexOf('=');
- if (indx >= 1)
- {
- pOp.setOpName(val.substring(indx + 1, val.length() - 1));
- }
- break;
-
- case oBjNm:
- indx = val.indexOf('=');
- if (indx >= 1)
- {
- pOp.setObjName( val.substring( indx + 1, val.length() - 1 ) );
- }
- break;
-
- case user:
- indx = val.indexOf('=');
- if (indx >= 1)
- {
- pOp.setUser(val.substring(indx + 1, val.length() - 1));
- }
- break;
-
- default:
- int indx2 = 0;
- if (i >= roles)
- {
- indx = val.indexOf('=');
- indx2 = val.indexOf(')');
- }
- if (indx >= 1)
- {
- pOp.setRole(val.substring(indx + 1, indx2));
- }
- break;
- }
- }
- }
- return pOp;
- }
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
index 6880857..dce7be3 100755
--- a/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
@@ -276,12 +276,21 @@ class AccessMgrConsole
{
VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, "AccessMgrConsole.checkAccess");
ReaderUtil.clearScreen();
+ Permission perm = new Permission();
System.out.println("Enter object name:");
- String objName = ReaderUtil.readLn();
+ perm.setObjName( ReaderUtil.readLn() );
System.out.println("Enter operation name:");
- String opName = ReaderUtil.readLn();
- boolean result = am.checkAccess(session, new Permission(objName, opName));
- System.out.println("CheckAccess return [" + result + "] for user [" + session.getUserId() + "] objName [" + objName + "] operationName [" + opName + "]");
+ perm.setOpName( ReaderUtil.readLn() );
+ System.out.println("Enter object id (or NULL to skip):");
+ String val = ReaderUtil.readLn();
+ if ( val != null && val.length() > 0 )
+ {
+ perm.setObjId( val );
+ }
+
+ boolean result = am.checkAccess( session, perm );
+ System.out.println("CheckAccess return [" + result + "] for user [" + session.getUserId() + "], objName [" + perm.getObjName() + "], operationName [" + perm.getOpName() + "]" +
+ ", objId [" + perm.getObjId() + "]");
System.out.println("ENTER to continue");
}
catch (SecurityException e)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
index 207e77b..11f8597 100755
--- a/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
@@ -302,6 +302,21 @@ class AdminMgrConsole
}
+ private void enterPosixAccount(User user)
+ {
+ System.out.println("Enter UID_NUMBER:");
+ user.setUidNumber(ReaderUtil.readLn());
+ System.out.println("Enter GID_NUMBER:");
+ user.setGidNumber(ReaderUtil.readLn());
+ System.out.println("Enter HOME_DIRECTORY:");
+ user.setHomeDirectory(ReaderUtil.readLn());
+ System.out.println("Enter LOGIN_SHELL:");
+ user.setLoginShell(ReaderUtil.readLn());
+ System.out.println("Enter GECOS:");
+ user.setGecos(ReaderUtil.readLn());
+ }
+
+
/**
* Adds a feature to the User attribute of the AdminMgrConsole object
*/
@@ -334,6 +349,13 @@ class AdminMgrConsole
enterTemporal(ue);
}
+ System.out.println("Do you want to set posix account attributes on User - Y or N");
+ choice = ReaderUtil.readLn();
+ if (choice != null && choice.equalsIgnoreCase("Y"))
+ {
+ enterPosixAccount( ue );
+ }
+
System.out.println("Enter Role name (or NULL to skip):");
String val = ReaderUtil.readLn();
for (int i = 0; val != null && val.length() > 0; i++)
@@ -405,6 +427,11 @@ class AdminMgrConsole
{
LOG.error("addUser caught SecurityException rc=" + e.getErrorId() + ", msg=" + e.getMessage(), e);
}
+ catch(Exception e)
+ {
+ LOG.error( "addUser caught Exception=" + e );
+ e.printStackTrace();
+ }
ReaderUtil.readChar();
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
index fa7d3f8..6e98de6 100755
--- a/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
@@ -19,6 +19,9 @@
*/
package org.apache.directory.fortress.core;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.name.Rdn;
import org.apache.directory.fortress.core.rbac.Bind;
import org.apache.directory.fortress.core.rbac.AuthZ;
import org.apache.directory.fortress.core.rbac.Mod;
@@ -33,6 +36,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.StringTokenizer;
class AuditMgrConsole
{
@@ -448,19 +452,26 @@ class AuditMgrConsole
}
System.out.println(" userId " + AttrHelper.getAuthZId(authZ.getReqAuthzID()));
- Permission pOp = AttrHelper.getAuthZPerm(authZ);
- System.out.println(" Resource Name " + pOp.getObjName());
- System.out.println(" Operation " + pOp.getOpName());
- // TODO: fix the NPE that happens here:
- //System.out.println(" Success? " + authZ.getReqEntries().equals("1"));
- int rCtr = 0;
- if (pOp.getRoles() != null)
+ try
{
- for (String role : pOp.getRoles())
+ Permission pOp = AttrHelper.getAuthZPerm(authZ);
+ System.out.println(" Resource Name " + pOp.getObjName());
+ System.out.println(" Operation " + pOp.getOpName());
+ int rCtr = 0;
+ if (pOp != null && pOp.getRoles() != null)
{
- System.out.println(" Role[" + rCtr++ + "] " + role);
+ // TODO: fix the NPE that happens here:
+ System.out.println(" Success? " + authZ.getReqEntries().equals(GlobalIds.AUTHZ_COMPARE_FAILURE_FLAG));
+ for (String role : pOp.getRoles())
+ {
+ System.out.println(" Role[" + rCtr++ + "] " + role);
+ }
}
}
+ catch(LdapInvalidDnException e)
+ {
+ System.out.println("LdapInvalidDnException=" + e);
+ }
//System.out.println(" reqStart [" + authZ.getReqStart() + "]");
//System.out.println(" reqEnd [" + authZ.getReqEnd() + "]");
System.out.println();
@@ -843,4 +854,96 @@ class AuditMgrConsole
ReaderUtil.readChar();
}
+
+ /**
+ * Parse slapd access raw data to pull the permission name out.
+ *
+ * @param authZ raw data contained in Fortress audit entity.
+ * @return Permission contains {@link org.apache.directory.fortress.core.rbac.Permission#objName} and {@link org.apache.directory.fortress.core.rbac.Permission#opName}
+ */
+ private Permission getAuthZPerm2(AuthZ authZ)
+ {
+ int indx = 0;
+ //final int objectClass = 1;
+ final int oPNm = 2;
+ final int oBjNm = 3;
+ final int user = 4;
+ final int roles = 6;
+
+ // reqFilter
+ // <(&(objectClass=ftOperation)
+ // (ftOpNm=top1_10)(ftObjNm=tob2_4)
+ // (|(ftUsers=fttu3user4)
+ // (ftRoles=ftt3role1)
+ // (ftRoles=ftt3role2)
+ // (ftRoles=ftt3role3)
+ // (ftRoles=ftt3role4)
+ // (ftRoles=ftt3role5)
+ // (ftRoles=ftt3role6)
+ // (ftRoles=ftt3role7)
+ // (ftRoles=ftt3role8)
+ // (ftRoles=ftt3role9)
+ // (ftRoles=ftt3role10)))>
+
+ Permission pOp = new Permission();
+ if (authZ.getReqFilter() != null && authZ.getReqFilter().length() > 0)
+ {
+ StringTokenizer maxTkn = new StringTokenizer(authZ.getReqFilter(), "=");
+ //System.out.println("maxTken size=" + maxTkn.countTokens());
+ int numTokens = maxTkn.countTokens();
+ for (int i = 0; i < numTokens; i++)
+ {
+ String val = maxTkn.nextToken();
+ //System.out.println("token[" + i + "]=" + val);
+ switch (i)
+ {
+ //case objectClass:
+ // indx = val.indexOf('=');
+ // if (indx >= 1)
+ // {
+ // String value = val.substring(indx + 1, val.length() - 1);
+ // }
+ // break;
+
+ case oPNm:
+ indx = val.indexOf('=');
+ if (indx >= 1)
+ {
+ pOp.setOpName(val.substring(indx + 1, val.length() - 1));
+ }
+ break;
+
+ case oBjNm:
+ indx = val.indexOf('=');
+ if (indx >= 1)
+ {
+ pOp.setObjName( val.substring( indx + 1, val.length() - 1 ) );
+ }
+ break;
+
+ case user:
+ indx = val.indexOf('=');
+ if (indx >= 1)
+ {
+ pOp.setUser(val.substring(indx + 1, val.length() - 1));
+ }
+ break;
+
+ default:
+ int indx2 = 0;
+ if (i >= roles)
+ {
+ indx = val.indexOf('=');
+ indx2 = val.indexOf(')');
+ }
+ if (indx >= 1)
+ {
+ pOp.setRole(val.substring(indx + 1, indx2));
+ }
+ break;
+ }
+ }
+ }
+ return pOp;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
index 777df92..e9533ba 100755
--- a/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
@@ -163,6 +163,7 @@ class ReviewMgrConsole
System.out.println(" orgUnitId [" + ue.getOu() + "]");
System.out.println(" pwpolicy [" + ue.getPwPolicy() + "]");
printTemporal(ue, "USER");
+ printPosixAccount(ue, "POSIX" );
printAddress(ue.getAddress(), "ADDRESS");
printPhone(ue.getPhones(), "PHONES");
printPhone(ue.getMobiles(), "MOBILES");
@@ -223,6 +224,7 @@ class ReviewMgrConsole
System.out.println(" pwpolicy [" + ue.getPwPolicy() + "]");
System.out.println(" seqId [" + ue.getSequenceId() + "]");
printTemporal(ue, "USER");
+ printPosixAccount(ue, "POSIX" );
printAddress(ue.getAddress(), "ADDRESS");
printPhone(ue.getPhones(), "PHONES");
printPhone(ue.getMobiles(), "MOBILES");
@@ -289,6 +291,7 @@ class ReviewMgrConsole
System.out.println(" orgUnitId [" + ue.getOu() + "]");
System.out.println(" pwpolicy [" + ue.getPwPolicy() + "]");
printTemporal(ue, "USER");
+ printPosixAccount(ue, "POSIX" );
printAddress(ue.getAddress(), "ADDRESS");
printPhone(ue.getPhones(), "PHONES");
printPhone(ue.getMobiles(), "MOBILES");
@@ -452,6 +455,19 @@ class ReviewMgrConsole
}
}
+ static void printPosixAccount(User user, String label)
+ {
+ if (user != null)
+ {
+ System.out.println(" " + label + ":");
+ System.out.println(" uid number [" + user.getUidNumber() + "]");
+ System.out.println(" gid number [" + user.getGidNumber() + "]");
+ System.out.println(" home dir [" + user.getHomeDirectory() + "]");
+ System.out.println(" login shell [" + user.getLoginShell() + "]");
+ System.out.println(" gecos [" + user.getGecos() + "]");
+ }
+ }
+
private static void printAddress(Address address, String label)
{
if (address != null)
@@ -519,6 +535,7 @@ class ReviewMgrConsole
System.out.println(" surname [" + ue.getSn() + "]");
System.out.println(" orgUnitId [" + ue.getOu() + "]");
System.out.println(" pwpolicy [" + ue.getPwPolicy() + "]");
+ printPosixAccount(ue, "POSIX" );
printTemporal(ue, "USER");
if (ue.getRoles() != null)
{
@@ -921,6 +938,7 @@ class ReviewMgrConsole
System.out.println(" surname [" + ue.getSn() + "]");
System.out.println(" orgUnitId [" + ue.getOu() + "]");
printTemporal(ue, "USER");
+ printPosixAccount(ue, "POSIX" );
System.out.println();
}
System.out.println("ENTER to continue");
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
index eaaca95..dad0a89 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
@@ -29,6 +29,7 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.directory.fortress.core.util.attr.VUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +56,16 @@ public class AccessMgrImplTest extends TestCase
{
TestSuite suite = new TestSuite();
//suite.addTest(new AccessMgrImplTest("testDropActiveRole"));
- suite.addTest( new AccessMgrImplTest( "testCreateSessionWithRolesTrusted" ) );
+/*
+ suite.addTest( new AdminMgrImplTest( "testResetPassword" ) );
+ suite.addTest( new AccessMgrImplTest( "testAuthenticateReset" ) );
+ suite.addTest( new AdminMgrImplTest( "testChangePassword" ) );
+ suite.addTest( new AccessMgrImplTest( "testAuthenticate" ) );
+ suite.addTest( new AdminMgrImplTest( "testLockUserAccount" ) );
+ suite.addTest( new AccessMgrImplTest( "testAuthenticateLocked" ) );
+ suite.addTest( new AdminMgrImplTest( "testUnlockUserAccount" ) );
+*/
+ suite.addTest( new AccessMgrImplTest( "testCheckAccess" ) );
return suite;
}
@@ -300,7 +310,7 @@ public class AccessMgrImplTest extends TestCase
try
{
accessMgr.authenticate( user.getUserId(), user.getPassword() );
- accessMgr.authenticate( user.getUserId(), user.getPassword() );
+ //accessMgr.authenticate( user.getUserId(), user.getPassword() );
fail( CLS_NM + ".authenticateResetUsers failed test" );
}
catch ( SecurityException se )
@@ -709,20 +719,12 @@ public class AccessMgrImplTest extends TestCase
checkAccess( "CHCK-ACS TU1_UPD TO1 TOP1 ", UserTestData.USERS_TU1_UPD, PermTestData.OBJS_TOB1,
PermTestData.OPS_TOP1, PermTestData.OBJS_TOB3, PermTestData.OPS_TOP3 );
checkAccess( "CHCK-ACS TU3 TO3 TOP1 ", UserTestData.USERS_TU3, PermTestData.OBJS_TOB3, PermTestData.OPS_TOP3,
- PermTestData.OBJS_TOB2, PermTestData.OPS_TOP1 );
+ PermTestData.OBJS_TOB2, PermTestData.OPS_TOP2 );
checkAccess( "CHCK-ACS TU4 TO4 TOP1 ", UserTestData.USERS_TU4, PermTestData.OBJS_TOB2, PermTestData.OPS_TOP2,
- PermTestData.OBJS_TOB2, PermTestData.OPS_TOP1 );
+ PermTestData.OBJS_TOB3, PermTestData.OPS_TOP3 );
}
- /**
- * @param msg
- * @param uArray
- * @param oArray
- * @param opArray
- * @param oArrayBad
- * @param opArrayBad
- */
public static void checkAccess( String msg, String[][] uArray, String[][] oArray, String[][] opArray,
String[][] oArrayBad, String[][] opArrayBad )
{
@@ -741,32 +743,48 @@ public class AccessMgrImplTest extends TestCase
int j = 0;
for ( String[] op : opArray )
{
- // Call checkAccess method
- assertTrue( CLS_NM + ".checkAccess failed userId [" + user.getUserId() + "] Perm objName ["
- + PermTestData.getName( obj ) + "] operationName [" + PermTestData.getName( op ) + "]",
- accessMgr.checkAccess(
- session,
- new Permission( PermTestData.getName( obj ), PermTestData.getName( op ), PermTestData
- .getObjId( opArray[j] ) ) ) );
-
- // Call checkAccess method (this should fail):
- try
+ Permission goodPerm;
+ if( VUtil.isNotNullOrEmpty( PermTestData.getObjId( opArray[j] ) ) )
{
- boolean result = accessMgr.checkAccess( session, new Permission( PermTestData.getName( oArrayBad[i] ),
- PermTestData.getName( opArrayBad[j] ), PermTestData.getObjId( opArrayBad[j] ) ) );
- assertTrue(
- CLS_NM + ".checkAccess failed userId [" + user.getUserId() + "] Perm objName ["
- + PermTestData.getName( oArrayBad[i] ) + "] operationName ["
- + PermTestData.getName( opArrayBad[j] ) + "]",
- !result );
+ // with an objectId:
+ goodPerm = new Permission(
+ PermTestData.getName( obj ),
+ PermTestData.getName( op ),
+ PermTestData.getObjId( opArray[j] ) );
+ }
+ else
+ {
+ // without an objectId:
+ goodPerm = new Permission(
+ PermTestData.getName( obj ),
+ PermTestData.getName( op ) );
+ }
+
+ // Positive test case, call checkAccess method, should return 'true':
+ assertTrue( CLS_NM + ".checkAccess failed userId [" + user.getUserId() + "] Perm objName [" +
+ PermTestData.getName( obj ) + "] operationName [" + PermTestData.getName( op ) + "]",
+ accessMgr.checkAccess( session, goodPerm ) );
+ Permission badPerm;
+ if( VUtil.isNotNullOrEmpty( PermTestData.getObjId( opArrayBad[j] ) ) )
+ {
+ // with an objectId:
+ badPerm = new Permission(
+ PermTestData.getName( oArrayBad[i] ),
+ PermTestData.getName( opArrayBad[j] ),
+ PermTestData.getObjId( opArrayBad[j] ) );
}
- catch (SecurityException se)
+ else
{
- // The expected condition is security exception perm not exist:
- assertTrue( CLS_NM + ".checkAccess failed userId [" + user.getUserId() + "] Perm objName ["
- + PermTestData.getName( oArrayBad[i] ) + "] operationName ["
- + PermTestData.getName( opArrayBad[j] ) + "], negative use case, incorrect exception id=" + se.getErrorId(), se.getErrorId() == GlobalErrIds.PERM_NOT_EXIST );
+ // without an objectId:
+ badPerm = new Permission(
+ PermTestData.getName( oArrayBad[i] ),
+ PermTestData.getName( opArrayBad[j] ) );
}
+ //LOG.warn("Assert False userId [" + user.getUserId() + "], perm: " + badPerm);
+ // Negative test case, call checkAccess method again, should return 'false':
+ assertFalse( CLS_NM + ".checkAccess failed userId [" + user.getUserId() + "] Perm objName [" +
+ PermTestData.getName( oArrayBad[i] ) + "] operationName [" + PermTestData.getName(
+ opArrayBad[j] ) + "]", accessMgr.checkAccess( session, badPerm ) );
j++;
}
i++;
@@ -776,9 +794,8 @@ public class AccessMgrImplTest extends TestCase
}
catch ( SecurityException ex )
{
- LOG.error(
- "checkAccess: failed with SecurityException rc=" + ex.getErrorId() + ", msg="
- + ex.getMessage(), ex );
+ LOG.error( "checkAccess: failed with SecurityException rc=" + ex.getErrorId() + ", " +
+ "msg=" + ex.getMessage(), ex );
fail( ex.getMessage() );
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3966a151/src/test/java/org/apache/directory/fortress/core/rbac/AuditMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AuditMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/AuditMgrImplTest.java
index 7a884d7..55ab13e 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AuditMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AuditMgrImplTest.java
@@ -239,16 +239,14 @@ public class AuditMgrImplTest extends TestCase
public void testSearchAuthZs()
{
- searchAuthZs( "GET-AUTHZ TU1_UPD", UserTestData.USERS_TU1_UPD, PermTestData.OBJS_TOB1, PermTestData.OPS_TOP1,
- false );
+ searchAuthZs( "GET-AUTHZ TU1_UPD", UserTestData.USERS_TU1_UPD, PermTestData.OBJS_TOB1, PermTestData.OPS_TOP1, false );
searchAuthZs( "GET-AUTHZ TU3", UserTestData.USERS_TU3, PermTestData.OBJS_TOB3, PermTestData.OPS_TOP3, false );
searchAuthZs( "GET-AUTHZ TU4", UserTestData.USERS_TU4, PermTestData.OBJS_TOB2, PermTestData.OPS_TOP2, false );
// search for failed only:
- searchAuthZs( "GET-AUTHZ TU1_UPD", UserTestData.USERS_TU1_UPD, PermTestData.OBJS_TOB3, PermTestData.OPS_TOP3,
- true );
- searchAuthZs( "GET-AUTHZ TU3", UserTestData.USERS_TU3, PermTestData.OBJS_TOB2, PermTestData.OPS_TOP1, true );
- searchAuthZs( "GET-AUTHZ TU4", UserTestData.USERS_TU4, PermTestData.OBJS_TOB2, PermTestData.OPS_TOP1, true );
+ searchAuthZs( "GET-AUTHZ TU1_UPD", UserTestData.USERS_TU1_UPD, PermTestData.OBJS_TOB3, PermTestData.OPS_TOP3, true );
+ searchAuthZs( "GET-AUTHZ TU3", UserTestData.USERS_TU3, PermTestData.OBJS_TOB2, PermTestData.OPS_TOP2, true );
+ searchAuthZs( "GET-AUTHZ TU4", UserTestData.USERS_TU4, PermTestData.OBJS_TOB3, PermTestData.OPS_TOP3, true );
}
@@ -282,8 +280,8 @@ public class AuditMgrImplTest extends TestCase
List<AuthZ> authZs = auditMgr.searchAuthZs( uAudit );
assertNotNull( authZs );
assertTrue(
- CLS_NM + "searchAuthZs failed search for successful authorization user ["
- + user.getUserId() + "]", authZs.size() > 0 );
+ CLS_NM + "searchAuthZs failedOnly=" + failedOnly + ", search authorizations user ["
+ + user.getUserId() + "], objName [" + uAudit.getObjName() + "], opName [" + uAudit.getOpName() + "], objId [" + uAudit.getObjId() + "]", authZs.size() > 0 );
}
}
}
[15/23] directory-fortress-core git commit: FC-54 - Benchmark
activities - fix accelmgr console add/drop role
Posted by sm...@apache.org.
FC-54 - Benchmark activities - fix accelmgr console add/drop role
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/976fe55b
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/976fe55b
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/976fe55b
Branch: refs/heads/master
Commit: 976fe55b7e0bf25dc4c1a0747651658f93a3935f
Parents: 7cc9859
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Jan 6 10:13:40 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Jan 6 10:13:40 2015 -0600
----------------------------------------------------------------------
.../apache/directory/fortress/core/AccelMgrConsole.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/976fe55b/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java
index d1e79b9..bf0f79e 100644
--- a/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java
@@ -159,9 +159,12 @@ class AccelMgrConsole
{
VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, "AccelMgrConsole.addActiveRole");
ReaderUtil.clearScreen();
+ System.out.println("Enter userId");
+ String userId = ReaderUtil.readLn();
+ ReaderUtil.clearScreen();
System.out.println("Enter role name");
String role = ReaderUtil.readLn();
- am.addActiveRole(session, new UserRole(role));
+ am.addActiveRole(session, new UserRole(userId, role));
System.out.println("addActiveRole successful");
System.out.println("ENTER to continue");
}
@@ -178,9 +181,12 @@ class AccelMgrConsole
{
VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, "AccelMgrConsole.dropActiveRole");
ReaderUtil.clearScreen();
+ System.out.println("Enter userId");
+ String userId = ReaderUtil.readLn();
+ ReaderUtil.clearScreen();
System.out.println("Enter role name");
String role = ReaderUtil.readLn();
- am.dropActiveRole( session, new UserRole( role ) );
+ am.dropActiveRole( session, new UserRole( userId, role ) );
System.out.println("dropActiveRole successful");
System.out.println("ENTER to continue");
}
[04/23] directory-fortress-core git commit: FC-40 - Use the LDAP API
constants instead of GlobalIDs constants when possible
Posted by sm...@apache.org.
FC-40 - Use the LDAP API constants instead of GlobalIDs constants when possible
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/8c5a6c61
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/8c5a6c61
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/8c5a6c61
Branch: refs/heads/master
Commit: 8c5a6c6139784b62fd7ea5ffefe05a0a10692586
Parents: 04f0a1a
Author: Shawn McKinney <sm...@apache.org>
Authored: Sun Dec 21 11:15:27 2014 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sun Dec 21 11:15:27 2014 -0600
----------------------------------------------------------------------
.../core/ldap/container/OrganizatiionalUnitDAO.java | 6 ++++--
.../apache/directory/fortress/core/rbac/PermDAO.java | 4 ++--
.../apache/directory/fortress/core/rbac/RoleDAO.java | 13 ++++++-------
3 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/8c5a6c61/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
index b25699d..c6efdbd 100644
--- 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
@@ -68,11 +68,13 @@ 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_CLASS = "organizationalunit";
+/*
private static final String[] ORGUNIT_OBJ_CLASS =
{
ORGUNIT_CLASS
};
+*/
/**
@@ -111,7 +113,7 @@ final class OrganizationalUnitDAO extends ApacheDsDataProvider
LOG.info( "create container dn [{}]", nodeDn );
Entry myEntry = new DefaultEntry( nodeDn,
- SchemaConstants.OBJECT_CLASS, ORGUNIT_CLASS,
+ SchemaConstants.OBJECT_CLASS, SchemaConstants.ORGANIZATIONAL_UNIT_OC,
SchemaConstants.OU_AT, oe.getName(),
SchemaConstants.DESCRIPTION_AT, oe.getDescription() );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/8c5a6c61/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 cd55062..6d9d6c4 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
@@ -157,7 +157,7 @@ final class PermDAO extends ApacheDsDataProvider
private static final String PERM_OBJ_OBJ_CLASS[] =
{
SchemaConstants.TOP_OC,
- "organizationalunit",
+ SchemaConstants.ORGANIZATIONAL_UNIT_OC,
PERM_OBJ_OBJECT_CLASS_NAME,
GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME,
GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
@@ -166,7 +166,7 @@ final class PermDAO extends ApacheDsDataProvider
private static final String PERM_OP_OBJ_CLASS[] =
{
SchemaConstants.TOP_OC,
- "organizationalrole",
+ SchemaConstants.ORGANIZATIONAL_ROLE_OC,
PERM_OP_OBJECT_CLASS_NAME,
GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME,
GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/8c5a6c61/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 e5ed548..677893c 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
@@ -103,7 +103,6 @@ final class RoleDAO extends ApacheDsDataProvider
* ** OpenAccessMgr ROLE STATICS
* ************************************************************************
*/
- private static final String ROLE_OCCUPANT = "roleOccupant";
private static final String ROLE_NM = "ftRoleName";
private static final String[] ROLE_NM_ATR =
@@ -113,7 +112,7 @@ final class RoleDAO extends ApacheDsDataProvider
private static final String[] ROLE_ATRS =
{
- GlobalIds.FT_IID, ROLE_NM, SchemaConstants.DESCRIPTION_AT, GlobalIds.CONSTRAINT, ROLE_OCCUPANT, GlobalIds.PARENT_NODES
+ GlobalIds.FT_IID, ROLE_NM, SchemaConstants.DESCRIPTION_AT, GlobalIds.CONSTRAINT, SchemaConstants.ROLE_OCCUPANT_AT, GlobalIds.PARENT_NODES
};
@@ -191,7 +190,7 @@ final class RoleDAO extends ApacheDsDataProvider
for ( String name : entity.getOccupants() )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
- ROLE_OCCUPANT, entity.getOccupants().toArray( new String[]
+ SchemaConstants.ROLE_OCCUPANT_AT, entity.getOccupants().toArray( new String[]
{} ) ) );
}
}
@@ -287,7 +286,7 @@ final class RoleDAO extends ApacheDsDataProvider
{
//ld = getAdminConnection();
List<Modification> mods = new ArrayList<Modification>();
- mods.add( new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, ROLE_OCCUPANT, userDn ) );
+ mods.add( new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, SchemaConstants.ROLE_OCCUPANT_AT, userDn ) );
ld = getAdminConnection();
modify( ld, dn, mods, entity );
}
@@ -320,7 +319,7 @@ final class RoleDAO extends ApacheDsDataProvider
try
{
List<Modification> mods = new ArrayList<Modification>();
- mods.add( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, ROLE_OCCUPANT, userDn ) );
+ mods.add( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, SchemaConstants.ROLE_OCCUPANT_AT, userDn ) );
ld = getAdminConnection();
modify( ld, dn, mods, entity );
}
@@ -526,7 +525,7 @@ final class RoleDAO extends ApacheDsDataProvider
try
{
String filter = GlobalIds.FILTER_PREFIX + GlobalIds.ROLE_OBJECT_CLASS_NM + ")";
- filter += "(" + ROLE_OCCUPANT + "=" + userDn + "))";
+ filter += "(" + SchemaConstants.ROLE_OCCUPANT_AT + "=" + userDn + "))";
ld = getAdminConnection();
SearchCursor searchResults = search( ld, roleRoot,
SearchScope.ONELEVEL, filter, ROLE_NM_ATR, false, GlobalIds.BATCH_SIZE );
@@ -640,7 +639,7 @@ final class RoleDAO extends ApacheDsDataProvider
entity.setId( getAttribute( le, GlobalIds.FT_IID ) );
entity.setName( getAttribute( le, ROLE_NM ) );
entity.setDescription( getAttribute( le, SchemaConstants.DESCRIPTION_AT ) );
- entity.setOccupants( getAttributes( le, ROLE_OCCUPANT ) );
+ entity.setOccupants( getAttributes( le, SchemaConstants.ROLE_OCCUPANT_AT ) );
//entity.setParents(RoleUtil.getParents(entity.getName().toUpperCase(), contextId));
entity.setChildren( RoleUtil.getChildren( entity.getName().toUpperCase(), contextId ) );
entity.setParents( getAttributeSet( le, GlobalIds.PARENT_NODES ) );
[06/23] directory-fortress-core git commit: change javadoc @author
tag to dev
Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/SDSetAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/SDSetAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/SDSetAnt.java
index 0e30af3..1963ee2 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/SDSetAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/SDSetAnt.java
@@ -29,7 +29,7 @@ import java.util.StringTokenizer;
* Entity is used by custom Apache Ant task for special handling of collections. This is necessary because the
* Ant parser cannot deal with complex data attribute types. The class extends a base entity.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class SDSetAnt extends SDSet
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
index 6c9aaa2..cebdabe 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
@@ -38,7 +38,7 @@ import java.util.StringTokenizer;
* Entity is used by custom Apache Ant task for special handling of collections. This is necessary because the
* Ant parser cannot deal with complex data attribute types. The class extends a base entity.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class UserAnt extends User
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/cfg/Config.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cfg/Config.java b/src/main/java/org/apache/directory/fortress/core/cfg/Config.java
index e559b5d..97256e0 100755
--- a/src/main/java/org/apache/directory/fortress/core/cfg/Config.java
+++ b/src/main/java/org/apache/directory/fortress/core/cfg/Config.java
@@ -46,7 +46,7 @@ import org.apache.directory.fortress.core.SecurityException;
* This object is thread safe but stores a static reference to Apache Commons Configuration {@link #config} object.
* </p>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Config
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 3d6eca8..c8e60c9 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
@@ -77,7 +77,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <p/>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
final class ConfigDAO extends ApacheDsDataProvider
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/cfg/ConfigMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigMgr.java b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigMgr.java
index e0e15c9..4a7b0db 100755
--- a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigMgr.java
@@ -35,7 +35,7 @@ import java.util.Properties;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface ConfigMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/cfg/ConfigMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigMgrFactory.java
index 8211769..9969b80 100755
--- a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigMgrFactory.java
@@ -32,7 +32,7 @@ import org.apache.directory.fortress.core.rest.ConfigMgrRestImpl;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ConfigMgrFactory
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/cfg/ConfigMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigMgrImpl.java
index 1358f7e..80164c3 100755
--- a/src/main/java/org/apache/directory/fortress/core/cfg/ConfigMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/cfg/ConfigMgrImpl.java
@@ -36,7 +36,7 @@ import java.util.Properties;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ConfigMgrImpl implements ConfigMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 ad8b1d2..2f1e846 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
@@ -53,7 +53,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
final class ConfigP
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java b/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
index ce00fe4..9d3b3a2 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
+++ b/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
@@ -56,7 +56,7 @@ import org.apache.directory.fortress.core.util.time.Constraint;
/**
* Main program for Fortress Command Line Interpreter..
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CommandLineInterpreter
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/cli/Options.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/Options.java b/src/main/java/org/apache/directory/fortress/core/cli/Options.java
index 50b50ec..5a5e801 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/Options.java
+++ b/src/main/java/org/apache/directory/fortress/core/cli/Options.java
@@ -38,7 +38,7 @@ import java.util.Vector;
/**
* This converts between Fortress entities and the JArg Options. It contains attributes passed from JArgs command interpreter.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Options implements java.io.Serializable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 753c346..2b03234 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
@@ -98,7 +98,7 @@ import javax.naming.ldap.ExtendedResponse;
* This class is thread safe.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public abstract class ApacheDsDataProvider
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
index 7c4f6a5..101ee46 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
* <p/>
* Note: This class allows self-signed certificates to pass the validation checks.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class LdapClientTrustStoreManager implements X509TrustManager, Serializable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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
index c6efdbd..3882808 100644
--- 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
@@ -62,7 +62,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <p/>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
final class OrganizationalUnitDAO extends ApacheDsDataProvider
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnit.java b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnit.java
index d701b34..d35e1a9 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnit.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnit.java
@@ -44,7 +44,7 @@ package org.apache.directory.fortress.core.ldap.container;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class OrganizationalUnit
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitP.java b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitP.java
index ca036db..d296868 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitP.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/container/OrganizationalUnitP.java
@@ -55,7 +55,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <p/>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class OrganizationalUnitP
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 3d681a8..66e34b2 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
@@ -56,7 +56,7 @@ import java.util.List;
* Contains the Group node for LDAP Directory Information Tree.
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
final class GroupDAO extends ApacheDsDataProvider
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgr.java b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgr.java
index 2316de9..c03a3c8 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgr.java
@@ -31,7 +31,7 @@ import java.util.List;
* This class is thread safe.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface GroupMgr extends Manageable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgrFactory.java
index 4a3bfd3..2b728a1 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgrFactory.java
@@ -36,7 +36,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class GroupMgrFactory
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 d85d3ea..5e5d192 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
@@ -39,7 +39,7 @@ import java.util.List;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class GroupMgrImpl extends Manageable implements GroupMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 5588d20..8fea1c7 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
@@ -37,7 +37,7 @@ import java.util.List;
* Process module for the group node of Fortress directory structure.
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
final class GroupP
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 3cc656f..27477e8 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
@@ -63,7 +63,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <p/>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
final class SuffixDAO extends ApacheDsDataProvider
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixP.java b/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixP.java
index f9f7f6d..2ea7100 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixP.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/suffix/SuffixP.java
@@ -54,7 +54,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <p/>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class SuffixP
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/AccelMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AccelMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/AccelMgrImpl.java
index d6c2b85..0b4aece 100644
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AccelMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AccelMgrImpl.java
@@ -64,7 +64,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* This class is NOT thread safe if parent instance variables ({@link #contextId} or {@link #adminSess}) are set.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AccelMgrImpl extends Manageable implements AccelMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 6e53073..4b98eae 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
@@ -59,7 +59,7 @@ import java.util.List;
*
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
final class AcceleratorDAO extends ApacheDsDataProvider
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/AccessMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AccessMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/AccessMgrImpl.java
index 4bb8ec3..1369608 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AccessMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AccessMgrImpl.java
@@ -66,7 +66,7 @@ import org.apache.directory.fortress.core.util.time.CUtil;
* This class is NOT thread safe if parent instance variables ({@link #contextId} or {@link #adminSess}) are set.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AccessMgrImpl extends Manageable implements AccessMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/Address.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Address.java b/src/main/java/org/apache/directory/fortress/core/rbac/Address.java
index 150ac76..987970c 100644
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Address.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Address.java
@@ -46,7 +46,7 @@ import javax.xml.bind.annotation.XmlType;
* <li> ------------------------------------------
* </ul>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortAddress")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/AdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminMgrImpl.java
index 8c3bce5..e252dd8 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminMgrImpl.java
@@ -71,7 +71,7 @@ import org.apache.directory.fortress.core.util.time.CUtil;
* <p/>
* This class is NOT thread safe if parent instance variables ({@link #contextId} or {@link #adminSess}) are set.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class AdminMgrImpl extends Manageable implements AdminMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/AdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRole.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRole.java
index cdde8e5..2956b15 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRole.java
@@ -162,7 +162,7 @@ import org.apache.directory.fortress.core.util.time.Constraint;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortAdminRole")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 682343c..1f17b2a 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
@@ -106,7 +106,7 @@ import org.apache.directory.fortress.core.util.time.CUtil;
* <p/>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
final class AdminRoleDAO extends ApacheDsDataProvider
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 01f5978..346972d 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
@@ -49,7 +49,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class AdminRoleP
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleRelationship.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleRelationship.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleRelationship.java
index ebe5938..fdfd7c7 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleRelationship.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminRoleRelationship.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlType;
/**
* This entity is used by en masse to communicate parent and child {@link org.apache.directory.fortress.core.rbac.AdminRole} information to the server.
* <p/>
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortAdminRoleRelationship")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 0a92b22..c9eb94a 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
@@ -55,7 +55,7 @@ import org.apache.directory.fortress.core.util.cache.CacheMgr;
* This class contains singleton that can be updated but is thread safe.
* <p/>
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class AdminRoleUtil
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/AdminUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminUtil.java
index 227ea9f..f20df6e 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminUtil.java
@@ -31,7 +31,7 @@ import org.apache.directory.fortress.core.DelAccessMgrFactory;
* </p>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
final class AdminUtil
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/Administrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Administrator.java b/src/main/java/org/apache/directory/fortress/core/rbac/Administrator.java
index 2e723b3..0c0c0f9 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Administrator.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Administrator.java
@@ -27,7 +27,7 @@ import java.util.Set;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface Administrator
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 c8667ce..5e70467 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
@@ -114,7 +114,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <p/>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
final class AuditDAO extends ApacheDsDataProvider
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/AuditMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AuditMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/AuditMgrImpl.java
index c90cd76..39ebae2 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AuditMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AuditMgrImpl.java
@@ -71,7 +71,7 @@ import java.util.List;
* <p/>
* This class is NOT thread safe if parent instance variables ({@link #contextId} or {@link #adminSess}) are set.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AuditMgrImpl extends Manageable implements AuditMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 0fd7e17..d1377d9 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
@@ -42,7 +42,7 @@ import org.apache.directory.fortress.core.SecurityException;
* <p/>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class AuditP
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/AuthZ.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AuthZ.java b/src/main/java/org/apache/directory/fortress/core/rbac/AuthZ.java
index 5627d90..e6f2ae0 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AuthZ.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AuthZ.java
@@ -47,7 +47,7 @@ import java.io.Serializable;
* Note this class uses descriptions pulled from man pages on slapo-accesslog.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortAuthZ")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/Bind.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Bind.java b/src/main/java/org/apache/directory/fortress/core/rbac/Bind.java
index 82bd883..c611305 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Bind.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Bind.java
@@ -49,7 +49,7 @@ import java.io.Serializable;
* Note this class used descriptions pulled from man pages on slapd access log.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortBind")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/ClassUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/ClassUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/ClassUtil.java
index e7fa94c..fd58e12 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/ClassUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/ClassUtil.java
@@ -42,7 +42,7 @@ import java.io.InputStream;
* <li>{@link org.apache.directory.fortress.core.cfg.ConfigMgrFactory}</li>
* </ol>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ClassUtil
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/Context.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Context.java b/src/main/java/org/apache/directory/fortress/core/rbac/Context.java
index e36b8e7..712d2c4 100644
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Context.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Context.java
@@ -25,7 +25,7 @@ package org.apache.directory.fortress.core.rbac;
* within the LDAP Directory Information Tree.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Context
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/DSDChecker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/DSDChecker.java b/src/main/java/org/apache/directory/fortress/core/rbac/DSDChecker.java
index afb4e21..605acf0 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/DSDChecker.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/DSDChecker.java
@@ -50,7 +50,7 @@ import org.apache.directory.fortress.core.util.time.Validator;
* </ol>
* </p>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class DSDChecker
implements Validator
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/DelAccessMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/DelAccessMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/DelAccessMgrImpl.java
index 4fa054c..bf2927e 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/DelAccessMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/DelAccessMgrImpl.java
@@ -50,7 +50,7 @@ import java.util.TreeSet;
* This class is NOT thread safe if parent instance variables ({@link #contextId} or {@link #adminSess}) are set.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class DelAccessMgrImpl extends AccessMgrImpl implements DelAccessMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/DelAdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/DelAdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/DelAdminMgrImpl.java
index 6c5a60b..94d5cb0 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/DelAdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/DelAdminMgrImpl.java
@@ -46,7 +46,7 @@ import java.util.Set;
* <p/>
* This class is NOT thread safe if parent instance variables ({@link #contextId} or {@link #adminSess}) are set.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class DelAdminMgrImpl extends Manageable implements DelAdminMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/DelReviewMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/DelReviewMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/DelReviewMgrImpl.java
index eea4b0b..b723d5a 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/DelReviewMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/DelReviewMgrImpl.java
@@ -39,7 +39,7 @@ import java.util.List;
* Decentralizing administration helps because it provides security provisioning capability to work groups without sacrificing regulations for accountability or traceability.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* <p/>
* This class is NOT thread safe if parent instance variables ({@link #contextId} or {@link #adminSess}) are set.
*/
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/FortEntity.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/FortEntity.java b/src/main/java/org/apache/directory/fortress/core/rbac/FortEntity.java
index 7789d97..e0ea488 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/FortEntity.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/FortEntity.java
@@ -56,7 +56,7 @@ import javax.xml.bind.annotation.XmlType;
* <p/>
* This class is not thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortEntity")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/GlobalPwMsgIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/GlobalPwMsgIds.java b/src/main/java/org/apache/directory/fortress/core/rbac/GlobalPwMsgIds.java
index 7d3e5f5..b735c33 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/GlobalPwMsgIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/GlobalPwMsgIds.java
@@ -26,7 +26,7 @@ import java.io.Serializable;
/**
* This class contains constants that contain status for Fortress password policy checking.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class GlobalPwMsgIds implements Serializable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/Graphable.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Graphable.java b/src/main/java/org/apache/directory/fortress/core/rbac/Graphable.java
index ad2909f..3255846 100644
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Graphable.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Graphable.java
@@ -43,7 +43,7 @@ import java.util.Set;
* SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface Graphable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/Hier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Hier.java b/src/main/java/org/apache/directory/fortress/core/rbac/Hier.java
index 8045c80..c191aac 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Hier.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Hier.java
@@ -91,7 +91,7 @@ import org.apache.directory.api.util.Strings;
* </pre>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Hier extends FortEntity implements Serializable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/HierUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/HierUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/HierUtil.java
index 04c1437..1899ece 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/HierUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/HierUtil.java
@@ -60,7 +60,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* This class is thread safe.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
final class HierUtil
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/Manageable.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Manageable.java b/src/main/java/org/apache/directory/fortress/core/rbac/Manageable.java
index 8971961..6422885 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Manageable.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Manageable.java
@@ -32,7 +32,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <p/>
* Implementers of this abstract class will NOT be thread safe because of instance variables that may be set.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public abstract class Manageable implements org.apache.directory.fortress.core.Manageable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/Mod.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Mod.java b/src/main/java/org/apache/directory/fortress/core/rbac/Mod.java
index 3004719..1f828e1 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Mod.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Mod.java
@@ -58,7 +58,7 @@ import java.util.List;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortMod")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnit.java b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnit.java
index 22e900f..4159b33 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnit.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnit.java
@@ -149,7 +149,7 @@ import javax.xml.bind.annotation.XmlType;
* </pre>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortOrgUnit")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitAnt.java b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitAnt.java
index b7d184a..7bbfd43 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitAnt.java
@@ -26,7 +26,7 @@ import java.io.Serializable;
* Entity is used by custom Apache Ant task for special handling of collections. This is necessary because the
* Ant parser cannot deal with complex data attribute types. The class extends a base entity.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class OrgUnitAnt extends OrgUnit implements Serializable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 1843448..1d86a8d 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
@@ -98,7 +98,7 @@ import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
* <p/>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @created September 18, 2010
*/
final class OrgUnitDAO extends ApacheDsDataProvider
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 4c7a85d..de21374 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
@@ -54,7 +54,7 @@ import org.apache.directory.fortress.core.util.cache.CacheMgr;
* This class uses synchronized data sets ({@link #ouCache} but is thread safe.
* <p/>
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class OrgUnitP
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitRelationship.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitRelationship.java b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitRelationship.java
index 4425d72..108348f 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitRelationship.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/OrgUnitRelationship.java
@@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlType;
/**
* This entity is used by en masse to communicate parent and child {@link org.apache.directory.fortress.core.rbac.OrgUnit} information to the server.
* <p/>
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortOrgUnitRelationship")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 6d9d6c4..ead2d7d 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
@@ -141,7 +141,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* This class is thread safe.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
final class PermDAO extends ApacheDsDataProvider
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/PermGrant.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PermGrant.java b/src/main/java/org/apache/directory/fortress/core/rbac/PermGrant.java
index d745730..bd4f9b9 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PermGrant.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PermGrant.java
@@ -33,7 +33,7 @@ import javax.xml.bind.annotation.XmlType;
* This entity is used for Ant and En Masse processing only.
* <p/>
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortGrant")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 b26565f..73fbecd 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
@@ -122,7 +122,7 @@ import javax.xml.bind.annotation.XmlType;
* </pre>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortObject")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 0b19878..e33b91f 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
@@ -46,7 +46,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* </p>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class PermP
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 e266778..ef15635 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
@@ -202,7 +202,7 @@ import javax.xml.bind.annotation.XmlType;
* </pre>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortPermission")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 2232bae..6a6ab65 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
@@ -93,7 +93,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <p/>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
final class PolicyDAO extends ApacheDsDataProvider
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 17c14a5..fe39abd 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
@@ -54,7 +54,7 @@ import org.apache.directory.fortress.core.util.cache.CacheMgr;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class PolicyP
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/Props.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Props.java b/src/main/java/org/apache/directory/fortress/core/rbac/Props.java
index a4e114a..11aeea6 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Props.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Props.java
@@ -34,7 +34,7 @@ import java.util.List;
* </p>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* <p/>
* <p>The following schema fragment specifies the expected content contained within this class.
* <p/>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 2349253..060bc72 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
@@ -56,7 +56,7 @@ import org.apache.directory.fortress.core.util.cache.CacheMgr;
* This class contains singleton that can be updated but is thread safe.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class PsoUtil
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/PwMessage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PwMessage.java b/src/main/java/org/apache/directory/fortress/core/rbac/PwMessage.java
index e866749..ba9e777 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PwMessage.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PwMessage.java
@@ -27,7 +27,7 @@ import java.util.List;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface PwMessage
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicy.java b/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicy.java
index 055dc29..ba592ae 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicy.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicy.java
@@ -109,7 +109,7 @@ import javax.xml.bind.annotation.XmlType;
* </pre>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortPolicy")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicyControl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicyControl.java b/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicyControl.java
index bbb00e6..e3ade70 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicyControl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicyControl.java
@@ -24,7 +24,7 @@ package org.apache.directory.fortress.core.rbac;
/**
* Interface is used to allow pluggable password policy interrogation.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface PwPolicyControl
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicyMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicyMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicyMgrImpl.java
index 3538437..29a7de9 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicyMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicyMgrImpl.java
@@ -53,7 +53,7 @@ import java.util.List;
* <p/>
* This class is NOT thread safe if parent instance variables ({@link #contextId} or {@link #adminSess}) are set.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class PwPolicyMgrImpl extends Manageable implements PwPolicyMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/Relationship.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Relationship.java b/src/main/java/org/apache/directory/fortress/core/rbac/Relationship.java
index cb6cdc7..4fbc819 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Relationship.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Relationship.java
@@ -27,7 +27,7 @@ import java.lang.String;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Relationship implements Serializable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/ReviewMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/ReviewMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/ReviewMgrImpl.java
index 60dfa92..e055013 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/ReviewMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/ReviewMgrImpl.java
@@ -62,7 +62,7 @@ import java.util.Set;
* <p/>
* This class is NOT thread safe if parent instance variables ({@link #contextId} or {@link #adminSess}) are set.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ReviewMgrImpl extends Manageable implements ReviewMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/Role.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Role.java b/src/main/java/org/apache/directory/fortress/core/rbac/Role.java
index f974266..f4e2f98 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Role.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Role.java
@@ -164,7 +164,7 @@ import org.apache.directory.fortress.core.util.time.Constraint;
* </pre>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortRole")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/RolePerm.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/RolePerm.java b/src/main/java/org/apache/directory/fortress/core/rbac/RolePerm.java
index 28f8f15..61df033 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/RolePerm.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/RolePerm.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlType;
/**
* This entity is used by en masse to communicate {@link org.apache.directory.fortress.core.rbac.Role}, {@link Permission} and {@link org.apache.directory.fortress.core.rbac.Session} information to the server for access control decisions.
* <p/>
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortRolePerm")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/RoleRelationship.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/RoleRelationship.java b/src/main/java/org/apache/directory/fortress/core/rbac/RoleRelationship.java
index d5b0b5e..29fe79c 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/RoleRelationship.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/RoleRelationship.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlType;
/**
* This entity is used by en masse to communicate parent and child {@link org.apache.directory.fortress.core.rbac.Role} information to the server.
* <p/>
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortRoleRelationship")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 96b44da..16b856f 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
@@ -55,7 +55,7 @@ import org.apache.directory.fortress.core.util.cache.CacheMgr;
* This class contains singleton that can be updated but is thread safe.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class RoleUtil
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java b/src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java
index 5589c56..ba1bd24 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java
@@ -123,7 +123,7 @@ import java.util.UUID;
* </pre>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortSet")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/SDUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/SDUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/SDUtil.java
index 52edccc..5333b3b 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/SDUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/SDUtil.java
@@ -47,7 +47,7 @@ import java.util.Set;
* <p/>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @created September 3, 2010
*/
final class SDUtil
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 734d582..2a4916a 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
@@ -113,7 +113,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* This class is thread safe.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
final class SdDAO extends ApacheDsDataProvider
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 0b69838..847a666 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
@@ -50,7 +50,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @created September 11, 2010
*/
public final class SdP
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/Session.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Session.java b/src/main/java/org/apache/directory/fortress/core/rbac/Session.java
index 1bca586..8e82991 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Session.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Session.java
@@ -145,7 +145,7 @@ import java.util.UUID;
* Adm day mask [23456]<br />
* Adm time out [30]<br />
* <p/>
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortSession")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 235eecb..e7840cb 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
@@ -188,7 +188,7 @@ import org.apache.directory.fortress.core.util.time.Constraint;
* ------------------------------------------
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortUser")
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 9a78878..34b2ee4 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
@@ -68,7 +68,7 @@ import org.apache.directory.fortress.core.util.time.Constraint;
* </pre>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
/*
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/UserAudit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/UserAudit.java b/src/main/java/org/apache/directory/fortress/core/rbac/UserAudit.java
index da9ac3b..a12ba21 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/UserAudit.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/UserAudit.java
@@ -43,7 +43,7 @@ import java.util.Date;
* <p/>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortUserAudit")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 b7458ec..d1eebb4 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
@@ -130,7 +130,7 @@ import org.apache.directory.fortress.core.util.time.CUtil;
* <p/>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @created August 30, 2009
*/
final class UserDAO extends ApacheDsDataProvider
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 01e2b36..be306bb 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
@@ -53,7 +53,7 @@ import org.apache.directory.fortress.core.util.time.CUtil;
* This class is thread safe.
* </p>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class UserP
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/UserRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/UserRole.java b/src/main/java/org/apache/directory/fortress/core/rbac/UserRole.java
index 7d7913a..d261723 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/UserRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/UserRole.java
@@ -72,7 +72,7 @@ import org.apache.directory.fortress.core.util.time.Constraint;
* </pre>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement( name = "fortUserRole" )
@XmlAccessorType( XmlAccessType.FIELD )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/UsoUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/UsoUtil.java b/src/main/java/org/apache/directory/fortress/core/rbac/UsoUtil.java
index d2e296f..b3ebd28 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/UsoUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/UsoUtil.java
@@ -55,7 +55,7 @@ import org.apache.directory.fortress.core.util.cache.CacheMgr;
* This class contains singleton that can be updated but is thread safe.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class UsoUtil
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rbac/Warning.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Warning.java b/src/main/java/org/apache/directory/fortress/core/rbac/Warning.java
index 0f37245..18d52b0 100644
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Warning.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Warning.java
@@ -32,7 +32,7 @@ import java.io.Serializable;
* This class contains messages that map to warning that occur during role activation and password policy validation.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
/**
* This entity is stored on {@link org.apache.directory.fortress.core.rbac.Session} and is used to pass warnings
@@ -49,7 +49,7 @@ import java.io.Serializable;
* <li> ------------------------------------------
* </ul>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "fortWarning")
@XmlAccessorType( XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java
index 744eb72..4ab320b 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java
@@ -71,7 +71,7 @@ import java.util.TreeSet;
* <p/>
*
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AccessMgrRestImpl extends Manageable implements AccessMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
index 2ce550c..71de000 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
@@ -68,7 +68,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* This class is NOT thread safe as it contains instance variables.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java
index 7bfbf0b..0568369 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/AuditMgrRestImpl.java
@@ -75,7 +75,7 @@ import java.util.List;
* </ul>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AuditMgrRestImpl extends Manageable implements AuditMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rest/CachedJaxbContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/CachedJaxbContext.java b/src/main/java/org/apache/directory/fortress/core/rest/CachedJaxbContext.java
index fe337a6..22378ca 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/CachedJaxbContext.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/CachedJaxbContext.java
@@ -33,7 +33,7 @@ import javax.xml.bind.Unmarshaller;
* <p/>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings( "rawtypes" )
public class CachedJaxbContext
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rest/ConfigMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/ConfigMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/ConfigMgrRestImpl.java
index 9799ba8..794cbbb 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/ConfigMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/ConfigMgrRestImpl.java
@@ -38,7 +38,7 @@ import java.util.Properties;
* This class is thread safe.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ConfigMgrRestImpl implements ConfigMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rest/DelAccessMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/DelAccessMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/DelAccessMgrRestImpl.java
index a21896a..e611d59 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/DelAccessMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/DelAccessMgrRestImpl.java
@@ -54,7 +54,7 @@ import java.util.TreeSet;
* <p/>
* This class is thread safe.
* <p/>
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class DelAccessMgrRestImpl extends AccessMgrRestImpl implements DelAccessMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java
index a8b5ec9..4a96cb9 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java
@@ -49,7 +49,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* Decentralizing administration helps because it provides security provisioning capability to work groups without sacrificing regulations for accountability or traceability.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public final class DelAdminMgrRestImpl extends Manageable implements DelAdminMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java
index c852ca2..418174a 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/DelReviewMgrRestImpl.java
@@ -45,7 +45,7 @@ import java.util.List;
* Decentralizing administration helps because it provides security provisioning capability to work groups without sacrificing regulations for accountability or traceability.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* <p/>
* This class is NOT thread safe iff "adminSession" instance variable is set
*/
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rest/FortRequest.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/FortRequest.java b/src/main/java/org/apache/directory/fortress/core/rest/FortRequest.java
index 49d3c57..eb8809f 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/FortRequest.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/FortRequest.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.*;
* </p>
* This class is not thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "FortRequest")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rest/FortResponse.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/FortResponse.java b/src/main/java/org/apache/directory/fortress/core/rest/FortResponse.java
index 2acc385..2b19541 100755
--- a/src/main/java/org/apache/directory/fortress/core/rest/FortResponse.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/FortResponse.java
@@ -31,7 +31,7 @@ import java.util.Set;
* </p>
* This class is not thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@XmlRootElement(name = "FortResponse")
@XmlAccessorType(XmlAccessType.FIELD)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rest/HttpIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/HttpIds.java b/src/main/java/org/apache/directory/fortress/core/rest/HttpIds.java
index 97a4c99..66c65f2 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/HttpIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/HttpIds.java
@@ -22,7 +22,7 @@ package org.apache.directory.fortress.core.rest;
/**
* Contains global HttpIds that map to the Fortress REST server EnMasse.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class HttpIds
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rest/JAXBCachedEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/JAXBCachedEntry.java b/src/main/java/org/apache/directory/fortress/core/rest/JAXBCachedEntry.java
index faccd06..78d817a 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/JAXBCachedEntry.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/JAXBCachedEntry.java
@@ -26,7 +26,7 @@ import javax.xml.bind.JAXBException;
* This class wraps JAXBContext and is used for simple caching mechanism during Fortress XML processing.
* The intent is to leave future extension point in case schema validation is needed which prevents handling in cache itself.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@SuppressWarnings( "rawtypes" )
public class JAXBCachedEntry
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java
index 8a1cfb9..4980157 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java
@@ -57,7 +57,7 @@ import java.util.List;
* This class is NOT thread safe.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class PwPolicyMgrRestImpl extends Manageable implements PwPolicyMgr
{
[23/23] directory-fortress-core git commit: remove unwanted jedit out
file
Posted by sm...@apache.org.
remove unwanted jedit out file
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/2a464183
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/2a464183
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/2a464183
Branch: refs/heads/master
Commit: 2a464183abc3cef6c7775a7ddc692a7be877c4ff
Parents: f9d396c
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Jan 27 06:54:07 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Jan 27 06:54:07 2015 -0600
----------------------------------------------------------------------
.../fortress/core/samples/package.html | 50 --------------------
1 file changed, 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2a464183/out/test/directory-fortress-core/org/apache/directory/fortress/core/samples/package.html
----------------------------------------------------------------------
diff --git a/out/test/directory-fortress-core/org/apache/directory/fortress/core/samples/package.html b/out/test/directory-fortress-core/org/apache/directory/fortress/core/samples/package.html
deleted file mode 100755
index 9881d96..0000000
--- a/out/test/directory-fortress-core/org/apache/directory/fortress/core/samples/package.html
+++ /dev/null
@@ -1,50 +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.
- *
--->
-<html>
- <head>
- <title>Package Documentation for org.openldap.fortress.samples</title>
- </head>
- <body>
- <p>
- This package contains samples that show how the Fortress APIs can be used. The samples use JUnit
- and provide the following.
- <h3>Samples</h3>
- <ol>
- <li>{@link org.openldap.fortress.samples.AccessMgrSample} demonstrates {@code org.openldap.fortress.AccessMgr} APIs</li>
- <li>{@link org.openldap.fortress.samples.AllSamplesJUnitTest} will execute all tests in their proper order</li>
- <li>{@link org.openldap.fortress.samples.CreatePermOrgHierarchySample} demonstrates {@code org.openldap.fortress.DelegatedAdminMgr} APis to create Perm organizational unit hierarchies</li>
- <li>{@link org.openldap.fortress.samples.CreatePermOrgSample} demonstrates {@code org.openldap.fortress.DelegatedAdminMgr} APis to create a Perm organizational unit node</li>
- <li>{@link org.openldap.fortress.samples.CreatePermSample} demonstrates {@code org.openldap.fortress.AdminMgr} to create RBAC permissions</li>
- <li>{@link org.openldap.fortress.samples.CreateRoleHierarchySample} demonstrates {@code org.openldap.fortress.AdminMgr} to create RBAC Role hierarchies</li>
- <li>{@link org.openldap.fortress.samples.CreateRoleSample} demonstrates {@code org.openldap.fortress.AdminMgr} to create RBAC Roles and assign constraints</li>
- <li>{@link org.openldap.fortress.samples.CreateSessionSample} demonstrates various ways to create a session using {@code org.openldap.fortress.AccessMgr} APIs</li>
- <li>{@link org.openldap.fortress.samples.CreateUserOrgHierarchySample} demonstrates {@code org.openldap.fortress.DelegatedAdminMgr} APis to create User organizational unit hierarchies</li>
- <li>{@link org.openldap.fortress.samples.CreateUserOrgSample} demonstrates {@code org.openldap.fortress.DelegatedAdminMgr} APis to create a User organizational unit node</li>
- <li>{@link org.openldap.fortress.samples.CreateUserRoleSample} demonstrates {@code org.openldap.fortress.AdminMgr} APIs to assign Roles to Users</li>
- <li>{@link org.openldap.fortress.samples.CreateUserSample} demonstrates {@code org.openldap.fortress.AdminMgr} APIs to create User object nodes</li>
- </ol>
- </p>
- <p>
- The <b>org.openldap.fortress.samples</b> package provides examples on proper usage of Fortress APIs, Each sample contains javadoc and JUnit test case that describes
- the use case and function for a particular entity.
- For more info, check out the javadoc pertaining to each sample.
- </p>
- </body>
-</html>
[13/23] directory-fortress-core git commit: FC-54 - Benchmark
activities - add indx to accel session db
Posted by sm...@apache.org.
FC-54 - Benchmark activities - add indx to accel session db
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/64bfbe65
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/64bfbe65
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/64bfbe65
Branch: refs/heads/master
Commit: 64bfbe651ba524493d3014ae613241951b1a740c
Parents: 9bd1d04
Author: Shawn McKinney <sm...@apache.org>
Authored: Thu Jan 1 10:24:38 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Thu Jan 1 10:24:38 2015 -0600
----------------------------------------------------------------------
ldap/slapd.conf.src | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/64bfbe65/ldap/slapd.conf.src
----------------------------------------------------------------------
diff --git a/ldap/slapd.conf.src b/ldap/slapd.conf.src
index 9cef00b..d043419 100755
--- a/ldap/slapd.conf.src
+++ b/ldap/slapd.conf.src
@@ -143,6 +143,7 @@ ppolicy_hash_cleartext
@IS_RBAC_ACCELERATOR@suffix "@SESSIONS_DN@"
@IS_RBAC_ACCELERATOR@rootdn "cn=manager,@SESSIONS_DN@"
@IS_RBAC_ACCELERATOR@rootpw @LOG_ROOT_PW@
+@IS_RBAC_ACCELERATOR@index rbacSessid eq
@IS_RBAC_ACCELERATOR@directory "@RBACSESS_DB_PATH@"
@IS_RBAC_ACCELERATOR@overlay dds
@IS_RBAC_ACCELERATOR@dds-default-ttl 3600
[21/23] directory-fortress-core git commit: FC-55 - Backup
Accelerator Session DB on recreate
Posted by sm...@apache.org.
FC-55 - Backup Accelerator Session DB on recreate
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/becb2c68
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/becb2c68
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/becb2c68
Branch: refs/heads/master
Commit: becb2c6821d9f7fe2fafedebc5504562f950b636
Parents: b1e9c98
Author: Shawn McKinney <sm...@apache.org>
Authored: Fri Jan 16 07:55:17 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Fri Jan 16 07:55:17 2015 -0600
----------------------------------------------------------------------
build.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/becb2c68/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 32791d6..f3b2319 100644
--- a/build.xml
+++ b/build.xml
@@ -719,6 +719,11 @@
<move todir="${db.bak.audit.dir}/${TODAY}" failonerror="false">
<fileset dir="${db.audit.dir}"/>
</move>
+ <echo message="############### Backup old RBAC ACCEL OVERLAY LMDB session folder ###############"/>
+ <move todir="${db.bak.sess.dir}/${TODAY}" failonerror="false">
+ <fileset dir="${db.sess.dir}"/>
+ </move>
+
<echo message="############### Create RBAC ACCEL OVERLAY session folder ###############"/>
<mkdir dir="${db.sess.dir}"/>
<echo message="############### Create RBAC ACCEL OVERLAY audit folder ###############"/>
[09/23] directory-fortress-core git commit: FC-54 - Benchmark
activities - correct checkpermission connection release
Posted by sm...@apache.org.
FC-54 - Benchmark activities - correct checkpermission connection release
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/7978fe07
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/7978fe07
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/7978fe07
Branch: refs/heads/master
Commit: 7978fe0741da3e4e421321117233748b219cb11b
Parents: 6df596d
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Dec 23 11:48:31 2014 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Dec 23 11:48:31 2014 -0600
----------------------------------------------------------------------
src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java | 2 +-
src/main/java/org/apache/directory/fortress/core/rbac/UserDAO.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7978fe07/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 ead2d7d..96f4b4e 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
@@ -883,7 +883,7 @@ final class PermDAO extends ApacheDsDataProvider
}
finally
{
- closeUserConnection( ld );
+ closeAdminConnection( ld );
}
return isAuthZd;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7978fe07/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 d1eebb4..6b8d57f 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
@@ -894,7 +894,7 @@ final class UserDAO extends ApacheDsDataProvider
}
catch ( LdapAuthenticationException e )
{
- String info = "checkPassword INVALID PASSWORD for userId [" + user.getUserId() + "]";
+ String info = "checkPassword INVALID PASSWORD for userId [" + user.getUserId() + "] exception";
session.setMsg( info );
session.setErrorId( GlobalErrIds.USER_PW_INVLD );
session.setAuthenticated( false );
[05/23] directory-fortress-core git commit: change javadoc @author
tag to dev
Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 13c24c2..d671b7b 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
@@ -57,7 +57,7 @@ import org.apache.directory.fortress.core.util.crypto.EncryptUtil;
/**
* This utility class provides methods that wrap Apache's HTTP Client APIs. This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class RestUtils
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
index 7c4f8db..9cf3230 100755
--- a/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
@@ -71,7 +71,7 @@ import java.util.TreeSet;
* This class is thread safe.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java b/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java
index 59e8164..3a41346 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java
@@ -27,7 +27,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
/**
* Contains a simple wrapper for log4j that is used by test utilities.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class LogUtil
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/Testable.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/Testable.java b/src/main/java/org/apache/directory/fortress/core/util/Testable.java
index 69d54f0..c605c65 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/Testable.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/Testable.java
@@ -24,7 +24,7 @@ import org.apache.tools.ant.Task;
/**
* Interface is extended by custom Ant tasks that require JUnit validation.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface Testable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/attr/AttrHelper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/attr/AttrHelper.java b/src/main/java/org/apache/directory/fortress/core/util/attr/AttrHelper.java
index 3b9ef0c..513b3fa 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/attr/AttrHelper.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/attr/AttrHelper.java
@@ -42,7 +42,7 @@ import java.util.Properties;
* This class is thread safe.
* <p/>
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AttrHelper
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/cache/Cache.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/cache/Cache.java b/src/main/java/org/apache/directory/fortress/core/util/cache/Cache.java
index 711153e..2634da1 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/cache/Cache.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/cache/Cache.java
@@ -25,7 +25,7 @@ import net.sf.ehcache.search.Query;
/**
* This Interface is implemented by cacheable Fortress objects and is used to wrap the caching implementation to provide isolation.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface Cache
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/cache/CacheException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/cache/CacheException.java b/src/main/java/org/apache/directory/fortress/core/util/cache/CacheException.java
index 7b7c901..4885164 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/cache/CacheException.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/cache/CacheException.java
@@ -28,7 +28,7 @@ import org.apache.directory.fortress.core.BaseRuntimeException;
* This is critical runtime exception and means system is inoperable due to a caching error.
* See the {@link org.apache.directory.fortress.core.GlobalErrIds} javadoc for list of error ids.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
class CacheException extends BaseRuntimeException
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/cache/CacheFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/cache/CacheFactory.java b/src/main/java/org/apache/directory/fortress/core/util/cache/CacheFactory.java
index 7ecbcc4..2381192 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/cache/CacheFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/cache/CacheFactory.java
@@ -26,7 +26,7 @@ import net.sf.ehcache.constructs.blocking.BlockingCache;
/**
* Creates an instance of the {@link EhCacheImpl} object with a {@link Cache} facade.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
class CacheFactory
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/cache/CacheMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/cache/CacheMgr.java b/src/main/java/org/apache/directory/fortress/core/util/cache/CacheMgr.java
index 8ac9420..6acc9ed 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/cache/CacheMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/cache/CacheMgr.java
@@ -34,7 +34,7 @@ import org.apache.directory.fortress.core.rbac.ClassUtil;
* This class is a facade and shields internal Fortress objects from specifics of the actual
* cache implementation that is in use.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CacheMgr
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/cache/DsdCacheEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/cache/DsdCacheEntry.java b/src/main/java/org/apache/directory/fortress/core/util/cache/DsdCacheEntry.java
index d7db689..0b56fc6 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/cache/DsdCacheEntry.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/cache/DsdCacheEntry.java
@@ -25,7 +25,7 @@ import org.apache.directory.fortress.core.rbac.SDSet;
* Value object wraps {@link SDSet} for caching purposes. This class also provides attributes that are used for
* searching the DSD cache.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class DsdCacheEntry
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/cache/EhCacheImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/cache/EhCacheImpl.java b/src/main/java/org/apache/directory/fortress/core/util/cache/EhCacheImpl.java
index 1941bf1..76b9cdf 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/cache/EhCacheImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/cache/EhCacheImpl.java
@@ -31,7 +31,7 @@ import org.apache.directory.fortress.core.GlobalErrIds;
/**
* This class provides cache functionality from <a href="http://ehcache.org//">Ehcache</a> provider.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class EhCacheImpl implements Cache
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java b/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
index 565fa57..6e7808f 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/crypto/EncryptUtil.java
@@ -25,7 +25,7 @@ import org.jasypt.util.text.BasicTextEncryptor;
/**
* Contains a simple wrapper for Jasypt open source encryption APIs, see <a href="http://www.jasypt.org/">Jasypt</a>.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class EncryptUtil
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 3616298..77d9e86 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
@@ -54,7 +54,7 @@ import java.util.StringTokenizer;
* </ol>
* </p>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CUtil
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java b/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java
index 0fed241..b95938b 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java
@@ -37,7 +37,7 @@ import org.apache.directory.fortress.core.rbac.Session;
* </ol>
* </p>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ClockTime
implements Validator
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/time/Constraint.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Constraint.java b/src/main/java/org/apache/directory/fortress/core/util/time/Constraint.java
index 936b650..036732f 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Constraint.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Constraint.java
@@ -61,7 +61,7 @@ package org.apache.directory.fortress.core.util.time;
* </ul>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface Constraint
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/time/Date.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Date.java b/src/main/java/org/apache/directory/fortress/core/util/time/Date.java
index f19bdfb..30a2935 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Date.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Date.java
@@ -36,7 +36,7 @@ import org.apache.directory.fortress.core.rbac.Session;
* </ol>
* </p>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Date
implements Validator
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/time/Day.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Day.java b/src/main/java/org/apache/directory/fortress/core/util/time/Day.java
index 21b9a04..0041176 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Day.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Day.java
@@ -36,7 +36,7 @@ import org.apache.directory.fortress.core.rbac.Session;
* </ol>
* </p>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Day
implements Validator
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/time/LockDate.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/LockDate.java b/src/main/java/org/apache/directory/fortress/core/util/time/LockDate.java
index 399cb74..5596ae1 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/LockDate.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/LockDate.java
@@ -38,7 +38,7 @@ import org.apache.directory.fortress.core.rbac.Session;
* </ol>
* </p>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class LockDate
implements Validator
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java b/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java
index 70ded67..8be2e35 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java
@@ -25,7 +25,7 @@ import java.util.GregorianCalendar;
* Utility class to convert current time/date into internal format, {@link Time}, used for {@link Constraint} checks {@link CUtil#validateConstraints(org.apache.directory.fortress.core.rbac.Session, CUtil.ConstraintType, boolean)}.
* This utility processes custom date formats and should not be used by external programs.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class TUtil
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/time/Time.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Time.java b/src/main/java/org/apache/directory/fortress/core/util/time/Time.java
index 38685dc..95cea6f 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Time.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Time.java
@@ -22,7 +22,7 @@ package org.apache.directory.fortress.core.util.time;
/**
* Class contains a custom timestamp that is processed by {@link Validator} to check {@link Constraint}.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Time
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java b/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java
index 7d22e30..a769b9b 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java
@@ -35,7 +35,7 @@ import org.apache.directory.fortress.core.rbac.Session;
* </ol>
* </p>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Timeout
implements Validator
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/util/time/Validator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Validator.java b/src/main/java/org/apache/directory/fortress/core/util/time/Validator.java
index 5adb79f..63b9725 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Validator.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Validator.java
@@ -53,7 +53,7 @@ import org.apache.directory.fortress.core.rbac.Session;
* <li>{@link org.apache.directory.fortress.core.GlobalErrIds#ACTV_FAILED_DSD}</li>
* </ol>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface Validator
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
index dce7be3..e13b166 100755
--- a/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
/**
* * Test class for driving Fortress RBAC runtime policy APIs within a console.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
class AccessMgrConsole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
index 11f8597..3143931 100755
--- a/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
@@ -55,7 +55,7 @@ import java.util.Set;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
class AdminMgrConsole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/ConfigMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/ConfigMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/ConfigMgrConsole.java
index 8a58dc6..da9afa3 100755
--- a/src/test/java/org/apache/directory/fortress/core/ConfigMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/ConfigMgrConsole.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
/**
* * Test class for driving Fortress RBAC runtime policy APIs within a console.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
class ConfigMgrConsole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/DelegatedAdminMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/DelegatedAdminMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/DelegatedAdminMgrConsole.java
index 90f2619..00a2b55 100755
--- a/src/test/java/org/apache/directory/fortress/core/DelegatedAdminMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/DelegatedAdminMgrConsole.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class DelegatedAdminMgrConsole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java
index f1ecb41..f5b17cf 100755
--- a/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java
@@ -32,7 +32,7 @@ import java.util.List;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
class DelegatedReviewMgrConsole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java
index 5974789..96ad389 100755
--- a/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
/**
* * Test class for driving LDAP group APIs within a console.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
class GroupMgrConsole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java b/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java
index 86dd2df..9506d57 100755
--- a/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java
+++ b/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java
@@ -28,7 +28,7 @@ import java.io.InputStreamReader;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
class ProcessMenuCommand
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/ReaderUtil.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/ReaderUtil.java b/src/test/java/org/apache/directory/fortress/core/ReaderUtil.java
index 2766e2f..e45e4cf 100755
--- a/src/test/java/org/apache/directory/fortress/core/ReaderUtil.java
+++ b/src/test/java/org/apache/directory/fortress/core/ReaderUtil.java
@@ -27,7 +27,7 @@ import java.io.InputStreamReader;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
class ReaderUtil
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
index e9533ba..3fb492a 100755
--- a/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
@@ -38,7 +38,7 @@ import java.util.Enumeration;
/**
* Test class for driving Fortress RBAC review API within a console.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
class ReviewMgrConsole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgr.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgr.java b/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgr.java
index ca1aba6..01a4259 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgr.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgr.java
@@ -24,7 +24,7 @@ import org.apache.directory.fortress.core.SecurityException;
/**
* Interface class for ExampleAdminMgrImpl.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @created December 26, 2010
*/
public interface ExampleAdminMgr
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrFactory.java b/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrFactory.java
index ab483f4..0960634 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrFactory.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrFactory.java
@@ -26,7 +26,7 @@ import org.apache.directory.fortress.core.rbac.ClassUtil;
/**
* Factory class used to instantiate the ExampleAdminMgrImpl.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @created December 26, 2010
*/
public class ExampleAdminMgrFactory
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrImpl.java b/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrImpl.java
index 9c9cae7..2df4fcb 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrImpl.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/ExampleAdminMgrImpl.java
@@ -25,7 +25,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
/**
* Object provides example of Fortress API.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @created December 26, 2010
*/
public class ExampleAdminMgrImpl implements ExampleAdminMgr
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/group/GroupAntTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/group/GroupAntTest.java b/src/test/java/org/apache/directory/fortress/core/group/GroupAntTest.java
index 4db858e..fecf02d 100644
--- a/src/test/java/org/apache/directory/fortress/core/group/GroupAntTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/group/GroupAntTest.java
@@ -46,7 +46,7 @@ import static org.junit.Assert.*;
* FortressAntTask} after it completes
* its data load.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version 1.0
*/
public class GroupAntTest implements Testable
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java b/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java
index 95fc94a..93c135b 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AccelCreateSession extends AbstractJavaSamplerClient
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
index 9fb4993..60f7adf 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.*;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CheckAccess extends AbstractJavaSamplerClient
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/jmeter/FortressCreateSession.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/FortressCreateSession.java b/src/test/java/org/apache/directory/fortress/core/jmeter/FortressCreateSession.java
index 8a99df5..eb0ecfe 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/FortressCreateSession.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/FortressCreateSession.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.*;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class FortressCreateSession extends AbstractJavaSamplerClient
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
index c1e5af9..d40e4d5 100644
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
@@ -41,7 +41,7 @@ import org.apache.directory.fortress.core.util.LogUtil;
* AccelMgrImpl Tester. This module executes RBAC accelerator client side extended operations.
* It requires the OpenLDAP RBAC Accelerator Overlay to be configured on the server-side.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AccelMgrImplTest extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
index dad0a89..633a181 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
@@ -44,7 +44,7 @@ import org.apache.directory.fortress.core.util.LogUtil;
/**
* AccessMgrImpl Tester.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AccessMgrImplTest extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/AdminMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AdminMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/AdminMgrImplTest.java
index c396810..ec22e60 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AdminMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AdminMgrImplTest.java
@@ -42,7 +42,7 @@ import org.apache.directory.fortress.core.util.time.CUtil;
/**
* AdminMgrImpl Tester.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AdminMgrImplTest extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/AdminRoleTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AdminRoleTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/AdminRoleTestData.java
index df1d095..a942711 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AdminRoleTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AdminRoleTestData.java
@@ -36,7 +36,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AdminRoleTestData extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/AuditMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AuditMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/AuditMgrImplTest.java
index 55ab13e..ad99bfc 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AuditMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AuditMgrImplTest.java
@@ -40,7 +40,7 @@ import org.apache.directory.fortress.core.util.LogUtil;
/**
* AccessMgrImpl Tester.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AuditMgrImplTest extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/DelegatedMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/DelegatedMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/DelegatedMgrImplTest.java
index a8234b9..23e3bad 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/DelegatedMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/DelegatedMgrImplTest.java
@@ -51,7 +51,7 @@ import org.apache.directory.fortress.core.util.LogUtil;
/**
* DelegatedMgrImpl Tester.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class DelegatedMgrImplTest extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/FortressAntLoadTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/FortressAntLoadTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/FortressAntLoadTest.java
index e4cf482..c825cb0 100644
--- a/src/test/java/org/apache/directory/fortress/core/rbac/FortressAntLoadTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/FortressAntLoadTest.java
@@ -59,7 +59,7 @@ import static org.junit.Assert.*;
* FortressAntTask} after it completes
* its data load.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version 1.0
*/
public class FortressAntLoadTest implements Testable
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/FortressJUnitTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/FortressJUnitTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/FortressJUnitTest.java
index e88f1da..7df3744 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/FortressJUnitTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/FortressJUnitTest.java
@@ -45,7 +45,7 @@ import org.apache.directory.fortress.core.GlobalIds;
* during repeat of buildup phase,
* delete the old test data manually in directory before trying again.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class FortressJUnitTest extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/OrgUnitTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/OrgUnitTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/OrgUnitTestData.java
index b6246cf..9929ab0 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/OrgUnitTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/OrgUnitTestData.java
@@ -36,7 +36,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class OrgUnitTestData extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/PRATestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/PRATestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/PRATestData.java
index 35b9a25..38afabf 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/PRATestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/PRATestData.java
@@ -34,7 +34,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class PRATestData extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/PermTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/PermTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/PermTestData.java
index 5645354..242aa8b 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/PermTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/PermTestData.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class PermTestData extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/PolicyTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/PolicyTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/PolicyTestData.java
index cf63323..b69c60f 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/PolicyTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/PolicyTestData.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class PolicyTestData extends TestCase
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/PswdPolicyMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/PswdPolicyMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/PswdPolicyMgrImplTest.java
index 77369a4..d8ec5fd 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/PswdPolicyMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/PswdPolicyMgrImplTest.java
@@ -44,7 +44,7 @@ import org.apache.directory.fortress.core.util.LogUtil;
/**
* PwPolicyMgrImpl Tester.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version 1.0
*/
public class PswdPolicyMgrImplTest extends TestCase
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/ReviewMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/ReviewMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/ReviewMgrImplTest.java
index 4c4fecb..20dd2d4 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/ReviewMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/ReviewMgrImplTest.java
@@ -42,7 +42,7 @@ import org.apache.directory.fortress.core.util.LogUtil;
/**
* ReviewMgrImpl Tester.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version 1.0
*/
public class ReviewMgrImplTest extends TestCase
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/RoleTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/RoleTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/RoleTestData.java
index ea3b6c5..e5172f0 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/RoleTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/RoleTestData.java
@@ -40,7 +40,7 @@ import org.apache.directory.fortress.core.util.time.Constraint;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class RoleTestData extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/TestUtils.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/TestUtils.java b/src/test/java/org/apache/directory/fortress/core/rbac/TestUtils.java
index 433f70d..5470a80 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/TestUtils.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/TestUtils.java
@@ -45,7 +45,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class TestUtils extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/URATestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/URATestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/URATestData.java
index bd90600..380e7c9 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/URATestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/URATestData.java
@@ -34,7 +34,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
/**
* Description of the Class
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class URATestData extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
index 218c617..abb610b 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
@@ -39,7 +39,7 @@ import org.apache.directory.fortress.core.util.time.Constraint;
* Description of the Class
* M
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class UserTestData extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/samples/AccessMgrSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/AccessMgrSample.java b/src/test/java/org/apache/directory/fortress/core/samples/AccessMgrSample.java
index 0c63fd5..f85724f 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/AccessMgrSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/AccessMgrSample.java
@@ -49,7 +49,7 @@ import org.apache.directory.fortress.core.rbac.UserRole;
* thick client applications (i.e. Applets) unless the thick client is running on a machine that is "behind the firewall" (or on VPN) that
* are common to enterprise data center runtime environments.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AccessMgrSample extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/samples/AllSamplesJUnitTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/AllSamplesJUnitTest.java b/src/test/java/org/apache/directory/fortress/core/samples/AllSamplesJUnitTest.java
index d0f05dc..2fc988b 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/AllSamplesJUnitTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/AllSamplesJUnitTest.java
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
/**
* This Junit test class calls all of the Samples.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AllSamplesJUnitTest extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgHierarchySample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgHierarchySample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgHierarchySample.java
index 690f9f8..2386777 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgHierarchySample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgHierarchySample.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
* inheritance between OrgUnits and there are no limits on how deep a hierarchy can be. The OrgUnits require name and type. Optionally can
* include a description. The Permission OrgUnit must be associated with PermObj and are used to provide Administratrive RBAC control
* over who may perform Permission grants and revocations in directory.
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CreatePermOrgHierarchySample extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgSample.java
index 814a96f..772092b 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgSample.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
* one must be created before any Permissions can be added to the directory. Each OrgUnit may be related to one or more parent
* OrgUnits although that functionality is not demonstrated here.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CreatePermOrgSample extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/samples/CreatePermSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermSample.java
index 21cd6ed..3207141 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermSample.java
@@ -41,7 +41,7 @@ import java.util.List;
* CreatePermSample JUnit Test demonstrates creation of Fortress permissions. It also shows how
* permissions may be granted to Roles and Users.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CreatePermSample extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleHierarchySample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleHierarchySample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleHierarchySample.java
index e33358b..7771395 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleHierarchySample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleHierarchySample.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
* Roles constrained by Date and Time can be overridden when the Role is assigned to a User, see {@link CreateUserRoleSample}.
* Temporal constraints checks will be performed when the Role is activated, see {@link CreateSessionSample}.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CreateRoleHierarchySample extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleSample.java
index 33db71f..0380dc9 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleSample.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
* Roles constrained by Date and Time can be overridden when the Role is assigned to a User, see {@code CreateUserRoleSample}.
* Temporal constraints checks will be peformed when the Role is activated, see {@code CreateSessionSample}.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CreateRoleSample extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java
index 6be84b8..bd04c5a 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java
@@ -42,7 +42,7 @@ import java.util.List;
* and error status flags that were set during User's previous CreateSession invocation.
*
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CreateSessionSample extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgHierarchySample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgHierarchySample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgHierarchySample.java
index b52aa91..77954ed 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgHierarchySample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgHierarchySample.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
* inheritance between OrgUnits and there are no limits on how deep a hierarchy can be. The OrgUnits require name and type. Optionally can
* include a description. The User OrgUnit must be associated with Users and are used to provide Administratrive RBAC control
* over who may perform User Role assigns and deassigns in directory.
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CreateUserOrgHierarchySample extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgSample.java
index a4654b1..9312fda 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgSample.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
* one must be created before any User can be added to the directory. Each OrgUnit may be related to one or more parent
* OrgUnits although that functionality is not demonstrated here.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CreateUserOrgSample extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/samples/CreateUserRoleSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserRoleSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserRoleSample.java
index a1f7da0..837c1b6 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserRoleSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserRoleSample.java
@@ -38,7 +38,7 @@ import java.util.List;
/**
* CreateUserRoleSample JUnit Test. This test suite demonstrates RBAC Role assignment and deassignment to Users.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CreateUserRoleSample extends TestCase
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java
index 2daf579..b436539 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
* extra steps demonstrated in this test class, i.e. reading User after adding, that are for instructional purposes and not required
* for real world applications.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CreateUserSample extends TestCase
{
[19/23] directory-fortress-core git commit: revert apache ldap api
version to M27
Posted by sm...@apache.org.
revert apache ldap api version to M27
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/14a1b3ea
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/14a1b3ea
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/14a1b3ea
Branch: refs/heads/master
Commit: 14a1b3eaf91349bffa3de86cacc579aba2f8a002
Parents: af0921e
Author: Shawn McKinney <sm...@apache.org>
Authored: Wed Jan 14 21:45:55 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Wed Jan 14 21:45:55 2015 -0600
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/14a1b3ea/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e59be9d..bd09e6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
<version.ant.launcher>1.9.1</version.ant.launcher>
<version.antlr>2.7.7</version.antlr>
<version.apacheds>2.0.0-M18</version.apacheds>
- <version.api.all>1.0.0-M28</version.api.all>
+ <version.api.all>1.0.0-M27</version.api.all>
<version.commons.beanutils>1.7.0</version.commons.beanutils>
<version.commons.beanutils-core>1.8.0</version.commons.beanutils-core>
<version.commons.codec>1.2</version.commons.codec>
[16/23] directory-fortress-core git commit: FC-54 - Benchmark
activities - support > 100 jmeter threads
Posted by sm...@apache.org.
FC-54 - Benchmark activities - support > 100 jmeter threads
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/cef29cbb
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/cef29cbb
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/cef29cbb
Branch: refs/heads/master
Commit: cef29cbb21701a297e35d8b66ee000c4c0ed4f4a
Parents: 976fe55
Author: Shawn McKinney <sm...@apache.org>
Authored: Sun Jan 11 13:31:56 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sun Jan 11 13:31:56 2015 -0600
----------------------------------------------------------------------
.../directory/fortress/core/jmeter/CheckAccess.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/cef29cbb/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
index 91855e3..af5b178 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
@@ -96,13 +96,11 @@ public class CheckAccess extends AbstractJavaSamplerClient
message = "AC ";
}
-
message += "CheckAccess isFortress: " + isFortress + ", userId: " + userId + ", objName:" + objName + ", opName: " + opName;
/*
LOG.info( message );
System.out.println( message );
*/
-
assertNotNull( session );
assertTrue( session.isAuthenticated() );
Permission perm = new Permission();
@@ -130,7 +128,8 @@ public class CheckAccess extends AbstractJavaSamplerClient
catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = "ThreadId:" + getThreadId() + "Error running test: " + se;
- LOG.error( "ThreadId:" + getThreadId() + "Error running test: " + se );
+ LOG.error( error );
+ System.out.println( error );
se.printStackTrace();
fail( error );
sampleResult.setSuccessful( false );
@@ -164,8 +163,11 @@ public class CheckAccess extends AbstractJavaSamplerClient
ctr = 0;
if(!VUtil.isNotNullOrEmpty( userId ))
{
+ // Load userids are format: loadtestuserN - where N is a number between 0 and 99.
+ // i.e. loadtestuser0, loadtestuser1, ... loadtestuser99
+ // N is threadid mod 100.
key = getKey();
- userId = "loadtestuser" + key;
+ userId = "loadtestuser" + key % 100;
}
try
{
[02/23] directory-fortress-core git commit: FC-25 - Improve the way
Factories create instances
Posted by sm...@apache.org.
FC-25 - Improve the way Factories create instances
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/dcfed51c
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/dcfed51c
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/dcfed51c
Branch: refs/heads/master
Commit: dcfed51c5641ac9d8b2143549d53008d63a381fc
Parents: 3966a15
Author: Shawn McKinney <sm...@apache.org>
Authored: Sat Dec 20 11:23:37 2014 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sat Dec 20 11:23:37 2014 -0600
----------------------------------------------------------------------
.../fortress/core/samples/package.html | 50 ++++++++++++++++++++
.../fortress/core/AccelMgrFactory.java | 8 +++-
.../fortress/core/AccessMgrFactory.java | 11 +++--
.../fortress/core/AdminMgrFactory.java | 11 +++--
.../fortress/core/AuditMgrFactory.java | 11 +++--
.../fortress/core/DelAccessMgrFactory.java | 11 +++--
.../fortress/core/DelAdminMgrFactory.java | 12 +++--
.../fortress/core/DelReviewMgrFactory.java | 11 +++--
.../fortress/core/PwPolicyMgrFactory.java | 11 +++--
.../fortress/core/ReviewMgrFactory.java | 11 +++--
.../fortress/core/rbac/AccessMgrImpl.java | 7 ---
.../fortress/core/rbac/AdminMgrImpl.java | 6 ---
.../fortress/core/rbac/AuditMgrImpl.java | 4 --
.../fortress/core/rbac/DelAccessMgrImpl.java | 4 --
.../fortress/core/rbac/DelAdminMgrImpl.java | 4 --
.../fortress/core/rbac/DelReviewMgrImpl.java | 4 --
.../fortress/core/rbac/PwPolicyMgrImpl.java | 4 --
.../fortress/core/rbac/ReviewMgrImpl.java | 4 --
18 files changed, 120 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/out/test/directory-fortress-core/org/apache/directory/fortress/core/samples/package.html
----------------------------------------------------------------------
diff --git a/out/test/directory-fortress-core/org/apache/directory/fortress/core/samples/package.html b/out/test/directory-fortress-core/org/apache/directory/fortress/core/samples/package.html
new file mode 100755
index 0000000..9881d96
--- /dev/null
+++ b/out/test/directory-fortress-core/org/apache/directory/fortress/core/samples/package.html
@@ -0,0 +1,50 @@
+<!--
+ * 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.
+ *
+-->
+<html>
+ <head>
+ <title>Package Documentation for org.openldap.fortress.samples</title>
+ </head>
+ <body>
+ <p>
+ This package contains samples that show how the Fortress APIs can be used. The samples use JUnit
+ and provide the following.
+ <h3>Samples</h3>
+ <ol>
+ <li>{@link org.openldap.fortress.samples.AccessMgrSample} demonstrates {@code org.openldap.fortress.AccessMgr} APIs</li>
+ <li>{@link org.openldap.fortress.samples.AllSamplesJUnitTest} will execute all tests in their proper order</li>
+ <li>{@link org.openldap.fortress.samples.CreatePermOrgHierarchySample} demonstrates {@code org.openldap.fortress.DelegatedAdminMgr} APis to create Perm organizational unit hierarchies</li>
+ <li>{@link org.openldap.fortress.samples.CreatePermOrgSample} demonstrates {@code org.openldap.fortress.DelegatedAdminMgr} APis to create a Perm organizational unit node</li>
+ <li>{@link org.openldap.fortress.samples.CreatePermSample} demonstrates {@code org.openldap.fortress.AdminMgr} to create RBAC permissions</li>
+ <li>{@link org.openldap.fortress.samples.CreateRoleHierarchySample} demonstrates {@code org.openldap.fortress.AdminMgr} to create RBAC Role hierarchies</li>
+ <li>{@link org.openldap.fortress.samples.CreateRoleSample} demonstrates {@code org.openldap.fortress.AdminMgr} to create RBAC Roles and assign constraints</li>
+ <li>{@link org.openldap.fortress.samples.CreateSessionSample} demonstrates various ways to create a session using {@code org.openldap.fortress.AccessMgr} APIs</li>
+ <li>{@link org.openldap.fortress.samples.CreateUserOrgHierarchySample} demonstrates {@code org.openldap.fortress.DelegatedAdminMgr} APis to create User organizational unit hierarchies</li>
+ <li>{@link org.openldap.fortress.samples.CreateUserOrgSample} demonstrates {@code org.openldap.fortress.DelegatedAdminMgr} APis to create a User organizational unit node</li>
+ <li>{@link org.openldap.fortress.samples.CreateUserRoleSample} demonstrates {@code org.openldap.fortress.AdminMgr} APIs to assign Roles to Users</li>
+ <li>{@link org.openldap.fortress.samples.CreateUserSample} demonstrates {@code org.openldap.fortress.AdminMgr} APIs to create User object nodes</li>
+ </ol>
+ </p>
+ <p>
+ The <b>org.openldap.fortress.samples</b> package provides examples on proper usage of Fortress APIs, Each sample contains javadoc and JUnit test case that describes
+ the use case and function for a particular entity.
+ For more info, check out the javadoc pertaining to each sample.
+ </p>
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
index 032cc8a..a1a68e6 100644
--- a/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
@@ -62,12 +62,16 @@ public class AccelMgrFactory
throws SecurityException
{
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
+ AccelMgr accelMgr;
if (!VUtil.isNotNullOrEmpty(accelClassName))
{
- accelClassName = AccelMgrImpl.class.getName();
+ accelMgr = new AccelMgrImpl();
+ }
+ else
+ {
+ accelMgr = (AccelMgr) ClassUtil.createInstance(accelClassName);
}
- AccelMgr accelMgr = (AccelMgr) ClassUtil.createInstance(accelClassName);
accelMgr.setContextId(contextId);
return accelMgr;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
index 076e37e..c040173 100755
--- a/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
@@ -62,19 +62,24 @@ public class AccessMgrFactory
public static AccessMgr createInstance( String contextId) throws SecurityException
{
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
+
+ AccessMgr accessMgr;
if (!VUtil.isNotNullOrEmpty(accessClassName))
{
if(GlobalIds.IS_REST)
{
- accessClassName = AccessMgrRestImpl.class.getName();
+ accessMgr = new AccessMgrRestImpl();
}
else
{
- accessClassName = AccessMgrImpl.class.getName();
+ accessMgr = new AccessMgrImpl();
}
}
+ else
+ {
+ accessMgr = (AccessMgr) ClassUtil.createInstance(accessClassName);
+ }
- AccessMgr accessMgr = (AccessMgr) ClassUtil.createInstance(accessClassName);
accessMgr.setContextId(contextId);
return accessMgr;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
index e6cd9dc..9349c30 100755
--- a/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
@@ -65,19 +65,24 @@ public class AdminMgrFactory
throws SecurityException
{
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
+ AdminMgr adminMgr;
+
if (!VUtil.isNotNullOrEmpty(adminClassName))
{
if(GlobalIds.IS_REST)
{
- adminClassName = AdminMgrRestImpl.class.getName();
+ adminMgr = new AdminMgrRestImpl();
}
else
{
- adminClassName = AdminMgrImpl.class.getName();
+ adminMgr = new AdminMgrImpl();
}
}
+ else
+ {
+ adminMgr = (AdminMgr) ClassUtil.createInstance(adminClassName);
+ }
- AdminMgr adminMgr = (AdminMgr) ClassUtil.createInstance(adminClassName);
adminMgr.setContextId(contextId);
return adminMgr;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
index 8a28dd0..8eabc83 100755
--- a/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
@@ -63,19 +63,24 @@ public class AuditMgrFactory
throws SecurityException
{
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
+ AuditMgr auditMgr;
+
if (!VUtil.isNotNullOrEmpty(auditClassName))
{
if(GlobalIds.IS_REST)
{
- auditClassName = AuditMgrRestImpl.class.getName();
+ auditMgr = new AuditMgrRestImpl();
}
else
{
- auditClassName = AuditMgrImpl.class.getName();
+ auditMgr = new AuditMgrImpl();
}
}
+ else
+ {
+ auditMgr = (AuditMgr) ClassUtil.createInstance(auditClassName);
+ }
- AuditMgr auditMgr = (AuditMgr) ClassUtil.createInstance(auditClassName);
auditMgr.setContextId(contextId);
return auditMgr;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
index e355a67..7902b1f 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
@@ -64,19 +64,24 @@ public class DelAccessMgrFactory
throws SecurityException
{
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
+ DelAccessMgr accessMgr;
+
if (!VUtil.isNotNullOrEmpty(accessClassName))
{
if(GlobalIds.IS_REST)
{
- accessClassName = DelAccessMgrRestImpl.class.getName();
+ accessMgr = new DelAccessMgrRestImpl();
}
else
{
- accessClassName = DelAccessMgrImpl.class.getName();
+ accessMgr = new DelAccessMgrImpl();
}
}
+ else
+ {
+ accessMgr = (DelAccessMgr) ClassUtil.createInstance(accessClassName);
+ }
- DelAccessMgr accessMgr = (DelAccessMgr) ClassUtil.createInstance(accessClassName);
accessMgr.setContextId(contextId);
return accessMgr;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
index 1db31d6..0f2b295 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
@@ -65,20 +65,24 @@ public class DelAdminMgrFactory
throws SecurityException
{
VUtil.assertNotNull( contextId, GlobalErrIds.CONTEXT_NULL, CREATE_INSTANCE_METHOD );
-
+ DelAdminMgr delAdminMgr;
+
if ( Strings.isEmpty( dAdminClassName ) )
{
if ( GlobalIds.IS_REST )
{
- dAdminClassName = DelAdminMgrRestImpl.class.getName();
+ delAdminMgr = new DelAdminMgrRestImpl();
}
else
{
- dAdminClassName = DelAdminMgrImpl.class.getName();
+ delAdminMgr = new DelAdminMgrImpl();
}
}
+ else
+ {
+ delAdminMgr = (DelAdminMgr) ClassUtil.createInstance( dAdminClassName );
+ }
- DelAdminMgr delAdminMgr = (DelAdminMgr) ClassUtil.createInstance( dAdminClassName );
delAdminMgr.setContextId(contextId);
return delAdminMgr;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
index b751a90..e89ca89 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
@@ -63,19 +63,24 @@ public class DelReviewMgrFactory
throws SecurityException
{
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
+ DelReviewMgr delReviewMgr;
+
if (!VUtil.isNotNullOrEmpty(dReviewClassName))
{
if(GlobalIds.IS_REST)
{
- dReviewClassName = DelReviewMgrRestImpl.class.getName();
+ delReviewMgr = new DelReviewMgrRestImpl();
}
else
{
- dReviewClassName = DelReviewMgrImpl.class.getName();
+ delReviewMgr = new DelReviewMgrImpl();
}
}
+ else
+ {
+ delReviewMgr = (DelReviewMgr) ClassUtil.createInstance(dReviewClassName);
+ }
- DelReviewMgr delReviewMgr = (DelReviewMgr) ClassUtil.createInstance(dReviewClassName);
delReviewMgr.setContextId(contextId);
return delReviewMgr;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
index d432df1..fef7355 100755
--- a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
@@ -63,19 +63,24 @@ public class PwPolicyMgrFactory
throws SecurityException
{
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
+ PwPolicyMgr policyMgr;
+
if (!VUtil.isNotNullOrEmpty(policyClassName))
{
if(GlobalIds.IS_REST)
{
- policyClassName = PwPolicyMgrRestImpl.class.getName();
+ policyMgr = new PwPolicyMgrRestImpl();
}
else
{
- policyClassName = PwPolicyMgrImpl.class.getName();
+ policyMgr = new PwPolicyMgrImpl();
}
}
+ else
+ {
+ policyMgr = (PwPolicyMgr) ClassUtil.createInstance(policyClassName);
+ }
- PwPolicyMgr policyMgr = (PwPolicyMgr) ClassUtil.createInstance(policyClassName);
policyMgr.setContextId(contextId);
return policyMgr;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
index 95baef6..0e477ee 100755
--- a/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
@@ -63,19 +63,24 @@ public class ReviewMgrFactory
throws SecurityException
{
VUtil.assertNotNull(contextId, GlobalErrIds.CONTEXT_NULL, CLS_NM + ".createInstance");
+ ReviewMgr reviewMgr;
+
if (!VUtil.isNotNullOrEmpty(reviewClassName))
{
if(GlobalIds.IS_REST)
{
- reviewClassName = ReviewMgrRestImpl.class.getName();
+ reviewMgr = new ReviewMgrRestImpl();
}
else
{
- reviewClassName = ReviewMgrImpl.class.getName();
+ reviewMgr = new ReviewMgrImpl();
}
}
+ else
+ {
+ reviewMgr = ( ReviewMgr ) ClassUtil.createInstance(reviewClassName);
+ }
- ReviewMgr reviewMgr = ( ReviewMgr ) ClassUtil.createInstance(reviewClassName);
reviewMgr.setContextId(contextId);
return reviewMgr;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/rbac/AccessMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AccessMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/AccessMgrImpl.java
index 9749736..4bb8ec3 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AccessMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AccessMgrImpl.java
@@ -74,13 +74,6 @@ public class AccessMgrImpl extends Manageable implements AccessMgr
private static final UserP userP = new UserP();
private static final PermP permP = new PermP();
-
- // package private constructor ensures outside classes cannot use:
- protected AccessMgrImpl()
- {
- }
-
-
/**
* Perform user authentication only. It does not activate RBAC roles in session but will evaluate
* password policies.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/rbac/AdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/AdminMgrImpl.java
index c27318b..8c3bce5 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AdminMgrImpl.java
@@ -84,12 +84,6 @@ public final class AdminMgrImpl extends Manageable implements AdminMgr
private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
- // package private constructor ensures outside classes cannot use:
- AdminMgrImpl()
- {
- }
-
-
/**
* This command creates a new RBAC user. The command is valid only if the new user is
* not already a member of the USERS data set. The USER data set is updated. The new user
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/rbac/AuditMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/AuditMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/AuditMgrImpl.java
index 8b06405..c90cd76 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/AuditMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/AuditMgrImpl.java
@@ -78,10 +78,6 @@ public class AuditMgrImpl extends Manageable implements AuditMgr
private static final String CLS_NM = AuditMgrImpl.class.getName();
private static final AuditP auditP = new AuditP();
- // package private constructor ensures outside classes cannot use:
- AuditMgrImpl()
- {}
-
/**
* This method returns a list of authorization events for a particular user {@link org.apache.directory.fortress.core.rbac.UserAudit#userId}
* and given timestamp field {@link org.apache.directory.fortress.core.rbac.UserAudit#beginDate}.<BR>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/rbac/DelAccessMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/DelAccessMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/DelAccessMgrImpl.java
index 0c7785a..4fa054c 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/DelAccessMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/DelAccessMgrImpl.java
@@ -59,10 +59,6 @@ public class DelAccessMgrImpl extends AccessMgrImpl implements DelAccessMgr
private static final PermP permP = new PermP();
private static final String SUPER_ADMIN = Config.getProperty("superadmin.role", "fortress-core-super-admin");
- // package private constructor ensures outside classes cannot use:
- /* No qualifier */ DelAccessMgrImpl()
- {}
-
/**
* This function will determine if the user contains an AdminRole that is authorized assignment control over
* User-Role Assignment (URA). This adheres to the ARBAC02 functional specification for can-assign URA.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/rbac/DelAdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/DelAdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/DelAdminMgrImpl.java
index 43c8a09..6c5a60b 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/DelAdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/DelAdminMgrImpl.java
@@ -56,10 +56,6 @@ public final class DelAdminMgrImpl extends Manageable implements DelAdminMgr
private static final PermP permP = new PermP();
private static final UserP userP = new UserP();
- // package private constructor ensures outside classes cannot use:
- DelAdminMgrImpl()
- {}
-
/**
* This command creates a new admin role. The command is valid if and only if the new admin role is not
* already a member of the ADMIN ROLES data set. The ADMIN ROLES data set is updated.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/rbac/DelReviewMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/DelReviewMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/DelReviewMgrImpl.java
index c4caa02..eea4b0b 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/DelReviewMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/DelReviewMgrImpl.java
@@ -50,10 +50,6 @@ public class DelReviewMgrImpl extends Manageable implements DelReviewMgr
private static final OrgUnitP ouP = new OrgUnitP();
private static final AdminRoleP admRP = new AdminRoleP();
- // package private constructor ensures outside classes cannot use:
- DelReviewMgrImpl()
- {}
-
/**
* Method reads Admin Role entity from the admin role container in directory.
* <h4>required parameters</h4>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicyMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicyMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicyMgrImpl.java
index 1a9ca3e..3538437 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicyMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PwPolicyMgrImpl.java
@@ -61,10 +61,6 @@ public class PwPolicyMgrImpl extends Manageable implements PwPolicyMgr
private static final PolicyP policyP = new PolicyP();
private static final UserP userP = new UserP();
- // package private constructor ensures outside classes cannot use:
- PwPolicyMgrImpl()
- {}
-
/**
* This method will add a new policy entry to the POLICIES data set. This command is valid
* if and only if the policy entry is not already present in the POLICIES data set.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dcfed51c/src/main/java/org/apache/directory/fortress/core/rbac/ReviewMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/ReviewMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/rbac/ReviewMgrImpl.java
index 43314aa..60dfa92 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/ReviewMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/ReviewMgrImpl.java
@@ -72,10 +72,6 @@ public class ReviewMgrImpl extends Manageable implements ReviewMgr
private static final PermP permP = new PermP();
private static final SdP ssdP = new SdP();
- // package private constructor ensures outside classes cannot use:
- ReviewMgrImpl()
- {}
-
/**
* This method returns a matching permission entity to caller.
* <h4>required parameters</h4>
[10/23] directory-fortress-core git commit: FC-54 - Benchmark
activities - ldap pool: setMaxIdle = -1
Posted by sm...@apache.org.
FC-54 - Benchmark activities - ldap pool: setMaxIdle = -1
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/4bc082dd
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/4bc082dd
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/4bc082dd
Branch: refs/heads/master
Commit: 4bc082ddf8bda920f9811c226efba45b3da3d7c7
Parents: 7978fe0
Author: Shawn McKinney <sm...@apache.org>
Authored: Mon Dec 29 09:20:52 2014 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Mon Dec 29 09:20:52 2014 -0600
----------------------------------------------------------------------
.../core/ldap/ApacheDsDataProvider.java | 4 ++
.../fortress/core/jmeter/CheckAccess.java | 40 ++++++++++++++++++--
2 files changed, 41 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4bc082dd/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 2b03234..ebb362f 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
@@ -167,6 +167,7 @@ public abstract class ApacheDsDataProvider
int max = Config.getInt( LDAP_ADMIN_POOL_MAX, 10 );
int logmin = Config.getInt( LDAP_LOG_POOL_MIN, 1 );
int logmax = Config.getInt( LDAP_LOG_POOL_MAX, 10 );
+ LOG.info( "LDAP POOL: host=[{}], port=[{}], min=[{}], max=[{}]", host, port, min, max);
if ( IS_SET_TRUST_STORE_PROP )
{
@@ -236,6 +237,8 @@ public abstract class ApacheDsDataProvider
adminPool.setWhenExhaustedAction( GenericObjectPool.WHEN_EXHAUSTED_GROW );
adminPool.setMaxActive( max );
adminPool.setMinIdle( min );
+ adminPool.setMaxIdle( -1 );
+ //adminPool.setMaxWait( 0 );
// Create the User pool
userPool = new LdapConnectionPool( poolFactory );
@@ -243,6 +246,7 @@ public abstract class ApacheDsDataProvider
userPool.setWhenExhaustedAction( GenericObjectPool.WHEN_EXHAUSTED_GROW );
userPool.setMaxActive( max );
userPool.setMinIdle( min );
+ userPool.setMaxIdle( -1 );
// This pool of access log connections is used by {@link org.apache.directory.fortress.AuditMgr}.
// To enable, set {@code log.admin.user} && {@code log.admin.pw} inside fortress.properties file:
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4bc082dd/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
index 60f7adf..91855e3 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
@@ -97,7 +97,7 @@ public class CheckAccess extends AbstractJavaSamplerClient
}
- message += "CheckAccess userId: " + userId + ", objName:" + objName + ", opName: " + opName;
+ message += "CheckAccess isFortress: " + isFortress + ", userId: " + userId + ", objName:" + objName + ", opName: " + opName;
/*
LOG.info( message );
System.out.println( message );
@@ -179,6 +179,36 @@ public class CheckAccess extends AbstractJavaSamplerClient
user.setPassword( "secret".toCharArray() );
if( VUtil.isNotNullOrEmpty( val ) && val.equals( "1" ))
{
+ message = "AC SETUP CreateSession, User: " + user.getUserId() + ", key: " + key + ", TID: " + getThreadId();
+ isFortress = false;
+
+ LOG.info( message );
+ System.out.println( message );
+
+ message = "ThreadId:" + getThreadId() + ", createSession user: " + user.getUserId();
+ LOG.info( message );
+ System.out.println( message );
+
+ accelMgr = AccelMgrFactory.createInstance( TestUtils.getContext() );
+ session = accelMgr.createSession( user, false );
+ }
+ else
+ {
+ message = "FT SETUP CreateSession, User: " + user.getUserId() + ", key: " + key + ", TID: " + getThreadId();
+ isFortress = true;
+
+ LOG.info( message );
+ System.out.println( message );
+ message = "ThreadId:" + getThreadId() + ", createSession user: " + user.getUserId();
+ LOG.info( message );
+ System.out.println( message );
+
+ accessMgr = AccessMgrFactory.createInstance( TestUtils.getContext() );
+ session = accessMgr.createSession( user, false );
+ }
+/*
+ if( VUtil.isNotNullOrEmpty( val ) && val.equals( "1" ))
+ {
message = "FT SETUP CreateSession, User: " + user.getUserId() + ", key: " + key + ", TID: " + getThreadId();
isFortress = true;
accessMgr = AccessMgrFactory.createInstance( TestUtils.getContext() );
@@ -191,8 +221,11 @@ public class CheckAccess extends AbstractJavaSamplerClient
accelMgr = AccelMgrFactory.createInstance( TestUtils.getContext() );
session = accelMgr.createSession( user, false );
}
+*/
+/*
LOG.info( message );
System.out.println( message );
+*/
}
assertNotNull( session );
@@ -200,8 +233,9 @@ public class CheckAccess extends AbstractJavaSamplerClient
}
catch ( SecurityException se )
{
- String error = "setupTest ThreadId:" + getThreadId() + " Error starting test: " + se;
- LOG.error( "ThreadId:" + getThreadId() + "Error running test: " + se );
+ String error = "ThreadId:" + getThreadId() + " Error starting test: " + se;
+ System.out.println( error );
+ LOG.error( error );
se.printStackTrace();
fail(error);
}
[20/23] directory-fortress-core git commit: update to M28 ldap api
Posted by sm...@apache.org.
update to M28 ldap api
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/b1e9c986
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/b1e9c986
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/b1e9c986
Branch: refs/heads/master
Commit: b1e9c986d6c5f14e83125bba8c429205ac2c2c8e
Parents: 14a1b3e
Author: Shawn McKinney <sm...@apache.org>
Authored: Fri Jan 16 07:50:00 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Fri Jan 16 07:50:00 2015 -0600
----------------------------------------------------------------------
pom.xml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/b1e9c986/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bd09e6b..aeab6b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
<version.ant.launcher>1.9.1</version.ant.launcher>
<version.antlr>2.7.7</version.antlr>
<version.apacheds>2.0.0-M18</version.apacheds>
- <version.api.all>1.0.0-M27</version.api.all>
+ <version.api.all>1.0.0-M28</version.api.all>
<version.commons.beanutils>1.7.0</version.commons.beanutils>
<version.commons.beanutils-core>1.8.0</version.commons.beanutils-core>
<version.commons.codec>1.2</version.commons.codec>
@@ -738,6 +738,13 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${version.log4j}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
[11/23] directory-fortress-core git commit: use 1.0.0-M27 ldap api
Posted by sm...@apache.org.
use 1.0.0-M27 ldap api
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/42210402
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/42210402
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/42210402
Branch: refs/heads/master
Commit: 42210402f1d0dc3f49e03e126886f13930f9c56e
Parents: 7978fe0
Author: Shawn McKinney <sm...@symas.com>
Authored: Wed Dec 31 10:46:26 2014 -0600
Committer: Shawn McKinney <sm...@symas.com>
Committed: Wed Dec 31 10:46:26 2014 -0600
----------------------------------------------------------------------
b.sh | 4 ++--
build.xml | 2 +-
ivy.xml | 2 +-
pom.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/42210402/b.sh
----------------------------------------------------------------------
diff --git a/b.sh b/b.sh
index d373e5d..60ee8d4 100755
--- a/b.sh
+++ b/b.sh
@@ -17,6 +17,6 @@
# specific language governing permissions and limitations
# under the License.
#
-export JAVA_HOME=/opt/jdk1.7.0_10
-export ANT_HOME=./apache-ant
+export JAVA_HOME=/opt/jdk1.7.0_71
+export ANT_HOME=../apache-ant
$ANT_HOME/bin/ant $1 $2 $3 $4
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/42210402/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7a96b7a..32791d6 100644
--- a/build.xml
+++ b/build.xml
@@ -174,7 +174,7 @@
<property name="apacheJMeter_core.jar" value="${lib.dir}/ApacheJMeter_core-2.11.jar"/>
<property name="apacheJMeter_java.jar" value="${lib.dir}/ApacheJMeter_java-2.11.jar"/>
<property name="apacheds-all.jar" value="${lib.dir}/apacheds-all-2.0.0-M18.jar"/>
- <property name="apacheds-api-all.jar" value="${lib.dir}/api-all-1.0.0-M27-SNAPSHOT.jar"/>
+ <property name="apacheds-api-all.jar" value="${lib.dir}/api-all-1.0.0-M27.jar"/>
<!-- <property name="apacheds-api-all.jar" value="${lib.dir}/api-all-1.0.0-M25.jar"/>-->
<property name="mina-core.jar" value="${lib.dir}/mina-core-2.0.7.jar"/>
<property name="opencsv.jar" value="${lib.dir}/opencsv-2.3.jar"/>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/42210402/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 1f4f876..22919de 100755
--- a/ivy.xml
+++ b/ivy.xml
@@ -48,7 +48,7 @@
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.5" conf="default->master"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.5" conf="default->master"/>
<dependency org="org.slf4j" name="slf4j-jcl" rev="1.7.5" conf="default->master"/>
-<!-- <dependency org="org.apache.directory.api" name="api-all" rev="1.0.0-M25" conf="default->master"/>-->
+ <dependency org="org.apache.directory.api" name="api-all" rev="1.0.0-M27" conf="default->master"/>
<dependency org="org.apache.directory.server" name="apacheds-all" rev="2.0.0-M18" conf="default->master"/>
<dependency org="net.sf.opencsv" name="opencsv" rev="2.3" conf="default->master" />
<dependency org="org.apache.jmeter" name="ApacheJMeter_core" rev="2.11" conf="default->master" />
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/42210402/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 666b18d..9e554f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
<version.ant.launcher>1.9.1</version.ant.launcher>
<version.antlr>2.7.7</version.antlr>
<version.apacheds>2.0.0-M18</version.apacheds>
- <version.api.all>1.0.0-M27-SNAPSHOT</version.api.all>
+ <version.api.all>1.0.0-M27</version.api.all>
<version.commons.beanutils>1.7.0</version.commons.beanutils>
<version.commons.beanutils-core>1.8.0</version.commons.beanutils-core>
<version.commons.codec>1.2</version.commons.codec>
[22/23] directory-fortress-core git commit: FC-54 - Benchmark
activities - add maven profile to execute accel createSession
Posted by sm...@apache.org.
FC-54 - Benchmark activities - add maven profile to execute accel createSession
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/f9d396c4
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/f9d396c4
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/f9d396c4
Branch: refs/heads/master
Commit: f9d396c477e4fd608abcbbf2c5559d36e0220aca
Parents: becb2c6
Author: Shawn McKinney <sm...@apache.org>
Authored: Sun Jan 18 19:09:11 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sun Jan 18 19:09:11 2015 -0600
----------------------------------------------------------------------
pom.xml | 40 +++++++++
.../core/jmeter/AccelCreateSession.java | 4 +-
.../fortress/core/jmeter/CheckAccess.java | 2 +-
src/test/jmeter/acCreateSession.jmx | 87 ++++++++++++++++++++
4 files changed, 130 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f9d396c4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aeab6b9..7bd7856 100644
--- a/pom.xml
+++ b/pom.xml
@@ -751,6 +751,46 @@
</build>
</profile>
+ <!--
+ To execute: ./m.sh -Ploadtest-acca jmeter:jmeter
+ -->
+ <profile>
+ <id>loadtest-acca</id>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>com.lazerycode.jmeter</groupId>
+ <artifactId>jmeter-maven-plugin</artifactId>
+ <version>1.10.0</version>
+ <configuration>
+ <overrideRootLogLevel>DEBUG</overrideRootLogLevel>
+ <suppressJMeterOutput>false</suppressJMeterOutput>
+ <testFilesIncluded>
+ <jMeterTestFile>acCreateSession.jmx</jMeterTestFile>
+ </testFilesIncluded>
+ </configuration>
+ <executions>
+ <execution>
+ <id>jmeter-tests</id>
+ <goals>
+ <goal>jmeter</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${version.log4j}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
<profile>
<id>apache-release</id>
<build>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f9d396c4/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java b/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java
index 93c135b..040c653 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java
@@ -62,8 +62,8 @@ public class AccelCreateSession extends AbstractJavaSamplerClient
String fiKey = getKey( Thread.currentThread().getId() );
assertNotNull( accelMgr );
String message = "AC CreateSession TID: " + getThreadId() + " #:" + ctr++;
- LOG.info( message );
- System.out.println( message );
+ LOG.debug( message );
+ //System.out.println( message );
Session session;
User user = new User();
// positive test case:
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f9d396c4/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
index af5b178..4b4cb3f 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
@@ -57,7 +57,7 @@ public class CheckAccess extends AbstractJavaSamplerClient
private String userId = "";
private boolean isFortress = false;
- /**
+ /**224
* Description of the Method
*
* @param samplerContext Description of the Parameter
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f9d396c4/src/test/jmeter/acCreateSession.jmx
----------------------------------------------------------------------
diff --git a/src/test/jmeter/acCreateSession.jmx b/src/test/jmeter/acCreateSession.jmx
new file mode 100644
index 0000000..076bc3d
--- /dev/null
+++ b/src/test/jmeter/acCreateSession.jmx
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jmeterTestPlan version="1.2" properties="2.6" jmeter="2.11 r1554548">
+ <hashTree>
+ <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="RbacLoadTester" enabled="true">
+ <stringProp name="TestPlan.comments"></stringProp>
+ <boolProp name="TestPlan.functional_mode">false</boolProp>
+ <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+ <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+ <collectionProp name="Arguments.arguments"/>
+ </elementProp>
+ <stringProp name="TestPlan.user_define_classpath">../../../config,../../../dist,../../../lib</stringProp>
+ </TestPlan>
+ <hashTree>
+ <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="false">
+ <stringProp name="delimiter">,</stringProp>
+ <stringProp name="fileEncoding"></stringProp>
+ <stringProp name="filename">RbacAccess.csv</stringProp>
+ <boolProp name="quotedData">false</boolProp>
+ <boolProp name="recycle">true</boolProp>
+ <stringProp name="shareMode">shareMode.all</stringProp>
+ <boolProp name="stopThread">false</boolProp>
+ <stringProp name="variableNames"></stringProp>
+ </CSVDataSet>
+ <hashTree/>
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Accelerator CreateSesion" enabled="true">
+ <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+ <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+ <boolProp name="LoopController.continue_forever">false</boolProp>
+
+ <stringProp name="LoopController.loops">10000</stringProp>
+ </elementProp>
+ <stringProp name="ThreadGroup.num_threads">25</stringProp>
+ <stringProp name="ThreadGroup.ramp_time">2</stringProp>
+ <boolProp name="ThreadGroup.scheduler">false</boolProp>
+ <stringProp name="ThreadGroup.duration"></stringProp>
+ <stringProp name="ThreadGroup.delay"></stringProp>
+ </ThreadGroup>
+ <hashTree>
+ <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Accelerator CreateSession" enabled="true">
+ <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+ <collectionProp name="Arguments.arguments">
+ <elementProp name="type" elementType="Argument">
+ <stringProp name="Argument.name">type</stringProp>
+ <stringProp name="Argument.value">1</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ </collectionProp>
+ </elementProp>
+ <stringProp name="classname">org.apache.directory.fortress.core.jmeter.AccelCreateSession</stringProp>
+ </JavaSampler>
+ <hashTree/>
+ <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
+ <boolProp name="ResultCollector.error_logging">false</boolProp>
+ <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>true</time>
+ <latency>true</latency>
+ <timestamp>true</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>false</samplerData>
+ <xml>true</xml>
+ <fieldNames>false</fieldNames>
+ <responseHeaders>false</responseHeaders>
+ <requestHeaders>false</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+ <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <bytes>true</bytes>
+ </value>
+ </objProp>
+ <stringProp name="filename"></stringProp>
+ </ResultCollector>
+ <hashTree/>
+ </hashTree>
+ </hashTree>
+ </hashTree>
+</jmeterTestPlan>
\ No newline at end of file
[12/23] directory-fortress-core git commit: Merge branch '1.0.0-RC40'
of https://git-wip-us.apache.org/repos/asf/directory-fortress-core into
1.0.0-RC40
Posted by sm...@apache.org.
Merge branch '1.0.0-RC40' of https://git-wip-us.apache.org/repos/asf/directory-fortress-core into 1.0.0-RC40
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/9bd1d048
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/9bd1d048
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/9bd1d048
Branch: refs/heads/master
Commit: 9bd1d048bcc1ce5f11367f7489f134e991a67700
Parents: 4221040 4bc082d
Author: Shawn McKinney <sm...@apache.org>
Authored: Wed Dec 31 10:49:29 2014 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Wed Dec 31 10:49:29 2014 -0600
----------------------------------------------------------------------
.../core/ldap/ApacheDsDataProvider.java | 4 ++
.../fortress/core/jmeter/CheckAccess.java | 40 ++++++++++++++++++--
2 files changed, 41 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[17/23] directory-fortress-core git commit: FC-54 - Benchmark
activities - add maven-jmeter plugin for load testing.
Posted by sm...@apache.org.
FC-54 - Benchmark activities - add maven-jmeter plugin for load testing.
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/3c488343
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/3c488343
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/3c488343
Branch: refs/heads/master
Commit: 3c488343681ffa8380e5ad17473549255254c64f
Parents: cef29cb
Author: Shawn McKinney <sm...@apache.org>
Authored: Wed Jan 14 21:28:55 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Wed Jan 14 21:28:55 2015 -0600
----------------------------------------------------------------------
ldap/setup/LoadTestUsers.xml | 48 +-
pom.xml | 1449 +++++++++++++++++---------------
src/test/jmeter/acCheckAccess.jmx | 95 +++
src/test/jmeter/ftCheckAccess.jmx | 95 +++
4 files changed, 972 insertions(+), 715 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3c488343/ldap/setup/LoadTestUsers.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/LoadTestUsers.xml b/ldap/setup/LoadTestUsers.xml
index 757588b..e8d5d61 100644
--- a/ldap/setup/LoadTestUsers.xml
+++ b/ldap/setup/LoadTestUsers.xml
@@ -540,6 +540,7 @@
</addpermgrant>
<deluser>
+ <user userId="loadtestuser0"/>
<user userId="loadtestuser1"/>
<user userId="loadtestuser2"/>
<user userId="loadtestuser3"/>
@@ -639,10 +640,10 @@
<user userId="loadtestuser97"/>
<user userId="loadtestuser98"/>
<user userId="loadtestuser99"/>
- <user userId="loadtestuser100"/>
</deluser>
<adduser>
+ <user userId="loadtestuser0" password="secret" description="Load Test User" ou="loadtestu" cn="User Test1" sn="Test1" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="" endLockDate="" dayMask="1234567" timeout="0" />
<user userId="loadtestuser1" password="secret" description="Load Test User" ou="loadtestu" cn="User Test1" sn="Test1" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="" endLockDate="" dayMask="1234567" timeout="0" />
<user userId="loadtestuser2" password="secret" description="Load Test User" ou="loadtestu" cn="User Test2" sn="Test2" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="" endLockDate="" dayMask="1234567" timeout="0" />
<user userId="loadtestuser3" password="secret" description="Load Test User" ou="loadtestu" cn="User Test3" sn="Test3" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="" endLockDate="" dayMask="1234567" timeout="0" />
@@ -742,10 +743,20 @@
<user userId="loadtestuser97" password="secret" description="Load Test User" ou="loadtestu" cn="User Test97" sn="Test97" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="" endLockDate="" dayMask="1234567" timeout="0" />
<user userId="loadtestuser98" password="secret" description="Load Test User" ou="loadtestu" cn="User Test98" sn="Test98" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="" endLockDate="" dayMask="1234567" timeout="0" />
<user userId="loadtestuser99" password="secret" description="Load Test User" ou="loadtestu" cn="User Test99" sn="Test99" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="" endLockDate="" dayMask="1234567" timeout="0" />
- <user userId="loadtestuser100" password="secret" description="Load Test User" ou="loadtestu" cn="User Test100" sn="Test100" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="" endLockDate="" dayMask="1234567" timeout="0" />
</adduser>
<deluserrole>
+ <userrole userId="loadtestuser0" name="loadtestrole1"/>
+ <userrole userId="loadtestuser0" name="loadtestrole2"/>
+ <userrole userId="loadtestuser0" name="loadtestrole3"/>
+ <userrole userId="loadtestuser0" name="loadtestrole4"/>
+ <userrole userId="loadtestuser0" name="loadtestrole5"/>
+ <userrole userId="loadtestuser0" name="loadtestrole6"/>
+ <userrole userId="loadtestuser0" name="loadtestrole7"/>
+ <userrole userId="loadtestuser0" name="loadtestrole8"/>
+ <userrole userId="loadtestuser0" name="loadtestrole9"/>
+ <userrole userId="loadtestuser0" name="loadtestrole10"/>
+
<userrole userId="loadtestuser1" name="loadtestrole1"/>
<userrole userId="loadtestuser1" name="loadtestrole2"/>
<userrole userId="loadtestuser1" name="loadtestrole3"/>
@@ -1834,20 +1845,20 @@
<userrole userId="loadtestuser99" name="loadtestrole8"/>
<userrole userId="loadtestuser99" name="loadtestrole9"/>
<userrole userId="loadtestuser99" name="loadtestrole10"/>
-
- <userrole userId="loadtestuser100" name="loadtestrole1"/>
- <userrole userId="loadtestuser100" name="loadtestrole2"/>
- <userrole userId="loadtestuser100" name="loadtestrole3"/>
- <userrole userId="loadtestuser100" name="loadtestrole4"/>
- <userrole userId="loadtestuser100" name="loadtestrole5"/>
- <userrole userId="loadtestuser100" name="loadtestrole6"/>
- <userrole userId="loadtestuser100" name="loadtestrole7"/>
- <userrole userId="loadtestuser100" name="loadtestrole8"/>
- <userrole userId="loadtestuser100" name="loadtestrole9"/>
- <userrole userId="loadtestuser100" name="loadtestrole10"/>
</deluserrole>
<adduserrole>
+ <userrole userId="loadtestuser0" name="loadtestrole1"/>
+ <userrole userId="loadtestuser0" name="loadtestrole2"/>
+ <userrole userId="loadtestuser0" name="loadtestrole3"/>
+ <userrole userId="loadtestuser0" name="loadtestrole4"/>
+ <userrole userId="loadtestuser0" name="loadtestrole5"/>
+ <userrole userId="loadtestuser0" name="loadtestrole6"/>
+ <userrole userId="loadtestuser0" name="loadtestrole7"/>
+ <userrole userId="loadtestuser0" name="loadtestrole8"/>
+ <userrole userId="loadtestuser0" name="loadtestrole9"/>
+ <userrole userId="loadtestuser0" name="loadtestrole10"/>
+
<userrole userId="loadtestuser1" name="loadtestrole1"/>
<userrole userId="loadtestuser1" name="loadtestrole2"/>
<userrole userId="loadtestuser1" name="loadtestrole3"/>
@@ -2936,17 +2947,6 @@
<userrole userId="loadtestuser99" name="loadtestrole8"/>
<userrole userId="loadtestuser99" name="loadtestrole9"/>
<userrole userId="loadtestuser99" name="loadtestrole10"/>
-
- <userrole userId="loadtestuser100" name="loadtestrole1"/>
- <userrole userId="loadtestuser100" name="loadtestrole2"/>
- <userrole userId="loadtestuser100" name="loadtestrole3"/>
- <userrole userId="loadtestuser100" name="loadtestrole4"/>
- <userrole userId="loadtestuser100" name="loadtestrole5"/>
- <userrole userId="loadtestuser100" name="loadtestrole6"/>
- <userrole userId="loadtestuser100" name="loadtestrole7"/>
- <userrole userId="loadtestuser100" name="loadtestrole8"/>
- <userrole userId="loadtestuser100" name="loadtestrole9"/>
- <userrole userId="loadtestuser100" name="loadtestrole10"/>
</adduserrole>
</FortressAdmin>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3c488343/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9e554f3..e59be9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,699 +17,766 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.directory</groupId>
- <artifactId>fortress-core</artifactId>
- <packaging>jar</packaging>
- <name>Apache Fortress Core</name>
- <version>1.0-RC40-SNAPSHOT</version>
- <inceptionYear>2007</inceptionYear>
- <description>Apache Fortress is a standards-based Identity and Access Management SDK that implements ANSI RBAC
- INCITS 359.
- </description>
- <url>http://directory.apache.org/fortress/</url>
-
- <prerequisites>
- <maven>3.0.3</maven>
- </prerequisites>
-
- <licenses>
- <license>
- <name>Apache License 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
- <scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/directory-fortress-core.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-fortress-core.git
- </developerConnection>
- <tag>HEAD</tag>
- </scm>
-
- <issueManagement>
- <system>jira</system>
- <url>https://issues.apache.org/jira/browse/DIRFORTRESS</url>
- </issueManagement>
-
- <!-- ====================================================== -->
- <!-- The list of current developpers -->
- <!-- ====================================================== -->
- <developers>
- <developer>
- <id>smckinney</id>
- <name>Shawn McKinney</name>
- <email>smckinney@apache.org</email>
- </developer>
-
- <developer>
- <id>elecharny</id>
- <name>Emmanuel Lecharny</name>
- <email>elecharny@apache.org</email>
- </developer>
- </developers>
-
- <!-- ====================================================== -->
- <!-- The used properties for this project -->
- <!-- ====================================================== -->
- <properties>
- <!-- Maven Plugins -->
- <version.maven.antrun.plugin>1.7</version.maven.antrun.plugin>
- <version.maven.apache.rat.plugin>0.11</version.maven.apache.rat.plugin>
- <version.maven.api.plugin>3.2.3</version.maven.api.plugin>
- <version.maven.assembly.plugin>2.4</version.maven.assembly.plugin>
- <version.maven.build.helper.plugin>1.9</version.maven.build.helper.plugin>
- <version.maven.bundle.plugin>2.5.0</version.maven.bundle.plugin>
- <version.maven.changes.plugin>2.10</version.maven.changes.plugin>
- <version.maven.checkstyle.plugin>2.12.1</version.maven.checkstyle.plugin>
- <version.maven.clean.plugin>2.5</version.maven.clean.plugin>
- <version.maven.clirr.plugin>2.6.1</version.maven.clirr.plugin>
- <version.maven.cobertura.plugin>2.6</version.maven.cobertura.plugin>
- <version.maven.compiler.plugin>3.1</version.maven.compiler.plugin>
- <version.maven.dashboard.plugin>1.0.0-beta-1</version.maven.dashboard.plugin>
- <version.maven.dependency.plugin>2.8</version.maven.dependency.plugin>
- <version.maven.deploy.plugin>2.8.1</version.maven.deploy.plugin>
- <version.maven.docck.plugin>1.0</version.maven.docck.plugin>
- <version.maven.eclipse.plugin>2.9</version.maven.eclipse.plugin>
- <version.maven.enforcer.plugin>1.3.1</version.maven.enforcer.plugin>
- <version.maven.findbugs.plugin>2.5.4</version.maven.findbugs.plugin>
- <version.maven.gpg.plugin>1.5</version.maven.gpg.plugin>
- <version.maven.install.plugin>2.5.1</version.maven.install.plugin>
- <version.maven.jar.plugin>2.5</version.maven.jar.plugin>
- <version.maven.javancss.plugin>2.0</version.maven.javancss.plugin>
- <version.maven.javadoc.plugin>2.9.1</version.maven.javadoc.plugin>
- <version.maven.jdepend.plugin>2.0</version.maven.jdepend.plugin>
- <version.maven.jxr.plugin>2.4</version.maven.jxr.plugin>
- <version.maven.model.plugin>3.2.3</version.maven.model.plugin>
- <version.maven.plexus.utils>3.0.18</version.maven.plexus.utils>
- <version.maven.plugin.plugin>3.3</version.maven.plugin.plugin>
- <version.maven.pmd.plugin>3.1</version.maven.pmd.plugin>
- <version.maven.project.plugin>3.0-alpha-2</version.maven.project.plugin>
- <version.maven.project.info.report.plugin>2.7</version.maven.project.info.report.plugin>
- <version.maven.release.plugin>2.5</version.maven.release.plugin>
- <version.maven.remote.resources.plugin>1.5</version.maven.remote.resources.plugin>
- <version.maven.resources.plugin>2.6</version.maven.resources.plugin>
- <version.maven.scm.plugin>1.9</version.maven.scm.plugin>
- <version.maven.site.plugin>3.3</version.maven.site.plugin>
- <version.maven.source.plugin>2.2.1</version.maven.source.plugin>
- <version.maven.shade.plugin>2.3</version.maven.shade.plugin>
- <version.maven.surefire.plugin>2.17</version.maven.surefire.plugin>
-
- <!-- Jars -->
- <version.accelerator.api>1.0-RC40</version.accelerator.api>
- <version.accelerator.impl>1.0-RC40</version.accelerator.impl>
- <version.ant>1.9.4</version.ant>
- <version.ant.launcher>1.9.1</version.ant.launcher>
- <version.antlr>2.7.7</version.antlr>
- <version.apacheds>2.0.0-M18</version.apacheds>
- <version.api.all>1.0.0-M27</version.api.all>
- <version.commons.beanutils>1.7.0</version.commons.beanutils>
- <version.commons.beanutils-core>1.8.0</version.commons.beanutils-core>
- <version.commons.codec>1.2</version.commons.codec>
- <version.commons.collections>3.2.1</version.commons.collections>
- <version.commons.configuration>1.10</version.commons.configuration>
- <version.commons.digester>1.8</version.commons.digester>
- <version.commons.httpclient>3.1</version.commons.httpclient>
- <version.commons.io>2.4</version.commons.io>
- <version.commons.lang>2.6</version.commons.lang>
- <version.commons.logging>1.1.1</version.commons.logging>
- <version.commons.pool>1.6</version.commons.pool>
- <version.cxf.common.utilities>2.5.11</version.cxf.common.utilities>
- <version.dom4j>1.6.1</version.dom4j>
- <version.ehcache.core>2.6.9</version.ehcache.core>
- <version.hamcrest.core>1.3</version.hamcrest.core>
- <version.jasypt>1.9.2</version.jasypt>
- <version.apache.jdbm1>2.0.0-M3</version.apache.jdbm1>
- <version.jgrapht.jdk5>0.7.3</version.jgrapht.jdk5>
- <version.jmeter.core>2.11</version.jmeter.core>
- <version.jmeter.java>2.11</version.jmeter.java>
- <version.jsr311.api>1.1-ea</version.jsr311.api>
- <version.junit>4.11</version.junit>
- <version.log4j>1.2.17</version.log4j>
- <version.mina.core>2.0.8</version.mina.core>
- <version.slf4j.api>1.7.7</version.slf4j.api>
- <version.slf4j.log4j12>1.7.7</version.slf4j.log4j12>
- <version.stax2.api>3.1.1</version.stax2.api>
- <version.opencsv>2.3</version.opencsv>
- <version.woodstox.core.asl>4.2.0</version.woodstox.core.asl>
- <version.xmlschema.core>2.0.3</version.xmlschema.core>
- <version.xpp3>1.1.4c</version.xpp3>
- <version.xml.apis>1.0b2</version.xml.apis>
-
- <!-- ===================================================== -->
- <!-- This is a hack to allow someone to release -->
- <!-- without having to run the tests. In order to -->
- <!-- do so, just tpe : -->
- <!-- mvn release:prepare -->
- <!-- -Drelease.arguments="-DskipTests -Prelease" -->
- <!-- ===================================================== -->
- <release.arguments></release.arguments>
- </properties>
-
- <!-- ====================================================== -->
- <!-- The dependencies for all the projects -->
- <!-- ====================================================== -->
- <dependencyManagement>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.directory</groupId>
+ <artifactId>fortress-core</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Fortress Core</name>
+ <version>1.0-RC40-SNAPSHOT</version>
+ <inceptionYear>2007</inceptionYear>
+ <description>Apache Fortress is a standards-based Identity and Access Management SDK that implements ANSI RBAC
+ INCITS 359.
+ </description>
+ <url>http://directory.apache.org/fortress/</url>
+
+ <prerequisites>
+ <maven>3.0.3</maven>
+ </prerequisites>
+
+ <licenses>
+ <license>
+ <name>Apache License 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/directory-fortress-core.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-fortress-core.git
+ </developerConnection>
+ <tag>HEAD</tag>
+ </scm>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>https://issues.apache.org/jira/browse/DIRFORTRESS</url>
+ </issueManagement>
+
+ <!-- ====================================================== -->
+ <!-- The list of current developpers -->
+ <!-- ====================================================== -->
+ <developers>
+ <developer>
+ <id>smckinney</id>
+ <name>Shawn McKinney</name>
+ <email>smckinney@apache.org</email>
+ </developer>
+
+ <developer>
+ <id>elecharny</id>
+ <name>Emmanuel Lecharny</name>
+ <email>elecharny@apache.org</email>
+ </developer>
+ </developers>
+
+ <!-- ====================================================== -->
+ <!-- The used properties for this project -->
+ <!-- ====================================================== -->
+ <properties>
+ <!-- Maven Plugins -->
+ <version.maven.antrun.plugin>1.7</version.maven.antrun.plugin>
+ <version.maven.apache.rat.plugin>0.11</version.maven.apache.rat.plugin>
+ <version.maven.api.plugin>3.2.3</version.maven.api.plugin>
+ <version.maven.assembly.plugin>2.4</version.maven.assembly.plugin>
+ <version.maven.build.helper.plugin>1.9</version.maven.build.helper.plugin>
+ <version.maven.bundle.plugin>2.5.0</version.maven.bundle.plugin>
+ <version.maven.changes.plugin>2.10</version.maven.changes.plugin>
+ <version.maven.checkstyle.plugin>2.12.1</version.maven.checkstyle.plugin>
+ <version.maven.clean.plugin>2.5</version.maven.clean.plugin>
+ <version.maven.clirr.plugin>2.6.1</version.maven.clirr.plugin>
+ <version.maven.cobertura.plugin>2.6</version.maven.cobertura.plugin>
+ <version.maven.compiler.plugin>3.1</version.maven.compiler.plugin>
+ <version.maven.dashboard.plugin>1.0.0-beta-1</version.maven.dashboard.plugin>
+ <version.maven.dependency.plugin>2.8</version.maven.dependency.plugin>
+ <version.maven.deploy.plugin>2.8.1</version.maven.deploy.plugin>
+ <version.maven.docck.plugin>1.0</version.maven.docck.plugin>
+ <version.maven.eclipse.plugin>2.9</version.maven.eclipse.plugin>
+ <version.maven.enforcer.plugin>1.3.1</version.maven.enforcer.plugin>
+ <version.maven.findbugs.plugin>2.5.4</version.maven.findbugs.plugin>
+ <version.maven.gpg.plugin>1.5</version.maven.gpg.plugin>
+ <version.maven.install.plugin>2.5.1</version.maven.install.plugin>
+ <version.maven.jar.plugin>2.5</version.maven.jar.plugin>
+ <version.maven.javancss.plugin>2.0</version.maven.javancss.plugin>
+ <version.maven.javadoc.plugin>2.9.1</version.maven.javadoc.plugin>
+ <version.maven.jdepend.plugin>2.0</version.maven.jdepend.plugin>
+ <version.maven.jxr.plugin>2.4</version.maven.jxr.plugin>
+ <version.maven.model.plugin>3.2.3</version.maven.model.plugin>
+ <version.maven.plexus.utils>3.0.18</version.maven.plexus.utils>
+ <version.maven.plugin.plugin>3.3</version.maven.plugin.plugin>
+ <version.maven.pmd.plugin>3.1</version.maven.pmd.plugin>
+ <version.maven.project.plugin>3.0-alpha-2</version.maven.project.plugin>
+ <version.maven.project.info.report.plugin>2.7</version.maven.project.info.report.plugin>
+ <version.maven.release.plugin>2.5</version.maven.release.plugin>
+ <version.maven.remote.resources.plugin>1.5</version.maven.remote.resources.plugin>
+ <version.maven.resources.plugin>2.6</version.maven.resources.plugin>
+ <version.maven.scm.plugin>1.9</version.maven.scm.plugin>
+ <version.maven.site.plugin>3.3</version.maven.site.plugin>
+ <version.maven.source.plugin>2.2.1</version.maven.source.plugin>
+ <version.maven.shade.plugin>2.3</version.maven.shade.plugin>
+ <version.maven.surefire.plugin>2.17</version.maven.surefire.plugin>
+
+ <!-- Jars -->
+ <version.accelerator.api>1.0-RC40</version.accelerator.api>
+ <version.accelerator.impl>1.0-RC40</version.accelerator.impl>
+ <version.ant>1.9.4</version.ant>
+ <version.ant.launcher>1.9.1</version.ant.launcher>
+ <version.antlr>2.7.7</version.antlr>
+ <version.apacheds>2.0.0-M18</version.apacheds>
+ <version.api.all>1.0.0-M28</version.api.all>
+ <version.commons.beanutils>1.7.0</version.commons.beanutils>
+ <version.commons.beanutils-core>1.8.0</version.commons.beanutils-core>
+ <version.commons.codec>1.2</version.commons.codec>
+ <version.commons.collections>3.2.1</version.commons.collections>
+ <version.commons.configuration>1.10</version.commons.configuration>
+ <version.commons.digester>1.8</version.commons.digester>
+ <version.commons.httpclient>3.1</version.commons.httpclient>
+ <version.commons.io>2.4</version.commons.io>
+ <version.commons.lang>2.6</version.commons.lang>
+ <version.commons.logging>1.1.1</version.commons.logging>
+ <version.commons.pool>1.6</version.commons.pool>
+ <version.cxf.common.utilities>2.5.11</version.cxf.common.utilities>
+ <version.dom4j>1.6.1</version.dom4j>
+ <version.ehcache.core>2.6.9</version.ehcache.core>
+ <version.hamcrest.core>1.3</version.hamcrest.core>
+ <version.jasypt>1.9.2</version.jasypt>
+ <version.apache.jdbm1>2.0.0-M3</version.apache.jdbm1>
+ <version.jgrapht.jdk5>0.7.3</version.jgrapht.jdk5>
+ <version.jmeter.core>2.11</version.jmeter.core>
+ <version.jmeter.java>2.11</version.jmeter.java>
+ <version.jsr311.api>1.1-ea</version.jsr311.api>
+ <version.junit>4.11</version.junit>
+ <version.log4j>1.2.17</version.log4j>
+ <version.mina.core>2.0.8</version.mina.core>
+ <version.slf4j.api>1.7.7</version.slf4j.api>
+ <version.slf4j.log4j12>1.7.7</version.slf4j.log4j12>
+ <version.stax2.api>3.1.1</version.stax2.api>
+ <version.opencsv>2.3</version.opencsv>
+ <version.woodstox.core.asl>4.2.0</version.woodstox.core.asl>
+ <version.xmlschema.core>2.0.3</version.xmlschema.core>
+ <version.xpp3>1.1.4c</version.xpp3>
+ <version.xml.apis>1.0b2</version.xml.apis>
+
+ <!-- ===================================================== -->
+ <!-- This is a hack to allow someone to release -->
+ <!-- without having to run the tests. In order to -->
+ <!-- do so, just tpe : -->
+ <!-- mvn release:prepare -->
+ <!-- -Drelease.arguments="-DskipTests -Prelease" -->
+ <!-- ===================================================== -->
+ <release.arguments></release.arguments>
+ </properties>
+
+ <!-- ====================================================== -->
+ <!-- The dependencies for all the projects -->
+ <!-- ====================================================== -->
+ <dependencyManagement>
+ <dependencies>
+ <!-- To be defined later -->
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- ====================================================== -->
+ <!-- The dependencies -->
+ <!-- ====================================================== -->
<dependencies>
- <!-- To be defined later -->
+ <dependency>
+ <groupId>org.openldap</groupId>
+ <artifactId>accelerator-api</artifactId>
+ <version>${version.accelerator.api}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.openldap</groupId>
+ <artifactId>accelerator-impl</artifactId>
+ <version>${version.accelerator.impl}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${version.commons.lang}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>${version.commons.configuration}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${version.commons.io}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${version.commons.httpclient}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ <version>${version.ehcache.core}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${version.commons.pool}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-common-utilities</artifactId>
+ <version>${version.cxf.common.utilities}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-all</artifactId>
+ <version>${version.api.all}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${version.ant}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jasypt</groupId>
+ <artifactId>jasypt</artifactId>
+ <version>${version.jasypt}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jgrapht</groupId>
+ <artifactId>jgrapht-jdk1.5</artifactId>
+ <version>${version.jgrapht.jdk5}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${version.slf4j.api}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-annotations</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-api</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-avl</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-constants</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-jndi</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-interceptor-kerberos</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.jdbm</groupId>
+ <artifactId>apacheds-jdbm1</artifactId>
+ <version>${version.apache.jdbm1}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-jdbm-partition</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-kerberos-codec</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-ldif-partition</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-dhcp</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-dns</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-kerberos</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-ldap</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-ntp</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-shared</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-server-annotations</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-server-config</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-server-jndi</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-test-framework</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-xdbm-partition</artifactId>
+ <version>${version.apacheds}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>${version.jsr311.api}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jmeter</groupId>
+ <artifactId>ApacheJMeter_core</artifactId>
+ <version>${version.jmeter.core}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jmeter</groupId>
+ <artifactId>ApacheJMeter_java</artifactId>
+ <version>${version.jmeter.java}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.opencsv</groupId>
+ <artifactId>opencsv</artifactId>
+ <version>${version.opencsv}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- </dependencyManagement>
-
- <!-- ====================================================== -->
- <!-- The dependencies -->
- <!-- ====================================================== -->
- <dependencies>
- <dependency>
- <groupId>org.openldap</groupId>
- <artifactId>accelerator-api</artifactId>
- <version>${version.accelerator.api}</version>
- </dependency>
-
- <dependency>
- <groupId>org.openldap</groupId>
- <artifactId>accelerator-impl</artifactId>
- <version>${version.accelerator.impl}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${version.commons.lang}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>${version.commons.configuration}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${version.commons.io}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>${version.commons.httpclient}</version>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- <version>${version.ehcache.core}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${version.commons.pool}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-common-utilities</artifactId>
- <version>${version.cxf.common.utilities}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-all</artifactId>
- <version>${version.api.all}</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>${version.ant}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jasypt</groupId>
- <artifactId>jasypt</artifactId>
- <version>${version.jasypt}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jgrapht</groupId>
- <artifactId>jgrapht-jdk1.5</artifactId>
- <version>${version.jgrapht.jdk5}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${version.slf4j.api}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core-annotations</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core-api</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core-avl</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core-constants</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core-jndi</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-interceptor-kerberos</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.jdbm</groupId>
- <artifactId>apacheds-jdbm1</artifactId>
- <version>${version.apache.jdbm1}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-jdbm-partition</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-kerberos-codec</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-ldif-partition</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-dhcp</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-dns</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-kerberos</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-ldap</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-ntp</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-protocol-shared</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-server-annotations</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-server-config</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-server-jndi</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-test-framework</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-xdbm-partition</artifactId>
- <version>${version.apacheds}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>${version.jsr311.api}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.jmeter</groupId>
- <artifactId>ApacheJMeter_core</artifactId>
- <version>${version.jmeter.core}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.jmeter</groupId>
- <artifactId>ApacheJMeter_java</artifactId>
- <version>${version.jmeter.java}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>net.sf.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- <version>${version.opencsv}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>${version.maven.clean.plugin}</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>${version.maven.deploy.plugin}</version>
- <inherited>true</inherited>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>${version.maven.install.plugin}</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${version.maven.jar.plugin}</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>${version.maven.site.plugin}</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${version.maven.surefire.plugin}</version>
- <configuration>
- <argLine>-Xmx1024m</argLine>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>${version.maven.release.plugin}</version>
- <configuration>
- <arguments>${release.arguments}</arguments>
- <tagNameFormat>@{project.version}</tagNameFormat>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${version.maven.compiler.plugin}</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- <optimize>true</optimize>
- <encoding>ISO-8859-1</encoding>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${version.maven.apache.rat.plugin}</version>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
- <!-- MAVEN_DEFAULT_EXCLUDES -->
- <exclude>**/target/**/*</exclude>
- <exclude>**/cobertura.ser</exclude>
- <!-- ECLIPSE_DEFAULT_EXCLUDES -->
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**/*</exclude>
- <!-- IDEA_DEFAULT_EXCLUDES -->
- <exclude>**/*.iml</exclude>
- <exclude>**/*.ipr</exclude>
- <exclude>**/*.iws</exclude>
- <!-- MANIFEST_MF_EXCLUDES -->
- <exclude>**/MANIFEST.MF</exclude>
- <!-- GIT_EXCLUDES -->
- <exclude>**/.git/**/*</exclude>
- <!-- CERT_EXCLUDES -->
- <exclude>**/*.pem</exclude>
- <!-- EXTERNAL_CODE_EXCLUDES -->
- <exclude>**/CmdLineParser.java</exclude>
- <!-- LICENSE_EXCLUDES -->
- <exclude>**/lib/LICENSE*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <resources>
- <resource>
- <directory>config</directory>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>${version.maven.source.plugin}</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>${version.maven.resources.plugin}</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <!-- here the phase you need -->
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/config</outputDirectory>
- <resources>
- <resource>
- <directory>config</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>${version.maven.antrun.plugin}</version>
- <executions>
- <execution>
- <id>initialize-fortress-config</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="${basedir}/build.xml"
- target="init-fortress-config"/>
- </tasks>
- </configuration>
- </execution>
-
- <execution>
- <phase>test</phase>
- <configuration>
- <target name="fortress-load"
- if="load.file"
- description="Loads fortress policy into ldap">
- <echo message="############### Run Fortress Ant script to load policy ###############"/>
- <java
- classname="org.apache.tools.ant.launch.Launcher"
- fork="true"
- failonerror="true"
- dir="${basedir}"
- timeout="4000000"
- taskname="startAnt">
- <classpath>
- <pathelement location="./config/bootstrap"/>
- <pathelement location="./target/classes/"/>
- <pathelement location="${org.apache.ant:ant-launcher:jar}"/>
- <pathelement location="${org.apache.ant:ant:jar}"/>
- <pathelement location="${org.openldap:accelerator-api:jar}"/>
- <pathelement location="${org.openldap:accelerator-impl:jar}"/>
- <pathelement location="${log4j:log4j:jar}"/>
- <pathelement location="${org.apache.directory.api:api-all:jar}"/>
- <pathelement location="${org.apache.mina:mina-core:jar}"/>
- <pathelement location="${org.jgrapht:jgrapht-jdk1.5:jar}"/>
- <pathelement location="${org.jasypt:jasypt:jar}"/>
- <pathelement location="${commons-configuration:commons-configuration:jar}"/>
- <pathelement location="${commons-lang:commons-lang:jar}"/>
- <pathelement location="${commons-collections:commons-collections:jar}"/>
- <pathelement location="${commons-logging:commons-logging:jar}"/>
- <pathelement location="${commons-io:commons-io:jar}"/>
- <pathelement location="${commons-pool:commons-pool:jar}"/>
- <pathelement location="${net.sf.ehcache:ehcache-core:jar}"/>
- <pathelement location="${org.slf4j:slf4j-api:jar}"/>
- <pathelement location="${org.slf4j:slf4j-log4j12:jar}"/>
- <pathelement location="${antlr:antlr:jar}"/>
- </classpath>
- <sysproperty key="version" value="${project.version}"/>
- <sysproperty key="tenant" value="HOME"/>
- <arg value="-buildfile"/>
- <arg file="./${load.file}"/>
- </java>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
-
- <testResources>
- <testResource>
- <directory>${project.basedir}/config</directory>
- </testResource>
- </testResources>
- </build>
-
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>${version.maven.clean.plugin}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>${version.maven.deploy.plugin}</version>
+ <inherited>true</inherited>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>${version.maven.install.plugin}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${version.maven.jar.plugin}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>${version.maven.site.plugin}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${version.maven.surefire.plugin}</version>
+ <configuration>
+ <argLine>-Xmx1024m</argLine>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>${version.maven.release.plugin}</version>
+ <configuration>
+ <arguments>${release.arguments}</arguments>
+ <tagNameFormat>@{project.version}</tagNameFormat>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${version.maven.compiler.plugin}</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ <optimize>true</optimize>
+ <encoding>ISO-8859-1</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${version.maven.apache.rat.plugin}</version>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- GIT_EXCLUDES -->
+ <exclude>**/.git/**/*</exclude>
+ <!-- CERT_EXCLUDES -->
+ <exclude>**/*.pem</exclude>
+ <!-- EXTERNAL_CODE_EXCLUDES -->
+ <exclude>**/CmdLineParser.java</exclude>
+ <!-- LICENSE_EXCLUDES -->
+ <exclude>**/lib/LICENSE*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <resources>
+ <resource>
+ <directory>config</directory>
+ </resource>
+ </resources>
+
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>${version.maven.assembly.plugin}</version>
- <executions>
- <execution>
- <id>source-release-assembly</id>
- <configuration>
- <!-- we have a dedicated distribution module -->
- <skipAssembly>true</skipAssembly>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>${version.maven.apache.rat.plugin}</version>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${version.maven.source.plugin}</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${version.maven.resources.plugin}</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <!-- here the phase you need -->
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/config</outputDirectory>
+ <resources>
+ <resource>
+ <directory>config</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${version.maven.antrun.plugin}</version>
+ <executions>
+ <execution>
+ <id>initialize-fortress-config</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ant antfile="${basedir}/build.xml"
+ target="init-fortress-config"/>
+ </tasks>
+ </configuration>
+ </execution>
+
+ <execution>
+ <phase>test</phase>
+ <configuration>
+ <target name="fortress-load"
+ if="load.file"
+ description="Loads fortress policy into ldap">
+ <echo message="############### Run Fortress Ant script to load policy ###############"/>
+ <java
+ classname="org.apache.tools.ant.launch.Launcher"
+ fork="true"
+ failonerror="true"
+ dir="${basedir}"
+ timeout="4000000"
+ taskname="startAnt">
+ <classpath>
+ <pathelement location="./config/bootstrap"/>
+ <pathelement location="./target/classes/"/>
+ <pathelement location="${org.apache.ant:ant-launcher:jar}"/>
+ <pathelement location="${org.apache.ant:ant:jar}"/>
+ <pathelement location="${org.openldap:accelerator-api:jar}"/>
+ <pathelement location="${org.openldap:accelerator-impl:jar}"/>
+ <pathelement location="${log4j:log4j:jar}"/>
+ <pathelement location="${org.apache.directory.api:api-all:jar}"/>
+ <pathelement location="${org.apache.mina:mina-core:jar}"/>
+ <pathelement location="${org.jgrapht:jgrapht-jdk1.5:jar}"/>
+ <pathelement location="${org.jasypt:jasypt:jar}"/>
+ <pathelement location="${commons-configuration:commons-configuration:jar}"/>
+ <pathelement location="${commons-lang:commons-lang:jar}"/>
+ <pathelement location="${commons-collections:commons-collections:jar}"/>
+ <pathelement location="${commons-logging:commons-logging:jar}"/>
+ <pathelement location="${commons-io:commons-io:jar}"/>
+ <pathelement location="${commons-pool:commons-pool:jar}"/>
+ <pathelement location="${net.sf.ehcache:ehcache-core:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-api:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-log4j12:jar}"/>
+ <pathelement location="${antlr:antlr:jar}"/>
+ </classpath>
+ <sysproperty key="version" value="${project.version}"/>
+ <sysproperty key="tenant" value="HOME"/>
+ <arg value="-buildfile"/>
+ <arg file="./${load.file}"/>
+ </java>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
- </build>
- </profile>
- </profiles>
+
+ <testResources>
+ <testResource>
+ <directory>${project.basedir}/config</directory>
+ </testResource>
+ </testResources>
+ </build>
+
+ <profiles>
+
+ <!--
+ To execute: ./m.sh -Ploadtest-accel jmeter:jmeter
+ -->
+ <profile>
+ <id>loadtest-accel</id>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>com.lazerycode.jmeter</groupId>
+ <artifactId>jmeter-maven-plugin</artifactId>
+ <version>1.10.0</version>
+ <configuration>
+ <overrideRootLogLevel>DEBUG</overrideRootLogLevel>
+ <suppressJMeterOutput>false</suppressJMeterOutput>
+ <testFilesIncluded>
+ <jMeterTestFile>acCheckAccess.jmx</jMeterTestFile>
+ </testFilesIncluded>
+ </configuration>
+ <executions>
+ <execution>
+ <id>jmeter-tests</id>
+ <goals>
+ <goal>jmeter</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ To execute: ./m.sh -Ploadtest-fortress jmeter:jmeter
+ -->
+ <profile>
+ <id>loadtest-fortress</id>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>com.lazerycode.jmeter</groupId>
+ <artifactId>jmeter-maven-plugin</artifactId>
+ <version>1.10.0</version>
+ <configuration>
+ <overrideRootLogLevel>DEBUG</overrideRootLogLevel>
+ <suppressJMeterOutput>false</suppressJMeterOutput>
+ <testFilesIncluded>
+ <jMeterTestFile>ftCheckAccess.jmx</jMeterTestFile>
+ </testFilesIncluded>
+ </configuration>
+ <executions>
+ <execution>
+ <id>jmeter-tests</id>
+ <goals>
+ <goal>jmeter</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>${version.maven.assembly.plugin}</version>
+ <executions>
+ <execution>
+ <id>source-release-assembly</id>
+ <configuration>
+ <!-- we have a dedicated distribution module -->
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${version.maven.apache.rat.plugin}</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3c488343/src/test/jmeter/acCheckAccess.jmx
----------------------------------------------------------------------
diff --git a/src/test/jmeter/acCheckAccess.jmx b/src/test/jmeter/acCheckAccess.jmx
new file mode 100644
index 0000000..0504ed5
--- /dev/null
+++ b/src/test/jmeter/acCheckAccess.jmx
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jmeterTestPlan version="1.2" properties="2.6" jmeter="2.11 r1554548">
+ <hashTree>
+ <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="RbacLoadTester" enabled="true">
+ <stringProp name="TestPlan.comments"></stringProp>
+ <boolProp name="TestPlan.functional_mode">false</boolProp>
+ <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+ <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+ <collectionProp name="Arguments.arguments"/>
+ </elementProp>
+ <stringProp name="TestPlan.user_define_classpath">../../../config,../../../dist,../../../lib</stringProp>
+ </TestPlan>
+ <hashTree>
+ <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="false">
+ <stringProp name="delimiter">,</stringProp>
+ <stringProp name="fileEncoding"></stringProp>
+ <stringProp name="filename">RbacAccess.csv</stringProp>
+ <boolProp name="quotedData">false</boolProp>
+ <boolProp name="recycle">true</boolProp>
+ <stringProp name="shareMode">shareMode.all</stringProp>
+ <boolProp name="stopThread">false</boolProp>
+ <stringProp name="variableNames"></stringProp>
+ </CSVDataSet>
+ <hashTree/>
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Accelerator CheckAccess" enabled="true">
+ <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+ <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+ <boolProp name="LoopController.continue_forever">false</boolProp>
+
+ <stringProp name="LoopController.loops">50000</stringProp>
+ </elementProp>
+ <stringProp name="ThreadGroup.num_threads">25</stringProp>
+ <stringProp name="ThreadGroup.ramp_time">5</stringProp>
+
+ <!--stringProp name="LoopController.loops">50000</stringProp>
+ </elementProp>
+ <stringProp name="ThreadGroup.num_threads">20</stringProp>
+ <stringProp name="ThreadGroup.ramp_time">5</stringProp-->
+
+ <!--longProp name="ThreadGroup.start_time">1397479644000</longProp>
+ <longProp name="ThreadGroup.end_time">1397479644000</longProp-->
+ <boolProp name="ThreadGroup.scheduler">false</boolProp>
+ <stringProp name="ThreadGroup.duration"></stringProp>
+ <stringProp name="ThreadGroup.delay"></stringProp>
+ </ThreadGroup>
+ <hashTree>
+ <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Accelerator CheckAccess" enabled="true">
+ <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+ <collectionProp name="Arguments.arguments">
+ <elementProp name="type" elementType="Argument">
+ <stringProp name="Argument.name">type</stringProp>
+ <stringProp name="Argument.value">1</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ </collectionProp>
+ </elementProp>
+ <stringProp name="classname">org.apache.directory.fortress.core.jmeter.CheckAccess</stringProp>
+ </JavaSampler>
+ <hashTree/>
+ <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
+ <boolProp name="ResultCollector.error_logging">false</boolProp>
+ <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>true</time>
+ <latency>true</latency>
+ <timestamp>true</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>false</samplerData>
+ <xml>true</xml>
+ <fieldNames>false</fieldNames>
+ <responseHeaders>false</responseHeaders>
+ <requestHeaders>false</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+ <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <bytes>true</bytes>
+ </value>
+ </objProp>
+ <stringProp name="filename"></stringProp>
+ </ResultCollector>
+ <hashTree/>
+ </hashTree>
+ </hashTree>
+ </hashTree>
+</jmeterTestPlan>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3c488343/src/test/jmeter/ftCheckAccess.jmx
----------------------------------------------------------------------
diff --git a/src/test/jmeter/ftCheckAccess.jmx b/src/test/jmeter/ftCheckAccess.jmx
new file mode 100644
index 0000000..9109e9c
--- /dev/null
+++ b/src/test/jmeter/ftCheckAccess.jmx
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jmeterTestPlan version="1.2" properties="2.6" jmeter="2.11 r1554548">
+ <hashTree>
+ <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="RbacLoadTester" enabled="true">
+ <stringProp name="TestPlan.comments"></stringProp>
+ <boolProp name="TestPlan.functional_mode">false</boolProp>
+ <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+ <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+ <collectionProp name="Arguments.arguments"/>
+ </elementProp>
+ <stringProp name="TestPlan.user_define_classpath">../../../config,../../../dist,../../../lib</stringProp>
+ </TestPlan>
+ <hashTree>
+ <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data Set Config" enabled="false">
+ <stringProp name="delimiter">,</stringProp>
+ <stringProp name="fileEncoding"></stringProp>
+ <stringProp name="filename">RbacAccess.csv</stringProp>
+ <boolProp name="quotedData">false</boolProp>
+ <boolProp name="recycle">true</boolProp>
+ <stringProp name="shareMode">shareMode.all</stringProp>
+ <boolProp name="stopThread">false</boolProp>
+ <stringProp name="variableNames"></stringProp>
+ </CSVDataSet>
+ <hashTree/>
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Fortress CheckAccess" enabled="true">
+ <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+ <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+ <boolProp name="LoopController.continue_forever">false</boolProp>
+
+ <stringProp name="LoopController.loops">50000</stringProp>
+ </elementProp>
+ <stringProp name="ThreadGroup.num_threads">25</stringProp>
+ <stringProp name="ThreadGroup.ramp_time">5</stringProp>
+
+ <!--stringProp name="LoopController.loops">50000</stringProp>
+ </elementProp>
+ <stringProp name="ThreadGroup.num_threads">20</stringProp>
+ <stringProp name="ThreadGroup.ramp_time">5</stringProp-->
+
+ <!--longProp name="ThreadGroup.start_time">1397479644000</longProp>
+ <longProp name="ThreadGroup.end_time">1397479644000</longProp-->
+ <boolProp name="ThreadGroup.scheduler">false</boolProp>
+ <stringProp name="ThreadGroup.duration"></stringProp>
+ <stringProp name="ThreadGroup.delay"></stringProp>
+ </ThreadGroup>
+ <hashTree>
+ <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" testname="Fortress CheckAccess" enabled="true">
+ <elementProp name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" enabled="true">
+ <collectionProp name="Arguments.arguments">
+ <elementProp name="type" elementType="Argument">
+ <stringProp name="Argument.name">type</stringProp>
+ <stringProp name="Argument.value">2</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ </collectionProp>
+ </elementProp>
+ <stringProp name="classname">org.apache.directory.fortress.core.jmeter.CheckAccess</stringProp>
+ </JavaSampler>
+ <hashTree/>
+ <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report" enabled="true">
+ <boolProp name="ResultCollector.error_logging">false</boolProp>
+ <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>true</time>
+ <latency>true</latency>
+ <timestamp>true</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>false</samplerData>
+ <xml>true</xml>
+ <fieldNames>false</fieldNames>
+ <responseHeaders>false</responseHeaders>
+ <requestHeaders>false</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+ <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <bytes>true</bytes>
+ </value>
+ </objProp>
+ <stringProp name="filename"></stringProp>
+ </ResultCollector>
+ <hashTree/>
+ </hashTree>
+ </hashTree>
+ </hashTree>
+</jmeterTestPlan>
\ No newline at end of file
[07/23] directory-fortress-core git commit: change javadoc @author
tag to dev
Posted by sm...@apache.org.
change javadoc @author tag to dev
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/9d9649b6
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/9d9649b6
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/9d9649b6
Branch: refs/heads/master
Commit: 9d9649b607d1b3466e598091d169cb2f6ebb64fb
Parents: 8c5a6c6
Author: Shawn McKinney <sm...@apache.org>
Authored: Sun Dec 21 18:51:14 2014 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sun Dec 21 18:51:14 2014 -0600
----------------------------------------------------------------------
src/main/java/org/apache/directory/fortress/core/AccelMgr.java | 2 +-
.../java/org/apache/directory/fortress/core/AccelMgrFactory.java | 2 +-
src/main/java/org/apache/directory/fortress/core/AccessMgr.java | 2 +-
.../org/apache/directory/fortress/core/AccessMgrFactory.java | 2 +-
src/main/java/org/apache/directory/fortress/core/AdminMgr.java | 2 +-
.../java/org/apache/directory/fortress/core/AdminMgrFactory.java | 2 +-
src/main/java/org/apache/directory/fortress/core/AuditMgr.java | 2 +-
.../java/org/apache/directory/fortress/core/AuditMgrFactory.java | 2 +-
.../apache/directory/fortress/core/AuthorizationException.java | 2 +-
.../java/org/apache/directory/fortress/core/BaseException.java | 2 +-
.../org/apache/directory/fortress/core/BaseRuntimeException.java | 2 +-
.../java/org/apache/directory/fortress/core/CfgException.java | 2 +-
.../org/apache/directory/fortress/core/CfgRuntimeException.java | 2 +-
.../java/org/apache/directory/fortress/core/CreateException.java | 2 +-
.../java/org/apache/directory/fortress/core/DelAccessMgr.java | 2 +-
.../org/apache/directory/fortress/core/DelAccessMgrFactory.java | 2 +-
.../java/org/apache/directory/fortress/core/DelAdminMgr.java | 2 +-
.../org/apache/directory/fortress/core/DelAdminMgrFactory.java | 2 +-
.../java/org/apache/directory/fortress/core/DelReviewMgr.java | 2 +-
.../org/apache/directory/fortress/core/DelReviewMgrFactory.java | 2 +-
.../java/org/apache/directory/fortress/core/FinderException.java | 2 +-
.../java/org/apache/directory/fortress/core/GlobalErrIds.java | 2 +-
src/main/java/org/apache/directory/fortress/core/GlobalIds.java | 2 +-
src/main/java/org/apache/directory/fortress/core/Manageable.java | 2 +-
.../java/org/apache/directory/fortress/core/ObjectFactory.java | 2 +-
.../org/apache/directory/fortress/core/PasswordException.java | 2 +-
.../java/org/apache/directory/fortress/core/PwPolicyMgr.java | 2 +-
.../org/apache/directory/fortress/core/PwPolicyMgrFactory.java | 2 +-
.../java/org/apache/directory/fortress/core/RemoveException.java | 2 +-
.../java/org/apache/directory/fortress/core/RestException.java | 2 +-
src/main/java/org/apache/directory/fortress/core/ReviewMgr.java | 2 +-
.../org/apache/directory/fortress/core/ReviewMgrFactory.java | 2 +-
.../org/apache/directory/fortress/core/SecurityException.java | 2 +-
.../org/apache/directory/fortress/core/StandardException.java | 2 +-
.../java/org/apache/directory/fortress/core/UpdateException.java | 2 +-
.../org/apache/directory/fortress/core/ValidationException.java | 2 +-
.../org/apache/directory/fortress/core/ant/Addadminrole.java | 2 +-
.../directory/fortress/core/ant/Addadminroleinheritance.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Addconfig.java | 2 +-
.../org/apache/directory/fortress/core/ant/Addcontainer.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Addcontext.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Addgroup.java | 2 +-
.../org/apache/directory/fortress/core/ant/Addgroupmember.java | 2 +-
.../org/apache/directory/fortress/core/ant/Addgroupproperty.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Addorgunit.java | 2 +-
.../org/apache/directory/fortress/core/ant/AddpermGrant.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/AddpermObj.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/AddpermOp.java | 2 +-
.../directory/fortress/core/ant/Addpermorgunitinheritance.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Addpwpolicy.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Addrole.java | 2 +-
.../apache/directory/fortress/core/ant/Addroleinheritance.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Addsdset.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Addsuffix.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Adduser.java | 2 +-
.../org/apache/directory/fortress/core/ant/Adduseradminrole.java | 2 +-
.../directory/fortress/core/ant/Adduserorgunitinheritance.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Adduserrole.java | 2 +-
.../org/apache/directory/fortress/core/ant/AdminRoleAnt.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/ConfigAnt.java | 2 +-
.../org/apache/directory/fortress/core/ant/Deladminrole.java | 2 +-
.../directory/fortress/core/ant/Deladminroleinheritance.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Delconfig.java | 2 +-
.../org/apache/directory/fortress/core/ant/Delcontainer.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Delgroup.java | 2 +-
.../org/apache/directory/fortress/core/ant/Delgroupmember.java | 2 +-
.../org/apache/directory/fortress/core/ant/Delgroupproperty.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Delorgunit.java | 2 +-
.../org/apache/directory/fortress/core/ant/DelpermGrant.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/DelpermObj.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/DelpermOp.java | 2 +-
.../directory/fortress/core/ant/Delpermorgunitinheritance.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Delpwpolicy.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Delrole.java | 2 +-
.../apache/directory/fortress/core/ant/Delroleinheritance.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Delsdset.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Delsuffix.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Deluser.java | 2 +-
.../org/apache/directory/fortress/core/ant/Deluseradminrole.java | 2 +-
.../directory/fortress/core/ant/Deluserorgunitinheritance.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/Deluserrole.java | 2 +-
.../org/apache/directory/fortress/core/ant/FortressAntTask.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/PermAnt.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/SDSetAnt.java | 2 +-
.../java/org/apache/directory/fortress/core/ant/UserAnt.java | 2 +-
src/main/java/org/apache/directory/fortress/core/cfg/Config.java | 2 +-
.../java/org/apache/directory/fortress/core/cfg/ConfigDAO.java | 2 +-
.../java/org/apache/directory/fortress/core/cfg/ConfigMgr.java | 2 +-
.../org/apache/directory/fortress/core/cfg/ConfigMgrFactory.java | 2 +-
.../org/apache/directory/fortress/core/cfg/ConfigMgrImpl.java | 2 +-
.../java/org/apache/directory/fortress/core/cfg/ConfigP.java | 2 +-
.../directory/fortress/core/cli/CommandLineInterpreter.java | 2 +-
.../java/org/apache/directory/fortress/core/cli/Options.java | 2 +-
.../directory/fortress/core/ldap/ApacheDsDataProvider.java | 2 +-
.../fortress/core/ldap/LdapClientTrustStoreManager.java | 2 +-
.../fortress/core/ldap/container/OrganizatiionalUnitDAO.java | 2 +-
.../fortress/core/ldap/container/OrganizationalUnit.java | 2 +-
.../fortress/core/ldap/container/OrganizationalUnitP.java | 2 +-
.../org/apache/directory/fortress/core/ldap/group/GroupDAO.java | 2 +-
.../org/apache/directory/fortress/core/ldap/group/GroupMgr.java | 2 +-
.../directory/fortress/core/ldap/group/GroupMgrFactory.java | 2 +-
.../apache/directory/fortress/core/ldap/group/GroupMgrImpl.java | 2 +-
.../org/apache/directory/fortress/core/ldap/group/GroupP.java | 2 +-
.../apache/directory/fortress/core/ldap/suffix/SuffixDAO.java | 2 +-
.../org/apache/directory/fortress/core/ldap/suffix/SuffixP.java | 2 +-
.../org/apache/directory/fortress/core/rbac/AccelMgrImpl.java | 2 +-
.../org/apache/directory/fortress/core/rbac/AcceleratorDAO.java | 2 +-
.../org/apache/directory/fortress/core/rbac/AccessMgrImpl.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/Address.java | 2 +-
.../org/apache/directory/fortress/core/rbac/AdminMgrImpl.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/AdminRole.java | 2 +-
.../org/apache/directory/fortress/core/rbac/AdminRoleDAO.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/AdminRoleP.java | 2 +-
.../directory/fortress/core/rbac/AdminRoleRelationship.java | 2 +-
.../org/apache/directory/fortress/core/rbac/AdminRoleUtil.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/AdminUtil.java | 2 +-
.../org/apache/directory/fortress/core/rbac/Administrator.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/AuditDAO.java | 2 +-
.../org/apache/directory/fortress/core/rbac/AuditMgrImpl.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/AuditP.java | 2 +-
src/main/java/org/apache/directory/fortress/core/rbac/AuthZ.java | 2 +-
src/main/java/org/apache/directory/fortress/core/rbac/Bind.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/ClassUtil.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/Context.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/DSDChecker.java | 2 +-
.../apache/directory/fortress/core/rbac/DelAccessMgrImpl.java | 2 +-
.../org/apache/directory/fortress/core/rbac/DelAdminMgrImpl.java | 2 +-
.../apache/directory/fortress/core/rbac/DelReviewMgrImpl.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/FortEntity.java | 2 +-
.../org/apache/directory/fortress/core/rbac/GlobalPwMsgIds.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/Graphable.java | 2 +-
src/main/java/org/apache/directory/fortress/core/rbac/Hier.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/HierUtil.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/Manageable.java | 2 +-
src/main/java/org/apache/directory/fortress/core/rbac/Mod.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/OrgUnit.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/OrgUnitAnt.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/OrgUnitDAO.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/OrgUnitP.java | 2 +-
.../apache/directory/fortress/core/rbac/OrgUnitRelationship.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/PermDAO.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/PermGrant.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/PermObj.java | 2 +-
src/main/java/org/apache/directory/fortress/core/rbac/PermP.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/Permission.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/PolicyDAO.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/PolicyP.java | 2 +-
src/main/java/org/apache/directory/fortress/core/rbac/Props.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/PsoUtil.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/PwMessage.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/PwPolicy.java | 2 +-
.../org/apache/directory/fortress/core/rbac/PwPolicyControl.java | 2 +-
.../org/apache/directory/fortress/core/rbac/PwPolicyMgrImpl.java | 2 +-
.../org/apache/directory/fortress/core/rbac/Relationship.java | 2 +-
.../org/apache/directory/fortress/core/rbac/ReviewMgrImpl.java | 2 +-
src/main/java/org/apache/directory/fortress/core/rbac/Role.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/RolePerm.java | 2 +-
.../apache/directory/fortress/core/rbac/RoleRelationship.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/RoleUtil.java | 2 +-
src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/SDUtil.java | 2 +-
src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java | 2 +-
src/main/java/org/apache/directory/fortress/core/rbac/SdP.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/Session.java | 2 +-
src/main/java/org/apache/directory/fortress/core/rbac/User.java | 2 +-
.../org/apache/directory/fortress/core/rbac/UserAdminRole.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/UserAudit.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/UserDAO.java | 2 +-
src/main/java/org/apache/directory/fortress/core/rbac/UserP.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/UserRole.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/UsoUtil.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/Warning.java | 4 ++--
.../apache/directory/fortress/core/rest/AccessMgrRestImpl.java | 2 +-
.../apache/directory/fortress/core/rest/AdminMgrRestImpl.java | 2 +-
.../apache/directory/fortress/core/rest/AuditMgrRestImpl.java | 2 +-
.../apache/directory/fortress/core/rest/CachedJaxbContext.java | 2 +-
.../apache/directory/fortress/core/rest/ConfigMgrRestImpl.java | 2 +-
.../directory/fortress/core/rest/DelAccessMgrRestImpl.java | 2 +-
.../apache/directory/fortress/core/rest/DelAdminMgrRestImpl.java | 2 +-
.../directory/fortress/core/rest/DelReviewMgrRestImpl.java | 2 +-
.../org/apache/directory/fortress/core/rest/FortRequest.java | 2 +-
.../org/apache/directory/fortress/core/rest/FortResponse.java | 2 +-
.../java/org/apache/directory/fortress/core/rest/HttpIds.java | 2 +-
.../org/apache/directory/fortress/core/rest/JAXBCachedEntry.java | 2 +-
.../apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java | 2 +-
.../java/org/apache/directory/fortress/core/rest/RestUtils.java | 2 +-
.../apache/directory/fortress/core/rest/ReviewMgrRestImpl.java | 2 +-
.../java/org/apache/directory/fortress/core/util/LogUtil.java | 2 +-
.../java/org/apache/directory/fortress/core/util/Testable.java | 2 +-
.../org/apache/directory/fortress/core/util/attr/AttrHelper.java | 2 +-
.../org/apache/directory/fortress/core/util/cache/Cache.java | 2 +-
.../directory/fortress/core/util/cache/CacheException.java | 2 +-
.../apache/directory/fortress/core/util/cache/CacheFactory.java | 2 +-
.../org/apache/directory/fortress/core/util/cache/CacheMgr.java | 2 +-
.../apache/directory/fortress/core/util/cache/DsdCacheEntry.java | 2 +-
.../apache/directory/fortress/core/util/cache/EhCacheImpl.java | 2 +-
.../apache/directory/fortress/core/util/crypto/EncryptUtil.java | 2 +-
.../java/org/apache/directory/fortress/core/util/time/CUtil.java | 2 +-
.../org/apache/directory/fortress/core/util/time/ClockTime.java | 2 +-
.../org/apache/directory/fortress/core/util/time/Constraint.java | 2 +-
.../java/org/apache/directory/fortress/core/util/time/Date.java | 2 +-
.../java/org/apache/directory/fortress/core/util/time/Day.java | 2 +-
.../org/apache/directory/fortress/core/util/time/LockDate.java | 2 +-
.../java/org/apache/directory/fortress/core/util/time/TUtil.java | 2 +-
.../java/org/apache/directory/fortress/core/util/time/Time.java | 2 +-
.../org/apache/directory/fortress/core/util/time/Timeout.java | 2 +-
.../org/apache/directory/fortress/core/util/time/Validator.java | 2 +-
.../org/apache/directory/fortress/core/AccessMgrConsole.java | 2 +-
.../java/org/apache/directory/fortress/core/AdminMgrConsole.java | 2 +-
.../org/apache/directory/fortress/core/ConfigMgrConsole.java | 2 +-
.../apache/directory/fortress/core/DelegatedAdminMgrConsole.java | 2 +-
.../directory/fortress/core/DelegatedReviewMgrConsole.java | 2 +-
.../java/org/apache/directory/fortress/core/GroupMgrConsole.java | 2 +-
.../org/apache/directory/fortress/core/ProcessMenuCommand.java | 2 +-
src/test/java/org/apache/directory/fortress/core/ReaderUtil.java | 2 +-
.../org/apache/directory/fortress/core/ReviewMgrConsole.java | 2 +-
.../apache/directory/fortress/core/example/ExampleAdminMgr.java | 2 +-
.../directory/fortress/core/example/ExampleAdminMgrFactory.java | 2 +-
.../directory/fortress/core/example/ExampleAdminMgrImpl.java | 2 +-
.../org/apache/directory/fortress/core/group/GroupAntTest.java | 2 +-
.../directory/fortress/core/jmeter/AccelCreateSession.java | 2 +-
.../org/apache/directory/fortress/core/jmeter/CheckAccess.java | 2 +-
.../directory/fortress/core/jmeter/FortressCreateSession.java | 2 +-
.../apache/directory/fortress/core/rbac/AccelMgrImplTest.java | 2 +-
.../apache/directory/fortress/core/rbac/AccessMgrImplTest.java | 2 +-
.../apache/directory/fortress/core/rbac/AdminMgrImplTest.java | 2 +-
.../apache/directory/fortress/core/rbac/AdminRoleTestData.java | 2 +-
.../apache/directory/fortress/core/rbac/AuditMgrImplTest.java | 2 +-
.../directory/fortress/core/rbac/DelegatedMgrImplTest.java | 2 +-
.../apache/directory/fortress/core/rbac/FortressAntLoadTest.java | 2 +-
.../apache/directory/fortress/core/rbac/FortressJUnitTest.java | 2 +-
.../org/apache/directory/fortress/core/rbac/OrgUnitTestData.java | 2 +-
.../org/apache/directory/fortress/core/rbac/PRATestData.java | 2 +-
.../org/apache/directory/fortress/core/rbac/PermTestData.java | 2 +-
.../org/apache/directory/fortress/core/rbac/PolicyTestData.java | 2 +-
.../directory/fortress/core/rbac/PswdPolicyMgrImplTest.java | 2 +-
.../apache/directory/fortress/core/rbac/ReviewMgrImplTest.java | 2 +-
.../org/apache/directory/fortress/core/rbac/RoleTestData.java | 2 +-
.../java/org/apache/directory/fortress/core/rbac/TestUtils.java | 2 +-
.../org/apache/directory/fortress/core/rbac/URATestData.java | 2 +-
.../org/apache/directory/fortress/core/rbac/UserTestData.java | 2 +-
.../apache/directory/fortress/core/samples/AccessMgrSample.java | 2 +-
.../directory/fortress/core/samples/AllSamplesJUnitTest.java | 2 +-
.../fortress/core/samples/CreatePermOrgHierarchySample.java | 2 +-
.../directory/fortress/core/samples/CreatePermOrgSample.java | 2 +-
.../apache/directory/fortress/core/samples/CreatePermSample.java | 2 +-
.../fortress/core/samples/CreateRoleHierarchySample.java | 2 +-
.../apache/directory/fortress/core/samples/CreateRoleSample.java | 2 +-
.../directory/fortress/core/samples/CreateSessionSample.java | 2 +-
.../fortress/core/samples/CreateUserOrgHierarchySample.java | 2 +-
.../directory/fortress/core/samples/CreateUserOrgSample.java | 2 +-
.../directory/fortress/core/samples/CreateUserRoleSample.java | 2 +-
.../apache/directory/fortress/core/samples/CreateUserSample.java | 2 +-
253 files changed, 254 insertions(+), 254 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/AccelMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AccelMgr.java b/src/main/java/org/apache/directory/fortress/core/AccelMgr.java
index 0b66270..53ee8a3 100644
--- a/src/main/java/org/apache/directory/fortress/core/AccelMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccelMgr.java
@@ -59,7 +59,7 @@ import org.apache.directory.fortress.core.rbac.UserRole;
* <hr>
* <p/>
* This interface's implementer will NOT be thread safe if parent instance variables ({@link Manageable#setContextId(String)} or {@link Manageable#setAdmin(org.apache.directory.fortress.core.rbac.Session)}) are set.
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface AccelMgr extends Manageable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
index a1a68e6..0772a27 100644
--- a/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
@@ -32,7 +32,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AccelMgrFactory
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/AccessMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AccessMgr.java b/src/main/java/org/apache/directory/fortress/core/AccessMgr.java
index 7c616db..22d933c 100755
--- a/src/main/java/org/apache/directory/fortress/core/AccessMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccessMgr.java
@@ -60,7 +60,7 @@ import org.apache.directory.fortress.core.rbac.UserRole;
* <hr>
* <p/>
* This interface's implementer will NOT be thread safe if parent instance variables ({@link Manageable#setContextId(String)} or {@link Manageable#setAdmin(org.apache.directory.fortress.core.rbac.Session)}) are set.
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface AccessMgr extends Manageable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
index c040173..8a6b6ef 100755
--- a/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
@@ -33,7 +33,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AccessMgrFactory
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AdminMgr.java b/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
index bcd4624..803da25 100755
--- a/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
@@ -59,7 +59,7 @@ import org.apache.directory.fortress.core.rbac.UserRole;
* <p/>
* This interface's implementer will NOT be thread safe if parent instance variables ({@link Manageable#setContextId(String)} or {@link Manageable#setAdmin(org.apache.directory.fortress.core.rbac.Session)}) are set.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface AdminMgr extends Manageable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
index 9349c30..282a7bf 100755
--- a/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
@@ -35,7 +35,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AdminMgrFactory
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/AuditMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AuditMgr.java b/src/main/java/org/apache/directory/fortress/core/AuditMgr.java
index 24538bb..a7ab1da 100755
--- a/src/main/java/org/apache/directory/fortress/core/AuditMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/AuditMgr.java
@@ -69,7 +69,7 @@ import java.util.List;
* <p/>
* This interface's implementer will NOT be thread safe if parent instance variables ({@link Manageable#setContextId(String)} or {@link Manageable#setAdmin(org.apache.directory.fortress.core.rbac.Session)}) are set.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface AuditMgr extends Manageable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
index 8eabc83..1b16882 100755
--- a/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
@@ -33,7 +33,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* adding the {@link GlobalIds#AUDIT_IMPLEMENTATION} config property.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AuditMgrFactory
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/AuthorizationException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AuthorizationException.java b/src/main/java/org/apache/directory/fortress/core/AuthorizationException.java
index c3fd515..bb08b19 100755
--- a/src/main/java/org/apache/directory/fortress/core/AuthorizationException.java
+++ b/src/main/java/org/apache/directory/fortress/core/AuthorizationException.java
@@ -24,7 +24,7 @@ package org.apache.directory.fortress.core;
* This exception extends {@link SecurityException} and is thrown when administrative permission check fails.
* See the {@link GlobalErrIds} javadoc for list of error ids.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AuthorizationException extends SecurityException
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/BaseException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/BaseException.java b/src/main/java/org/apache/directory/fortress/core/BaseException.java
index 4a4d5d2..ff6aa84 100755
--- a/src/main/java/org/apache/directory/fortress/core/BaseException.java
+++ b/src/main/java/org/apache/directory/fortress/core/BaseException.java
@@ -26,7 +26,7 @@ package org.apache.directory.fortress.core;
* The BaseException class has been extended by {@link SecurityException} which is then declared thrown on most Fortress public APIs.
* See the {@link GlobalErrIds} javadoc for list of error ids that will be set.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public abstract class BaseException extends Exception implements StandardException
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 951fb91..f46edcb 100755
--- a/src/main/java/org/apache/directory/fortress/core/BaseRuntimeException.java
+++ b/src/main/java/org/apache/directory/fortress/core/BaseRuntimeException.java
@@ -24,7 +24,7 @@ package org.apache.directory.fortress.core;
* Base runtime exception class for Fortress runtime exceptions.
* See the {@link GlobalErrIds} javadoc for list of error ids.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public abstract class BaseRuntimeException extends RuntimeException
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/CfgException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/CfgException.java b/src/main/java/org/apache/directory/fortress/core/CfgException.java
index 5aa8d0f..6828e78 100755
--- a/src/main/java/org/apache/directory/fortress/core/CfgException.java
+++ b/src/main/java/org/apache/directory/fortress/core/CfgException.java
@@ -24,7 +24,7 @@ package org.apache.directory.fortress.core;
* This exception extends {@link SecurityException} and is thrown when Fortress cannot find correct cfg for a particular entity.
* See the {@link GlobalErrIds} javadoc for list of error ids.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CfgException extends SecurityException
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/CfgRuntimeException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/CfgRuntimeException.java b/src/main/java/org/apache/directory/fortress/core/CfgRuntimeException.java
index 78739cf..f3e6362 100755
--- a/src/main/java/org/apache/directory/fortress/core/CfgRuntimeException.java
+++ b/src/main/java/org/apache/directory/fortress/core/CfgRuntimeException.java
@@ -25,7 +25,7 @@ package org.apache.directory.fortress.core;
* This is critical runtime exception and means system is inoperable due to a cfg error.
* See the {@link GlobalErrIds} javadoc for list of error ids.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CfgRuntimeException extends BaseRuntimeException
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/CreateException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/CreateException.java b/src/main/java/org/apache/directory/fortress/core/CreateException.java
index 8127016..c3375e1 100755
--- a/src/main/java/org/apache/directory/fortress/core/CreateException.java
+++ b/src/main/java/org/apache/directory/fortress/core/CreateException.java
@@ -24,7 +24,7 @@ package org.apache.directory.fortress.core;
* This exception extends {@link SecurityException} and is thrown when DAO cannot create entity.
* See the {@link GlobalErrIds} javadoc for list of error ids.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class CreateException extends SecurityException
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/DelAccessMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAccessMgr.java b/src/main/java/org/apache/directory/fortress/core/DelAccessMgr.java
index 66910ba..4ff0072 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAccessMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAccessMgr.java
@@ -43,7 +43,7 @@ import java.util.Set;
* <p/>
* This interface's implementer will NOT be thread safe if parent instance variables ({@link Manageable#setContextId(String)} or {@link Manageable#setAdmin(org.apache.directory.fortress.core.rbac.Session)}) are set.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface DelAccessMgr extends Manageable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
index 7902b1f..7e489a6 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
@@ -33,7 +33,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* adding the {@link GlobalIds#DELEGATED_ACCESS_IMPLEMENTATION} config property.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class DelAccessMgrFactory
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/DelAdminMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAdminMgr.java b/src/main/java/org/apache/directory/fortress/core/DelAdminMgr.java
index c236479..d693e94 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAdminMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAdminMgr.java
@@ -41,7 +41,7 @@ import org.apache.directory.fortress.core.rbac.User;
* <p/>
* This interface's implementer will NOT be thread safe if parent instance variables ({@link Manageable#setContextId(String)} or {@link Manageable#setAdmin(org.apache.directory.fortress.core.rbac.Session)}) are set.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface DelAdminMgr extends Manageable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
index 0f2b295..7a747a9 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAdminMgrFactory.java
@@ -34,7 +34,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* adding the {@link GlobalIds#DELEGATED_ADMIN_IMPLEMENTATION} config property.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class DelAdminMgrFactory
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/DelReviewMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelReviewMgr.java b/src/main/java/org/apache/directory/fortress/core/DelReviewMgr.java
index 153917f..1f3c369 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelReviewMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelReviewMgr.java
@@ -40,7 +40,7 @@ import java.util.List;
* <p/>
* This interface's implementer will NOT be thread safe if parent instance variables ({@link Manageable#setContextId(String)} or {@link Manageable#setAdmin(org.apache.directory.fortress.core.rbac.Session)}) are set.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface DelReviewMgr extends Manageable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
index e89ca89..d831850 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
@@ -33,7 +33,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* adding the {@link GlobalIds#DELEGATED_REVIEW_IMPLEMENTATION} config property.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class DelReviewMgrFactory
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/FinderException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/FinderException.java b/src/main/java/org/apache/directory/fortress/core/FinderException.java
index fa1f992..4a62f06 100755
--- a/src/main/java/org/apache/directory/fortress/core/FinderException.java
+++ b/src/main/java/org/apache/directory/fortress/core/FinderException.java
@@ -24,7 +24,7 @@ package org.apache.directory.fortress.core;
* This exception extends {@link SecurityException} and is thrown when DAO cannot find entity.
* See the {@link GlobalErrIds} javadoc for list of error ids.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class FinderException extends SecurityException
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/GlobalErrIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/GlobalErrIds.java b/src/main/java/org/apache/directory/fortress/core/GlobalErrIds.java
index 552c315..6f01c34 100755
--- a/src/main/java/org/apache/directory/fortress/core/GlobalErrIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/GlobalErrIds.java
@@ -36,7 +36,7 @@ package org.apache.directory.fortress.core;
* All Fortress public Manager Impl APIs will throw exception derived from {@link SecurityException} and containing
* an id that maps to one of these error codes.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class GlobalErrIds
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
index 32758ab..603c8be 100755
--- a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
@@ -34,7 +34,7 @@ import org.apache.directory.fortress.core.cfg.Config;
* </p>
* This class is thread safe.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class GlobalIds
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/Manageable.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/Manageable.java b/src/main/java/org/apache/directory/fortress/core/Manageable.java
index ff9aa5b..825d1b6 100644
--- a/src/main/java/org/apache/directory/fortress/core/Manageable.java
+++ b/src/main/java/org/apache/directory/fortress/core/Manageable.java
@@ -30,7 +30,7 @@ import org.apache.directory.fortress.core.rbac.Session;
* This interface also allows Fortress clients to operate in a multi-tenant fashion using {@link #setContextId(String)}.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface Manageable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 6502f27..8ca7553 100755
--- a/src/main/java/org/apache/directory/fortress/core/ObjectFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/ObjectFactory.java
@@ -42,7 +42,7 @@ import javax.xml.namespace.QName;
* type definitions, element declarations and model
* groups. Factory methods for each of these are
* provided in this class.
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*
*/
@XmlRegistry
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/PasswordException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/PasswordException.java b/src/main/java/org/apache/directory/fortress/core/PasswordException.java
index 1d60fa8..7f0be6e 100755
--- a/src/main/java/org/apache/directory/fortress/core/PasswordException.java
+++ b/src/main/java/org/apache/directory/fortress/core/PasswordException.java
@@ -24,7 +24,7 @@ package org.apache.directory.fortress.core;
* This exception extends {@link SecurityException} and is thrown when password check fails.
* See the {@link GlobalErrIds} javadoc for list of error ids.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class PasswordException extends SecurityException
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/PwPolicyMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgr.java b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgr.java
index fb7d51d..69b5b7c 100755
--- a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgr.java
@@ -51,7 +51,7 @@ import java.util.List;
* <p/>
* This interface's implementer will NOT be thread safe if parent instance variables ({@link Manageable#setContextId(String)} or {@link Manageable#setAdmin(org.apache.directory.fortress.core.rbac.Session)}) are set.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface PwPolicyMgr extends Manageable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
index fef7355..f905fc1 100755
--- a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
@@ -33,7 +33,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* adding the {@link GlobalIds#PSWD_POLICY_IMPLEMENTATION} config property.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class PwPolicyMgrFactory
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/RemoveException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/RemoveException.java b/src/main/java/org/apache/directory/fortress/core/RemoveException.java
index e53f84c..edc603c 100755
--- a/src/main/java/org/apache/directory/fortress/core/RemoveException.java
+++ b/src/main/java/org/apache/directory/fortress/core/RemoveException.java
@@ -24,7 +24,7 @@ package org.apache.directory.fortress.core;
* This exception extends {@link SecurityException} and is thrown when DAO cannot delete entity.
* See the {@link GlobalErrIds} javadoc for list of error ids.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class RemoveException extends SecurityException
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/RestException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/RestException.java b/src/main/java/org/apache/directory/fortress/core/RestException.java
index 1274ed5..1c90c84 100644
--- a/src/main/java/org/apache/directory/fortress/core/RestException.java
+++ b/src/main/java/org/apache/directory/fortress/core/RestException.java
@@ -24,7 +24,7 @@ package org.apache.directory.fortress.core;
* This exception extends {@link SecurityException} and is thrown when Fortress cannot call En Masse to perform a particular operation via RESTful interface.
* See the {@link GlobalErrIds} javadoc for list of error ids.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class RestException extends SecurityException
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ReviewMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ReviewMgr.java b/src/main/java/org/apache/directory/fortress/core/ReviewMgr.java
index 90917c7..61073c8 100755
--- a/src/main/java/org/apache/directory/fortress/core/ReviewMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/ReviewMgr.java
@@ -63,7 +63,7 @@ import java.util.Set;
* <p/>
* This interface's implementer will NOT be thread safe if parent instance variables ({@link Manageable#setContextId(String)} or {@link Manageable#setAdmin(org.apache.directory.fortress.core.rbac.Session)}) are set.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface ReviewMgr extends Manageable
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
index 0e477ee..1ece2a5 100755
--- a/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
@@ -33,7 +33,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* adding the {@link GlobalIds#REVIEW_IMPLEMENTATION} config property.
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ReviewMgrFactory
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/SecurityException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/SecurityException.java b/src/main/java/org/apache/directory/fortress/core/SecurityException.java
index 1b49922..2ea1d80 100755
--- a/src/main/java/org/apache/directory/fortress/core/SecurityException.java
+++ b/src/main/java/org/apache/directory/fortress/core/SecurityException.java
@@ -447,7 +447,7 @@ package org.apache.directory.fortress.core;
* </ul>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class SecurityException extends BaseException
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/StandardException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/StandardException.java b/src/main/java/org/apache/directory/fortress/core/StandardException.java
index 97d5b3c..462fd42 100755
--- a/src/main/java/org/apache/directory/fortress/core/StandardException.java
+++ b/src/main/java/org/apache/directory/fortress/core/StandardException.java
@@ -23,7 +23,7 @@ package org.apache.directory.fortress.core;
* Interface that is implemented by exception base class {@link StandardException} used to associate a Fortress error code to the exception instance.
* See the {@link GlobalErrIds} javadoc for list of error ids used by Fortress.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public interface StandardException
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/UpdateException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/UpdateException.java b/src/main/java/org/apache/directory/fortress/core/UpdateException.java
index 0db612f..920a6cb 100755
--- a/src/main/java/org/apache/directory/fortress/core/UpdateException.java
+++ b/src/main/java/org/apache/directory/fortress/core/UpdateException.java
@@ -24,7 +24,7 @@ package org.apache.directory.fortress.core;
* This exception extends {@link SecurityException} and is thrown when DAO cannot update entity.
* See the {@link GlobalErrIds} javadoc for list of error ids.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class UpdateException extends SecurityException
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ValidationException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ValidationException.java b/src/main/java/org/apache/directory/fortress/core/ValidationException.java
index a0e9ecf..a706254 100755
--- a/src/main/java/org/apache/directory/fortress/core/ValidationException.java
+++ b/src/main/java/org/apache/directory/fortress/core/ValidationException.java
@@ -24,7 +24,7 @@ package org.apache.directory.fortress.core;
* This exception extends {@link SecurityException} and is thrown when Fortress cannot validate entity.
* See the {@link GlobalErrIds} javadoc for list of error ids.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ValidationException extends SecurityException
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Addadminrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addadminrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Addadminrole.java
index 88582cc..ac03834 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addadminrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addadminrole.java
@@ -38,7 +38,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Addadminrole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Addadminroleinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addadminroleinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Addadminroleinheritance.java
index 01a6405..beb1f7d 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addadminroleinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addadminroleinheritance.java
@@ -40,7 +40,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Addadminroleinheritance
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Addconfig.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addconfig.java b/src/main/java/org/apache/directory/fortress/core/ant/Addconfig.java
index 45950a5..190e8d2 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addconfig.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addconfig.java
@@ -38,7 +38,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Addconfig
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Addcontainer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addcontainer.java b/src/main/java/org/apache/directory/fortress/core/ant/Addcontainer.java
index 814526f..b7a1cb0 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addcontainer.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addcontainer.java
@@ -40,7 +40,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Addcontainer
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Addcontext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addcontext.java b/src/main/java/org/apache/directory/fortress/core/ant/Addcontext.java
index 086f0b9..1a4a6d9 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addcontext.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addcontext.java
@@ -41,7 +41,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Addcontext
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Addgroup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addgroup.java b/src/main/java/org/apache/directory/fortress/core/ant/Addgroup.java
index 62f248e..ddfbce2 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addgroup.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addgroup.java
@@ -42,7 +42,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Addgroup
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Addgroupmember.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addgroupmember.java b/src/main/java/org/apache/directory/fortress/core/ant/Addgroupmember.java
index 77eb248..13a4d94 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addgroupmember.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addgroupmember.java
@@ -42,7 +42,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Addgroupmember
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Addgroupproperty.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addgroupproperty.java b/src/main/java/org/apache/directory/fortress/core/ant/Addgroupproperty.java
index 712791c..ff46a6d 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addgroupproperty.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addgroupproperty.java
@@ -42,7 +42,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Addgroupproperty
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Addorgunit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addorgunit.java b/src/main/java/org/apache/directory/fortress/core/ant/Addorgunit.java
index 59f33ce..cd35b4c 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addorgunit.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addorgunit.java
@@ -40,7 +40,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Addorgunit
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/AddpermGrant.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/AddpermGrant.java b/src/main/java/org/apache/directory/fortress/core/ant/AddpermGrant.java
index 0ce7a1b..ab6d967 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/AddpermGrant.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/AddpermGrant.java
@@ -40,7 +40,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AddpermGrant
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/AddpermObj.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/AddpermObj.java b/src/main/java/org/apache/directory/fortress/core/ant/AddpermObj.java
index 12be63d..c7b2bac 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/AddpermObj.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/AddpermObj.java
@@ -40,7 +40,7 @@ import org.apache.directory.fortress.core.rbac.PermObj;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AddpermObj
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/AddpermOp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/AddpermOp.java b/src/main/java/org/apache/directory/fortress/core/ant/AddpermOp.java
index fb9df6e..9e2fb84 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/AddpermOp.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/AddpermOp.java
@@ -38,7 +38,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AddpermOp
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Addpermorgunitinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addpermorgunitinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Addpermorgunitinheritance.java
index c6ca211..789c8c3 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addpermorgunitinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addpermorgunitinheritance.java
@@ -40,7 +40,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Addpermorgunitinheritance
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Addpwpolicy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addpwpolicy.java b/src/main/java/org/apache/directory/fortress/core/ant/Addpwpolicy.java
index 3922bc4..e276460 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addpwpolicy.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addpwpolicy.java
@@ -40,7 +40,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Addpwpolicy
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Addrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Addrole.java
index 6dd8692..038b4ac 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addrole.java
@@ -40,7 +40,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Addrole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Addroleinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addroleinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Addroleinheritance.java
index f1e2f4d..715610f 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addroleinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addroleinheritance.java
@@ -40,7 +40,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Addroleinheritance
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Addsdset.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addsdset.java b/src/main/java/org/apache/directory/fortress/core/ant/Addsdset.java
index 06d88a3..b81f037 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addsdset.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addsdset.java
@@ -39,7 +39,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Addsdset
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Addsuffix.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addsuffix.java b/src/main/java/org/apache/directory/fortress/core/ant/Addsuffix.java
index cfeb710..bcaedbc 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addsuffix.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addsuffix.java
@@ -40,7 +40,7 @@ import org.apache.directory.fortress.core.ldap.suffix.Suffix;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Addsuffix
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Adduser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Adduser.java b/src/main/java/org/apache/directory/fortress/core/ant/Adduser.java
index c9ddcf5..16f7c2c 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Adduser.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Adduser.java
@@ -38,7 +38,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Adduser
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Adduseradminrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Adduseradminrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Adduseradminrole.java
index 7f8ce8c..118c1e7 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Adduseradminrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Adduseradminrole.java
@@ -40,7 +40,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Adduseradminrole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Adduserorgunitinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Adduserorgunitinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Adduserorgunitinheritance.java
index 924ebb8..9f6a7d8 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Adduserorgunitinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Adduserorgunitinheritance.java
@@ -40,7 +40,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Adduserorgunitinheritance
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Adduserrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Adduserrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Adduserrole.java
index c93e077..0f03465 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Adduserrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Adduserrole.java
@@ -40,7 +40,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Adduserrole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/AdminRoleAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/AdminRoleAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/AdminRoleAnt.java
index 17779f8..4b99ee5 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/AdminRoleAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/AdminRoleAnt.java
@@ -29,7 +29,7 @@ import java.util.StringTokenizer;
* Entity is used by custom Apache Ant task for special handling of collections. This is necessary because the
* Ant parser cannot deal with complex data attribute types.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class AdminRoleAnt extends AdminRole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/ConfigAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/ConfigAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/ConfigAnt.java
index f143875..4e8a288 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/ConfigAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/ConfigAnt.java
@@ -23,7 +23,7 @@ package org.apache.directory.fortress.core.ant;
/**
* This entity contains the list of name/value pairs targeted for updating on server.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ConfigAnt
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java
index b6c6bd7..ec55622 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java
@@ -39,7 +39,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Deladminrole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Deladminroleinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deladminroleinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Deladminroleinheritance.java
index e0affb7..a0f9c41 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deladminroleinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deladminroleinheritance.java
@@ -42,7 +42,7 @@ import java.util.List;
* </pre>
*
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Deladminroleinheritance
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Delconfig.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delconfig.java b/src/main/java/org/apache/directory/fortress/core/ant/Delconfig.java
index 9f65199..e4f930d 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delconfig.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delconfig.java
@@ -39,7 +39,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Delconfig
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Delcontainer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delcontainer.java b/src/main/java/org/apache/directory/fortress/core/ant/Delcontainer.java
index 52176a0..743c506 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delcontainer.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delcontainer.java
@@ -48,7 +48,7 @@ import java.util.List;
* </font>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Delcontainer
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Delgroup.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delgroup.java b/src/main/java/org/apache/directory/fortress/core/ant/Delgroup.java
index ddcf8fe..8918fad 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delgroup.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delgroup.java
@@ -41,7 +41,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Delgroup
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Delgroupmember.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delgroupmember.java b/src/main/java/org/apache/directory/fortress/core/ant/Delgroupmember.java
index 3b7f9f7..448298a 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delgroupmember.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delgroupmember.java
@@ -41,7 +41,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Delgroupmember
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Delgroupproperty.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delgroupproperty.java b/src/main/java/org/apache/directory/fortress/core/ant/Delgroupproperty.java
index 2647724..2a1d4eb 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delgroupproperty.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delgroupproperty.java
@@ -41,7 +41,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Delgroupproperty
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Delorgunit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delorgunit.java b/src/main/java/org/apache/directory/fortress/core/ant/Delorgunit.java
index 7af0216..588d20e 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delorgunit.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delorgunit.java
@@ -41,7 +41,7 @@ import org.apache.directory.fortress.core.rbac.OrgUnitAnt;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Delorgunit
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/DelpermGrant.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/DelpermGrant.java b/src/main/java/org/apache/directory/fortress/core/ant/DelpermGrant.java
index a68cd7d..f077499 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/DelpermGrant.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/DelpermGrant.java
@@ -40,7 +40,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class DelpermGrant
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/DelpermObj.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/DelpermObj.java b/src/main/java/org/apache/directory/fortress/core/ant/DelpermObj.java
index 851ecc4..77d2d18 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/DelpermObj.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/DelpermObj.java
@@ -41,7 +41,7 @@ import org.apache.directory.fortress.core.rbac.PermObj;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class DelpermObj
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/DelpermOp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/DelpermOp.java b/src/main/java/org/apache/directory/fortress/core/ant/DelpermOp.java
index 119bc2e..1abde49 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/DelpermOp.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/DelpermOp.java
@@ -39,7 +39,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class DelpermOp
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Delpermorgunitinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delpermorgunitinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Delpermorgunitinheritance.java
index 51ffc85..8362aaf 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delpermorgunitinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delpermorgunitinheritance.java
@@ -42,7 +42,7 @@ import java.util.List;
* </pre>
*
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Delpermorgunitinheritance
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Delpwpolicy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delpwpolicy.java b/src/main/java/org/apache/directory/fortress/core/ant/Delpwpolicy.java
index ebc8dd7..f562388 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delpwpolicy.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delpwpolicy.java
@@ -41,7 +41,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Delpwpolicy
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Delrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Delrole.java
index c2721b7..02482a5 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delrole.java
@@ -41,7 +41,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Delrole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Delroleinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delroleinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Delroleinheritance.java
index 39582ed..40cbcb3 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delroleinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delroleinheritance.java
@@ -42,7 +42,7 @@ import java.util.List;
* </pre>
*
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Delroleinheritance
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Delsdset.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delsdset.java b/src/main/java/org/apache/directory/fortress/core/ant/Delsdset.java
index 75f3610..f3b42a1 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delsdset.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delsdset.java
@@ -40,7 +40,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Delsdset
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Delsuffix.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delsuffix.java b/src/main/java/org/apache/directory/fortress/core/ant/Delsuffix.java
index 5918882..952d420 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delsuffix.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delsuffix.java
@@ -43,7 +43,7 @@ import java.util.List;
* </font>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Delsuffix
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Deluser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deluser.java b/src/main/java/org/apache/directory/fortress/core/ant/Deluser.java
index ee8a721..1a97e80 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deluser.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deluser.java
@@ -39,7 +39,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Deluser
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Deluseradminrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deluseradminrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Deluseradminrole.java
index d0191bc..fefca6b 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deluseradminrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deluseradminrole.java
@@ -40,7 +40,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Deluseradminrole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Deluserorgunitinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deluserorgunitinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Deluserorgunitinheritance.java
index 176738c..3e14177 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deluserorgunitinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deluserorgunitinheritance.java
@@ -42,7 +42,7 @@ import java.util.List;
* </pre>
*
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Deluserorgunitinheritance
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/Deluserrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deluserrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Deluserrole.java
index 15522ca..09ed769 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deluserrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deluserrole.java
@@ -40,7 +40,7 @@ import java.util.List;
* }
* </pre>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class Deluserrole
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/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 fcf19bd..ea54a4a 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
@@ -186,7 +186,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* </ol>
* <p/>
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class FortressAntTask extends Task implements InputHandler
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9d9649b6/src/main/java/org/apache/directory/fortress/core/ant/PermAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/PermAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/PermAnt.java
index 1f17fa5..f8684e5 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/PermAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/PermAnt.java
@@ -29,7 +29,7 @@ import java.util.StringTokenizer;
* Entity is used by custom Apache Ant task for special handling of collections. This is necessary because the
* Ant parser cannot deal with complex data attribute types. The class extends a base entity.
*
- * @author Shawn McKinney
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class PermAnt extends Permission
{
[18/23] directory-fortress-core git commit: FC-54 - Benchmark
activities - adjust fortress benchmark settings
Posted by sm...@apache.org.
FC-54 - Benchmark activities - adjust fortress benchmark settings
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/af0921e9
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/af0921e9
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/af0921e9
Branch: refs/heads/master
Commit: af0921e917fcc5f69f14e9bcfe320b605407a33b
Parents: 3c48834
Author: Shawn McKinney <sm...@apache.org>
Authored: Wed Jan 14 21:37:44 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Wed Jan 14 21:37:44 2015 -0600
----------------------------------------------------------------------
src/test/jmeter/ftCheckAccess.jmx | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/af0921e9/src/test/jmeter/ftCheckAccess.jmx
----------------------------------------------------------------------
diff --git a/src/test/jmeter/ftCheckAccess.jmx b/src/test/jmeter/ftCheckAccess.jmx
index 9109e9c..27c3d55 100644
--- a/src/test/jmeter/ftCheckAccess.jmx
+++ b/src/test/jmeter/ftCheckAccess.jmx
@@ -30,15 +30,7 @@
<stringProp name="LoopController.loops">50000</stringProp>
</elementProp>
<stringProp name="ThreadGroup.num_threads">25</stringProp>
- <stringProp name="ThreadGroup.ramp_time">5</stringProp>
-
- <!--stringProp name="LoopController.loops">50000</stringProp>
- </elementProp>
- <stringProp name="ThreadGroup.num_threads">20</stringProp>
- <stringProp name="ThreadGroup.ramp_time">5</stringProp-->
-
- <!--longProp name="ThreadGroup.start_time">1397479644000</longProp>
- <longProp name="ThreadGroup.end_time">1397479644000</longProp-->
+ <stringProp name="ThreadGroup.ramp_time">25</stringProp>
<boolProp name="ThreadGroup.scheduler">false</boolProp>
<stringProp name="ThreadGroup.duration"></stringProp>
<stringProp name="ThreadGroup.delay"></stringProp>
[03/23] directory-fortress-core git commit: FC-40 - Use the LDAP API
constants instead of GlobalIDs constants when possible
Posted by sm...@apache.org.
FC-40 - Use the LDAP API constants instead of GlobalIDs constants when possible
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/04f0a1a2
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/04f0a1a2
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/04f0a1a2
Branch: refs/heads/master
Commit: 04f0a1a26e14e90bd51dbd9e760a104a5f2c9dd1
Parents: dcfed51
Author: Shawn McKinney <sm...@apache.org>
Authored: Sun Dec 21 11:03:13 2014 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sun Dec 21 11:03:13 2014 -0600
----------------------------------------------------------------------
.../directory/fortress/core/GlobalIds.java | 44 +-----
.../ldap/container/OrganizatiionalUnitDAO.java | 2 +-
.../fortress/core/ldap/group/GroupDAO.java | 8 +-
.../fortress/core/ldap/suffix/SuffixDAO.java | 2 +-
.../fortress/core/rbac/AdminRoleDAO.java | 8 +-
.../fortress/core/rbac/OrgUnitDAO.java | 8 +-
.../directory/fortress/core/rbac/PermDAO.java | 16 +-
.../directory/fortress/core/rbac/RoleDAO.java | 8 +-
.../directory/fortress/core/rbac/SdDAO.java | 8 +-
.../directory/fortress/core/rbac/UserDAO.java | 157 +++++++------------
.../fortress/core/example/ExampleDAO.java | 8 +-
11 files changed, 91 insertions(+), 178 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/04f0a1a2/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
index d4a02c8..32758ab 100755
--- a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
@@ -213,33 +213,13 @@ public class GlobalIds
*/
/**
- * Constant contains the organization object class name.
- */
- public final static String ORGANIZATION_CLASS = "organization";
-
- /**
- * Constant contains the ldap distinguished name attribute.
- */
- public final static String DN = "dn";
-
- /**
- * Used within search operation using the OpenLDAP proxy control.
- */
- public final static String UTF8 = "UTF-8";
-
- /**
- * Constant contains the description attribute name used within inetOrgPerson and other ldap object classes.
- */
- public final static String DESC = "description";
-
- /**
* Password policy object class structure uses cn attribute name.
*/
public final static String POLICY_NODE_TYPE = SchemaConstants.CN_AT;
/*
* *************************************************************************
- * ** OPENLDAP PW POLICY ATTRIBUTES AND CONSTANTS
+ * ** OPENLDAP ATTRIBUTES AND CONSTANTS
* ************************************************************************
*/
@@ -247,26 +227,6 @@ public class GlobalIds
public static final boolean IS_OPENLDAP = ( ( Config.getProperty( SERVER_TYPE ) != null ) && ( Config
.getProperty( SERVER_TYPE ).equalsIgnoreCase( "openldap" ) ) );
- /**
- * OpenLDAP uses this object class to store policy definitions that are processed by the pw policy overlay.
- */
- //private final static String OPENLDAP_PW_POLICY_IMPL = "password.policy";
-
- /**
- * When openldap password policy is in effect the openldap pw policy response control is interrogated subsequent to bind operations.
- */
- //private final static String OPENLDAP_SERVER = "openldap";
-
- /**
- * When set to true the pw policy control is interrogated.
- */
- //public final static boolean OPENLDAP_IS_PW_POLICY_ENABLED = (org.apache.directory.fortress.cfg.Config.getProperty(GlobalIds.OPENLDAP_PW_POLICY_IMPL) != null && (Config.getProperty(GlobalIds.OPENLDAP_PW_POLICY_IMPL)).equalsIgnoreCase(GlobalIds.OPENLDAP_SERVER));
-
- /**
- * This is control id openldap uses to communicate password messages to the ldap client subsequent to bind operations:
- */
- public final static String OPENLDAP_PW_RESPONSE_CONTROL = "1.3.6.1.4.1.42.2.27.8.5.1";
-
/*
* *************************************************************************
* ** OpenAccessMgr AUDIT
@@ -306,7 +266,7 @@ public class GlobalIds
/**
* This string literal contains a common start for most ldap search filters that fortress uses.
*/
- public final static String FILTER_PREFIX = "(&(objectclass=";
+ public final static String FILTER_PREFIX = "(&(" + SchemaConstants.OBJECT_CLASS_AT + "=";
/*
* *************************************************************************
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/04f0a1a2/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
index 3af7cd5..b25699d 100644
--- 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
@@ -113,7 +113,7 @@ final class OrganizationalUnitDAO extends ApacheDsDataProvider
Entry myEntry = new DefaultEntry( nodeDn,
SchemaConstants.OBJECT_CLASS, ORGUNIT_CLASS,
SchemaConstants.OU_AT, oe.getName(),
- GlobalIds.DESC, oe.getDescription() );
+ SchemaConstants.DESCRIPTION_AT, oe.getDescription() );
ld = getAdminConnection();
add( ld, myEntry );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/04f0a1a2/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 48eb26f..3d681a8 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
@@ -69,7 +69,7 @@ final class GroupDAO extends ApacheDsDataProvider
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, GlobalIds.DESC, GROUP_PROTOCOL_ATTR_IMPL, GROUP_PROPERTY_ATTR_IMPL, SchemaConstants.MEMBER_AT};
+ 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.
@@ -100,7 +100,7 @@ final class GroupDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( group.getDescription() ) )
{
- myEntry.add( GlobalIds.DESC, group.getDescription() );
+ myEntry.add( SchemaConstants.DESCRIPTION_AT, group.getDescription() );
}
ld = getAdminConnection();
@@ -139,7 +139,7 @@ final class GroupDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( group.getDescription() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, GlobalIds.DESC, group.getDescription() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.DESCRIPTION_AT, group.getDescription() ) );
}
if ( VUtil.isNotNullOrEmpty( group.getProtocol() ) )
@@ -471,7 +471,7 @@ final class GroupDAO extends ApacheDsDataProvider
{
Group entity = new ObjectFactory().createGroup();
entity.setName( getAttribute( le, SchemaConstants.CN_AT ) );
- entity.setDescription( getAttribute( le, GlobalIds.DESC ) );
+ entity.setDescription( getAttribute( le, SchemaConstants.DESCRIPTION_AT ) );
entity.setProtocol( getAttribute( le, GROUP_PROTOCOL_ATTR_IMPL ) );
entity.setMembers( getAttributes( le, SchemaConstants.MEMBER_AT ) );
entity.setMemberDn( true );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/04f0a1a2/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 130eb50..3cc656f 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
@@ -71,7 +71,7 @@ final class SuffixDAO extends ApacheDsDataProvider
private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
private static final String[] SUFFIX_OBJ_CLASS =
{
- SchemaConstants.DC_OBJECT_OC, GlobalIds.ORGANIZATION_CLASS
+ SchemaConstants.DC_OBJECT_OC, SchemaConstants.ORGANIZATION_OC
};
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/04f0a1a2/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 4a3ec00..682343c 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
@@ -133,7 +133,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
{
GlobalIds.FT_IID,
ROLE_NM,
- GlobalIds.DESC,
+ SchemaConstants.DESCRIPTION_AT,
GlobalIds.CONSTRAINT,
ROLE_OCCUPANT,
ROLE_OSP,
@@ -168,7 +168,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
// description field is optional on this object class:
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
{
- entry.add( GlobalIds.DESC, entity.getDescription() );
+ entry.add( SchemaConstants.DESCRIPTION_AT, entity.getDescription() );
}
// CN attribute is required for this object class:
@@ -224,7 +224,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
{
mods.add( new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE,
- GlobalIds.DESC, entity.getDescription() ) );
+ SchemaConstants.DESCRIPTION_AT, entity.getDescription() ) );
}
if ( VUtil.isNotNullOrEmpty( entity.getOccupants() ) )
@@ -675,7 +675,7 @@ final class AdminRoleDAO extends ApacheDsDataProvider
entity.setSequenceId( sequence );
entity.setId( getAttribute( le, GlobalIds.FT_IID ) );
entity.setName( getAttribute( le, ROLE_NM ) );
- entity.setDescription( getAttribute( le, GlobalIds.DESC ) );
+ entity.setDescription( getAttribute( le, SchemaConstants.DESCRIPTION_AT ) );
entity.setOccupants( getAttributes( le, ROLE_OCCUPANT ) );
entity.setOsP( getAttributeSet( le, ROLE_OSP ) );
entity.setOsU( getAttributeSet( le, ROLE_OSU ) );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/04f0a1a2/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 d758b99..1843448 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
@@ -113,7 +113,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
};
private static final String[] ORGUNIT_ATRS =
{
- GlobalIds.FT_IID, SchemaConstants.OU_AT, GlobalIds.DESC, GlobalIds.PARENT_NODES
+ GlobalIds.FT_IID, SchemaConstants.OU_AT, SchemaConstants.DESCRIPTION_AT, GlobalIds.PARENT_NODES
};
private static final String[] ORGUNIT_ATR =
@@ -144,7 +144,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
if ( !Strings.isEmpty( description ) )
{
- entry.add( GlobalIds.DESC, description );
+ entry.add( SchemaConstants.DESCRIPTION_AT, description );
}
// organizational name requires OU attribute:
@@ -201,7 +201,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
if ( entity.getDescription() != null && entity.getDescription().length() > 0 )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, GlobalIds.DESC, entity.getDescription() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.DESCRIPTION_AT, entity.getDescription() ) );
}
loadAttrs( entity.getParents(), mods, GlobalIds.PARENT_NODES );
@@ -695,7 +695,7 @@ final class OrgUnitDAO extends ApacheDsDataProvider
entity.setSequenceId( sequence );
entity.setId( getAttribute( le, GlobalIds.FT_IID ) );
entity.setName( getAttribute( le, SchemaConstants.OU_AT ) );
- entity.setDescription( getAttribute( le, GlobalIds.DESC ) );
+ entity.setDescription( getAttribute( le, SchemaConstants.DESCRIPTION_AT ) );
String dn = le.getDn().getName();
if ( dn.contains( getRootDn( contextId, GlobalIds.PSU_ROOT ) ) )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/04f0a1a2/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 b5a41ab..cd55062 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
@@ -177,13 +177,13 @@ final class PermDAO extends ApacheDsDataProvider
private static final String USERS = "ftUsers";
private static final String[] PERMISSION_OP_ATRS =
{
- GlobalIds.FT_IID, PERM_NAME, GlobalIds.POBJ_NAME, GlobalIds.POP_NAME, GlobalIds.DESC, SchemaConstants.OU_AT,
+ GlobalIds.FT_IID, PERM_NAME, GlobalIds.POBJ_NAME, GlobalIds.POP_NAME, SchemaConstants.DESCRIPTION_AT, SchemaConstants.OU_AT,
GlobalIds.POBJ_ID, TYPE, ROLES, USERS, GlobalIds.PROPS
};
private static final String[] PERMISION_OBJ_ATRS =
{
- GlobalIds.FT_IID, GlobalIds.POBJ_NAME, GlobalIds.DESC, SchemaConstants.OU_AT, TYPE,
+ GlobalIds.FT_IID, GlobalIds.POBJ_NAME, SchemaConstants.DESCRIPTION_AT, SchemaConstants.OU_AT, TYPE,
GlobalIds.PROPS
};
@@ -217,7 +217,7 @@ final class PermDAO extends ApacheDsDataProvider
// description is optional:
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
{
- entry.add( GlobalIds.DESC, entity.getDescription() );
+ entry.add( SchemaConstants.DESCRIPTION_AT, entity.getDescription() );
}
// type is optional:
@@ -278,7 +278,7 @@ final class PermDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, GlobalIds.DESC, entity.getDescription() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.DESCRIPTION_AT, entity.getDescription() ) );
}
if ( VUtil.isNotNullOrEmpty( entity.getType() ) )
@@ -377,7 +377,7 @@ final class PermDAO extends ApacheDsDataProvider
// description is optional:
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
{
- entry.add( GlobalIds.DESC, entity.getDescription() );
+ entry.add( SchemaConstants.DESCRIPTION_AT, entity.getDescription() );
}
// the abstract name is the human readable identifier:
@@ -456,7 +456,7 @@ final class PermDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, GlobalIds.DESC, entity.getDescription() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.DESCRIPTION_AT, entity.getDescription() ) );
}
if ( VUtil.isNotNullOrEmpty( entity.getType() ) )
@@ -1008,7 +1008,7 @@ final class PermDAO extends ApacheDsDataProvider
entity.setRoles( getAttributeSet( le, ROLES ) );
entity.setUsers( getAttributeSet( le, USERS ) );
entity.setType( getAttribute( le, TYPE ) );
- entity.setDescription( getAttribute( le, GlobalIds.DESC ) );
+ entity.setDescription( getAttribute( le, SchemaConstants.DESCRIPTION_AT ) );
entity.addProperties( AttrHelper.getProperties( getAttributes( le, GlobalIds.PROPS ) ) );
entity.setAdmin( isAdmin );
@@ -1037,7 +1037,7 @@ final class PermDAO extends ApacheDsDataProvider
entity.setDn( le.getDn().getName() );
entity.setInternalId( getAttribute( le, GlobalIds.FT_IID ) );
entity.setType( getAttribute( le, TYPE ) );
- entity.setDescription( getAttribute( le, GlobalIds.DESC ) );
+ entity.setDescription( getAttribute( le, SchemaConstants.DESCRIPTION_AT ) );
entity.addProperties( AttrHelper.getProperties( getAttributes( le, GlobalIds.PROPS ) ) );
entity.setAdmin( isAdmin );
return entity;
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/04f0a1a2/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 966177a..e5ed548 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
@@ -113,7 +113,7 @@ final class RoleDAO extends ApacheDsDataProvider
private static final String[] ROLE_ATRS =
{
- GlobalIds.FT_IID, ROLE_NM, GlobalIds.DESC, GlobalIds.CONSTRAINT, ROLE_OCCUPANT, GlobalIds.PARENT_NODES
+ GlobalIds.FT_IID, ROLE_NM, SchemaConstants.DESCRIPTION_AT, GlobalIds.CONSTRAINT, ROLE_OCCUPANT, GlobalIds.PARENT_NODES
};
@@ -138,7 +138,7 @@ final class RoleDAO extends ApacheDsDataProvider
// description field is optional on this object class:
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
{
- entry.add( GlobalIds.DESC, entity.getDescription() );
+ entry.add( SchemaConstants.DESCRIPTION_AT, entity.getDescription() );
}
// CN attribute is required for this object class:
@@ -183,7 +183,7 @@ final class RoleDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
{
mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
- GlobalIds.DESC, entity.getDescription() ) );
+ SchemaConstants.DESCRIPTION_AT, entity.getDescription() ) );
}
if ( VUtil.isNotNullOrEmpty( entity.getOccupants() ) )
@@ -639,7 +639,7 @@ final class RoleDAO extends ApacheDsDataProvider
entity.setSequenceId( sequence );
entity.setId( getAttribute( le, GlobalIds.FT_IID ) );
entity.setName( getAttribute( le, ROLE_NM ) );
- entity.setDescription( getAttribute( le, GlobalIds.DESC ) );
+ entity.setDescription( getAttribute( le, SchemaConstants.DESCRIPTION_AT ) );
entity.setOccupants( getAttributes( le, ROLE_OCCUPANT ) );
//entity.setParents(RoleUtil.getParents(entity.getName().toUpperCase(), contextId));
entity.setChildren( RoleUtil.getChildren( entity.getName().toUpperCase(), contextId ) );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/04f0a1a2/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 89f2674..734d582 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
@@ -135,7 +135,7 @@ final class SdDAO extends ApacheDsDataProvider
private static final String[] SD_SET_ATRS =
{
- GlobalIds.FT_IID, SD_SET_NM, GlobalIds.DESC, ROLES, SD_SET_CARDINALITY
+ GlobalIds.FT_IID, SD_SET_NM, SchemaConstants.DESCRIPTION_AT, ROLES, SD_SET_CARDINALITY
};
@@ -166,7 +166,7 @@ final class SdDAO extends ApacheDsDataProvider
// description field is optional on this object class:
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
{
- entry.add( GlobalIds.DESC, entity.getDescription() );
+ entry.add( SchemaConstants.DESCRIPTION_AT, entity.getDescription() );
}
// CN attribute is required for this object class:
@@ -218,7 +218,7 @@ final class SdDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, GlobalIds.DESC, entity.getDescription() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.DESCRIPTION_AT, entity.getDescription() ) );
}
if ( entity.getCardinality() != null )
@@ -611,7 +611,7 @@ final class SdDAO extends ApacheDsDataProvider
entity.setSequenceId( sequence );
entity.setId( getAttribute( le, GlobalIds.FT_IID ) );
entity.setName( getAttribute( le, SD_SET_NM ) );
- entity.setDescription( getAttribute( le, GlobalIds.DESC ) );
+ entity.setDescription( getAttribute( le, SchemaConstants.DESCRIPTION_AT ) );
entity.setMembers( getAttributeSet( le, ROLES ) );
String szCard = getAttribute( le, SD_SET_CARDINALITY );
entity.setCardinality( new Integer( szCard ) );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/04f0a1a2/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 ad415c0..b7458ec 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
@@ -137,7 +137,6 @@ final class UserDAO extends ApacheDsDataProvider
{
private static final String CLS_NM = UserDAO.class.getName();
private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
- private static PwPolicyControl pwControlx;
/*
* *************************************************************************
@@ -145,7 +144,6 @@ final class UserDAO extends ApacheDsDataProvider
* ************************************************************************
*/
private static final String USERS_AUX_OBJECT_CLASS_NAME = "ftUserAttrs";
- private static final String ORGANIZATIONAL_PERSON_OBJECT_CLASS_NAME = "organizationalPerson";
private static final String USER_OBJECT_CLASS = "user.objectclass";
private static final String USERS_EXTENSIBLE_OBJECT = "extensibleObject";
//private static final String POSIX_ACCOUNT_OBJECT_CLASS_NAME = "posixAccount";
@@ -163,46 +161,9 @@ final class UserDAO extends ApacheDsDataProvider
};
private static final String objectClassImpl = Config.getProperty( USER_OBJECT_CLASS );
- private static final String SN = "sn";
- private static final String PW = "userpassword";
private static final String SYSTEM_USER = "ftSystem";
/**
- * Constant contains the locale attribute name used within organizationalPerson ldap object classes.
- */
- private static final String L = "l";
-
- /**
- * Constant contains the postal address attribute name used within organizationalPerson ldap object classes.
- */
- private static final String POSTAL_ADDRESS = "postalAddress";
-
- /**
- * Constant contains the state attribute name used within organizationalPerson ldap object classes.
- */
- private static final String STATE = "st";
-
- /**
- * Constant contains the postal code attribute name used within organizationalPerson ldap object classes.
- */
- private static final String POSTAL_CODE = "postalCode";
-
- /**
- * Constant contains the post office box attribute name used within organizationalPerson ldap object classes.
- */
- private static final String POST_OFFICE_BOX = "postOfficeBox";
-
- /**
- * Constant contains the country attribute name used within organizationalPerson ldap object classes.
- */
- private static final String COUNTRY = "c";
-
- /**
- * Constant contains the attribute name used within inetorgperson ldap object classes.
- */
- private static final String PHYSICAL_DELIVERY_OFFICE_NAME = "physicalDeliveryOfficeName";
-
- /**
* Constant contains the attribute name used within inetorgperson ldap object classes.
*/
private static final String DEPARTMENT_NUMBER = "departmentNumber";
@@ -218,21 +179,13 @@ final class UserDAO extends ApacheDsDataProvider
private static final String MOBILE = "mobile";
/**
- * Constant contains the telephone attribute values used within organizationalPerson ldap object classes.
- */
- private static final String TELEPHONE_NUMBER = "telephoneNumber";
-
- /**
* Constant contains the attribute name for jpeg images to be stored within inetorgperson ldap object classes.
*/
private static final String JPEGPHOTO = "jpegPhoto";
/**
- * Constant contains the email attribute values used within iNetOrgPerson ldap object classes.
+ * Constant contains the employeeType attribute within iNetOrgPerson ldap object classes.
*/
- private static final String MAIL = "mail";
- private static final String DISPLAY_NAME = "displayName";
- private static final String TITLE = "title";
private static final String EMPLOYEE_TYPE = "employeeType";
// RFC2307bis:
@@ -261,11 +214,11 @@ final class UserDAO extends ApacheDsDataProvider
private static final String[] AUTHN_ATRS =
{
GlobalIds.FT_IID,
- SchemaConstants.UID_AT, PW,
- GlobalIds.DESC,
+ SchemaConstants.UID_AT, SchemaConstants.USER_PASSWORD_AT,
+ SchemaConstants.DESCRIPTION_AT,
SchemaConstants.OU_AT,
SchemaConstants.CN_AT,
- SN,
+ SchemaConstants.SN_AT,
GlobalIds.CONSTRAINT,
GlobalIds.IS_OPENLDAP ? OPENLDAP_PW_RESET : null,
GlobalIds.IS_OPENLDAP ? OPENLDAP_PW_LOCKED_TIME : null,
@@ -276,11 +229,11 @@ final class UserDAO extends ApacheDsDataProvider
private static final String[] DEFAULT_ATRS =
{
GlobalIds.FT_IID,
- SchemaConstants.UID_AT, PW,
- GlobalIds.DESC,
+ SchemaConstants.UID_AT, SchemaConstants.USER_PASSWORD_AT,
+ SchemaConstants.DESCRIPTION_AT,
SchemaConstants.OU_AT,
SchemaConstants.CN_AT,
- SN,
+ SchemaConstants.SN_AT,
GlobalIds.USER_ROLE_DATA,
GlobalIds.CONSTRAINT,
GlobalIds.USER_ROLE_ASSIGN,
@@ -290,19 +243,19 @@ final class UserDAO extends ApacheDsDataProvider
GlobalIds.PROPS,
GlobalIds.USER_ADMINROLE_ASSIGN,
GlobalIds.USER_ADMINROLE_DATA,
- POSTAL_ADDRESS,
- L,
- POSTAL_CODE,
- POST_OFFICE_BOX,
- STATE,
- PHYSICAL_DELIVERY_OFFICE_NAME,
+ SchemaConstants.POSTAL_ADDRESS_AT,
+ SchemaConstants.L_AT,
+ SchemaConstants.POSTALCODE_AT,
+ SchemaConstants.POSTOFFICEBOX_AT,
+ SchemaConstants.ST_AT,
+ SchemaConstants.PHYSICAL_DELIVERY_OFFICE_NAME_AT,
DEPARTMENT_NUMBER,
ROOM_NUMBER,
- TELEPHONE_NUMBER,
+ SchemaConstants.TELEPHONE_NUMBER_AT,
MOBILE,
- MAIL,
+ SchemaConstants.MAIL_AT,
EMPLOYEE_TYPE,
- TITLE,
+ SchemaConstants.TITLE_AT,
SYSTEM_USER,
JPEGPHOTO,
@@ -363,18 +316,18 @@ final class UserDAO extends ApacheDsDataProvider
entity.setSn( entity.getUserId() );
}
- myEntry.add( SN, entity.getSn() );
+ myEntry.add( SchemaConstants.SN_AT, entity.getSn() );
// guard against npe
- myEntry.add( PW,
+ myEntry.add( SchemaConstants.USER_PASSWORD_AT,
VUtil.isNotNullOrEmpty( entity.getPassword() ) ? new String( entity.getPassword() ) : new String(
new char[]
{} ) );
- myEntry.add( DISPLAY_NAME, entity.getCn() );
+ myEntry.add( SchemaConstants.DISPLAY_NAME_AT, entity.getCn() );
if ( VUtil.isNotNullOrEmpty( entity.getTitle() ) )
{
- myEntry.add( TITLE, entity.getTitle() );
+ myEntry.add( SchemaConstants.TITLE_AT, entity.getTitle() );
}
if ( VUtil.isNotNullOrEmpty( entity.getEmployeeType() ) )
@@ -412,9 +365,9 @@ final class UserDAO extends ApacheDsDataProvider
// These are multi-valued attributes, use the util function to load.
// These items are optional. The utility function will return quietly if item list is empty:
- loadAttrs( entity.getPhones(), myEntry, TELEPHONE_NUMBER );
+ loadAttrs( entity.getPhones(), myEntry, SchemaConstants.TELEPHONE_NUMBER_AT );
loadAttrs( entity.getMobiles(), myEntry, MOBILE );
- loadAttrs( entity.getEmails(), myEntry, MAIL );
+ loadAttrs( entity.getEmails(), myEntry, SchemaConstants.MAIL_AT );
// The following attributes are optional:
if ( VUtil.isNotNullOrEmpty( entity.isSystem() ) )
@@ -436,7 +389,7 @@ final class UserDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
{
- myEntry.add( GlobalIds.DESC, entity.getDescription() );
+ myEntry.add( SchemaConstants.DESCRIPTION_AT, entity.getDescription() );
}
// props are optional as well:
@@ -496,7 +449,7 @@ final class UserDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( entity.getSn() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, SN, entity.getSn() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.SN_AT, entity.getSn() ) );
}
if ( VUtil.isNotNullOrEmpty( entity.getOu() ) )
@@ -508,13 +461,13 @@ final class UserDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( entity.getPassword() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, PW, new String( entity.getPassword() ) ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.USER_PASSWORD_AT, new String( entity.getPassword() ) ) );
}
if ( VUtil.isNotNullOrEmpty( entity.getDescription() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, GlobalIds.DESC, entity.getDescription() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.DESCRIPTION_AT, entity.getDescription() ) );
}
if ( VUtil.isNotNullOrEmpty( entity.getEmployeeType() ) )
@@ -526,7 +479,7 @@ final class UserDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( entity.getTitle() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, TITLE, entity.getTitle() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.TITLE_AT, entity.getTitle() ) );
}
if ( GlobalIds.IS_OPENLDAP && VUtil.isNotNullOrEmpty( entity.getPwPolicy() ) )
@@ -564,9 +517,9 @@ final class UserDAO extends ApacheDsDataProvider
loadAddress( entity.getAddress(), mods );
// These are multi-valued attributes, use the util function to load:
- loadAttrs( entity.getPhones(), mods, TELEPHONE_NUMBER );
+ loadAttrs( entity.getPhones(), mods, SchemaConstants.TELEPHONE_NUMBER_AT );
loadAttrs( entity.getMobiles(), mods, MOBILE );
- loadAttrs( entity.getEmails(), mods, MAIL );
+ loadAttrs( entity.getEmails(), mods, SchemaConstants.MAIL_AT );
if ( VUtil.isNotNullOrEmpty( entity.getJpegPhoto() ) )
{
@@ -1577,7 +1530,7 @@ final class UserDAO extends ApacheDsDataProvider
mods = new ArrayList<Modification>();
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, PW, new String( newPassword ) ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.USER_PASSWORD_AT, new String( newPassword ) ) );
modify( ld, userDn, mods );
@@ -1636,7 +1589,7 @@ final class UserDAO extends ApacheDsDataProvider
List<Modification> mods = new ArrayList<Modification>();
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, PW, new String( user.getPassword() ) ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.USER_PASSWORD_AT, new String( user.getPassword() ) ) );
mods.add( new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, OPENLDAP_PW_RESET, "TRUE" ) );
@@ -1942,22 +1895,22 @@ final class UserDAO extends ApacheDsDataProvider
User entity = new ObjectFactory().createUser();
entity.setSequenceId( sequence );
entity.setInternalId( getAttribute( entry, GlobalIds.FT_IID ) );
- entity.setDescription( getAttribute( entry, GlobalIds.DESC ) );
+ entity.setDescription( getAttribute( entry, SchemaConstants.DESCRIPTION_AT ) );
entity.setUserId( getAttribute( entry, SchemaConstants.UID_AT ) );
entity.setCn( getAttribute( entry, SchemaConstants.CN_AT ) );
entity.setName( entity.getCn() );
- entity.setSn( getAttribute( entry, SN ) );
+ entity.setSn( getAttribute( entry, SchemaConstants.SN_AT ) );
entity.setOu( getAttribute( entry, SchemaConstants.OU_AT ) );
entity.setDn( entry.getDn().getName() );
- entity.setTitle( getAttribute( entry, TITLE ) );
+ entity.setTitle( getAttribute( entry, SchemaConstants.TITLE_AT ) );
entity.setEmployeeType( getAttribute( entry, EMPLOYEE_TYPE ) );
unloadTemporal( entry, entity );
entity.setRoles( unloadUserRoles( entry, entity.getUserId(), contextId ) );
entity.setAdminRoles( unloadUserAdminRoles( entry, entity.getUserId(), contextId ) );
entity.setAddress( unloadAddress( entry ) );
- entity.setPhones( getAttributes( entry, TELEPHONE_NUMBER ) );
+ entity.setPhones( getAttributes( entry, SchemaConstants.TELEPHONE_NUMBER_AT ) );
entity.setMobiles( getAttributes( entry, MOBILE ) );
- entity.setEmails( getAttributes( entry, MAIL ) );
+ entity.setEmails( getAttributes( entry, SchemaConstants.MAIL_AT ) );
String szBoolean = getAttribute( entry, SYSTEM_USER );
if ( szBoolean != null )
{
@@ -2181,13 +2134,13 @@ final class UserDAO extends ApacheDsDataProvider
{
for ( String val : address.getAddresses() )
{
- entry.add( POSTAL_ADDRESS, val );
+ entry.add( SchemaConstants.POSTAL_ADDRESS_AT, val );
}
}
if ( VUtil.isNotNullOrEmpty( address.getCity() ) )
{
- entry.add( L, address.getCity() );
+ entry.add( SchemaConstants.L_AT, address.getCity() );
}
//if(VUtil.isNotNullOrEmpty(address.getCountry()))
@@ -2197,22 +2150,22 @@ final class UserDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( address.getPostalCode() ) )
{
- entry.add( POSTAL_CODE, address.getPostalCode() );
+ entry.add( SchemaConstants.POSTALCODE_AT, address.getPostalCode() );
}
if ( VUtil.isNotNullOrEmpty( address.getPostOfficeBox() ) )
{
- entry.add( POST_OFFICE_BOX, address.getPostOfficeBox() );
+ entry.add( SchemaConstants.POSTOFFICEBOX_AT, address.getPostOfficeBox() );
}
if ( VUtil.isNotNullOrEmpty( address.getState() ) )
{
- entry.add( STATE, address.getState() );
+ entry.add( SchemaConstants.ST_AT, address.getState() );
}
if ( VUtil.isNotNullOrEmpty( address.getBuilding() ) )
{
- entry.add( PHYSICAL_DELIVERY_OFFICE_NAME, address.getBuilding() );
+ entry.add( SchemaConstants.PHYSICAL_DELIVERY_OFFICE_NAME_AT, address.getBuilding() );
}
if ( VUtil.isNotNullOrEmpty( address.getDepartmentNumber() ) )
@@ -2241,43 +2194,43 @@ final class UserDAO extends ApacheDsDataProvider
if ( VUtil.isNotNullOrEmpty( address.getAddresses() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, POSTAL_ADDRESS ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.POSTAL_ADDRESS_AT ) );
for ( String val : address.getAddresses() )
{
mods.add( new DefaultModification(
- ModificationOperation.ADD_ATTRIBUTE, POSTAL_ADDRESS, val ) );
+ ModificationOperation.ADD_ATTRIBUTE, SchemaConstants.POSTAL_ADDRESS_AT, val ) );
}
}
if ( VUtil.isNotNullOrEmpty( address.getCity() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, L, address.getCity() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.L_AT, address.getCity() ) );
}
if ( VUtil.isNotNullOrEmpty( address.getPostalCode() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, POSTAL_CODE, address.getPostalCode() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.POSTALCODE_AT, address.getPostalCode() ) );
}
if ( VUtil.isNotNullOrEmpty( address.getPostOfficeBox() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, POST_OFFICE_BOX, address.getPostOfficeBox() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.POSTOFFICEBOX_AT, address.getPostOfficeBox() ) );
}
if ( VUtil.isNotNullOrEmpty( address.getState() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, STATE, address.getState() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.ST_AT, address.getState() ) );
}
if ( VUtil.isNotNullOrEmpty( address.getBuilding() ) )
{
mods.add( new DefaultModification(
- ModificationOperation.REPLACE_ATTRIBUTE, PHYSICAL_DELIVERY_OFFICE_NAME, address.getBuilding() ) );
+ ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.PHYSICAL_DELIVERY_OFFICE_NAME_AT, address.getBuilding() ) );
}
if ( VUtil.isNotNullOrEmpty( address.getDepartmentNumber() ) )
@@ -2306,7 +2259,7 @@ final class UserDAO extends ApacheDsDataProvider
private Address unloadAddress( Entry entry ) throws LdapInvalidAttributeValueException
{
Address addr = new ObjectFactory().createAddress();
- List<String> pAddrs = getAttributes( entry, POSTAL_ADDRESS );
+ List<String> pAddrs = getAttributes( entry, SchemaConstants.POSTAL_ADDRESS_AT );
if ( pAddrs != null )
{
@@ -2316,11 +2269,11 @@ final class UserDAO extends ApacheDsDataProvider
}
}
- addr.setCity( getAttribute( entry, L ) );
- addr.setState( getAttribute( entry, STATE ) );
- addr.setPostalCode( getAttribute( entry, POSTAL_CODE ) );
- addr.setPostOfficeBox( getAttribute( entry, POST_OFFICE_BOX ) );
- addr.setBuilding( getAttribute( entry, PHYSICAL_DELIVERY_OFFICE_NAME ) );
+ addr.setCity( getAttribute( entry, SchemaConstants.L_AT ) );
+ addr.setState( getAttribute( entry, SchemaConstants.ST_AT ) );
+ addr.setPostalCode( getAttribute( entry, SchemaConstants.POSTALCODE_AT ) );
+ addr.setPostOfficeBox( getAttribute( entry, SchemaConstants.POSTOFFICEBOX_AT ) );
+ addr.setBuilding( getAttribute( entry, SchemaConstants.PHYSICAL_DELIVERY_OFFICE_NAME_AT ) );
addr.setDepartmentNumber( getAttribute( entry, DEPARTMENT_NUMBER ) );
addr.setRoomNumber( getAttribute( entry, ROOM_NUMBER ) );
// todo: add support for country attribute
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/04f0a1a2/src/test/java/org/apache/directory/fortress/core/example/ExampleDAO.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/example/ExampleDAO.java b/src/test/java/org/apache/directory/fortress/core/example/ExampleDAO.java
index 8f2967b..4f39377 100755
--- a/src/test/java/org/apache/directory/fortress/core/example/ExampleDAO.java
+++ b/src/test/java/org/apache/directory/fortress/core/example/ExampleDAO.java
@@ -53,7 +53,7 @@ public class ExampleDAO extends ApacheDsDataProvider
private static final String CLS_NM = ExampleDAO.class.getName();
private static final org.slf4j.Logger LOG = LoggerFactory.getLogger( CLS_NM );
protected final static String[] EXAMPLE_ATRS = {
- GlobalIds.FT_IID, EIds.EXAMPLE_NM, GlobalIds.DESC, GlobalIds.CONSTRAINT
+ GlobalIds.FT_IID, EIds.EXAMPLE_NM, SchemaConstants.DESCRIPTION_AT, GlobalIds.CONSTRAINT
};
/**
@@ -103,7 +103,7 @@ public class ExampleDAO extends ApacheDsDataProvider
entry.add( EIds.EXAMPLE_NM, entity.getName() );
if (entity.getDescription() != null && entity.getDescription().length() > 0)
- entry.add( GlobalIds.DESC, entity.getDescription() );
+ entry.add( SchemaConstants.DESCRIPTION_AT, entity.getDescription() );
// organizational name requires CN attribute:
entry.add( SchemaConstants.CN_AT, entity.getName() );
@@ -148,7 +148,7 @@ public class ExampleDAO extends ApacheDsDataProvider
List<Modification> mods = new ArrayList<Modification>();
if (entity.getDescription() != null && entity.getDescription().length() > 0)
{
- mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, GlobalIds.DESC, entity.getDescription() ) );
+ mods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, SchemaConstants.DESCRIPTION_AT, entity.getDescription() ) );
}
@@ -314,7 +314,7 @@ public class ExampleDAO extends ApacheDsDataProvider
Example entity = new Example();
entity.setId( getAttribute( le, GlobalIds.FT_IID ) );
entity.setName(getAttribute(le, EIds.EXAMPLE_NM));
- entity.setDescription(getAttribute(le, GlobalIds.DESC));
+ entity.setDescription(getAttribute(le, SchemaConstants.DESCRIPTION_AT));
unloadTemporal(le, entity);
return entity;
}
[14/23] directory-fortress-core git commit: FC-54 - Benchmark
activities - add accessmgr console
Posted by sm...@apache.org.
FC-54 - Benchmark activities - add accessmgr console
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/7cc98592
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/7cc98592
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/7cc98592
Branch: refs/heads/master
Commit: 7cc98592fe12ade315ae55ebf00a78fb5f27bcc4
Parents: 64bfbe6
Author: Shawn McKinney <sm...@apache.org>
Authored: Mon Jan 5 14:12:41 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Mon Jan 5 14:12:41 2015 -0600
----------------------------------------------------------------------
.../fortress/core/AccelMgrConsole.java | 212 +++++++++++++++++++
.../fortress/core/ProcessMenuCommand.java | 75 +++++++
2 files changed, 287 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7cc98592/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java
new file mode 100644
index 0000000..d1e79b9
--- /dev/null
+++ b/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java
@@ -0,0 +1,212 @@
+/*
+ * 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;
+
+import org.apache.directory.fortress.core.rbac.TestUtils;
+import org.apache.directory.fortress.core.rbac.UserAdminRole;
+import org.apache.directory.fortress.core.rbac.Permission;
+import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.rbac.User;
+import org.apache.directory.fortress.core.rbac.UserRole;
+
+import java.util.Enumeration;
+import java.util.List;
+
+import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * * Test class for driving Fortress RBAC runtime policy APIs within a console.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+class AccelMgrConsole
+{
+ private AccelMgr am = null;
+ private Session session = null;
+ private static final String CLS_NM = AccelMgrConsole.class.getName();
+ private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
+
+ /**
+ * put your documentation comment here
+ */
+ public AccelMgrConsole()
+ {
+ try
+ {
+ am = AccelMgrFactory.createInstance( TestUtils.getContext() );
+ }
+ catch ( org.apache.directory.fortress.core.SecurityException e)
+ {
+ LOG.error("constructor caught SecurityException rc=" + e.getErrorId() + ", msg=" + e.getMessage(), e);
+ }
+ }
+
+
+ void createSession()
+ {
+ try
+ {
+ ReaderUtil.clearScreen();
+ System.out.println("Enter userId:");
+ String userId = ReaderUtil.readLn();
+ System.out.println("Enter password:");
+ String password = ReaderUtil.readLn();
+ session = am.createSession(new User(userId, password.toCharArray()), false);
+ System.out.println("Session created successfully for userId [" + userId + "]");
+ System.out.println("session [" + session + "]");
+ System.out.println("ENTER to continue");
+ }
+ catch (SecurityException e)
+ {
+ LOG.error("createSession caught SecurityException rc=" + e.getErrorId() + ", msg=" + e.getMessage(), e);
+ }
+ ReaderUtil.readChar();
+ }
+
+ /**
+ *
+ */
+ void checkAccess()
+ {
+ //Session session = null;
+ try
+ {
+ VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, "AccelMgrConsole.checkAccess");
+ ReaderUtil.clearScreen();
+ Permission perm = new Permission();
+ System.out.println("Enter object name:");
+ perm.setObjName( ReaderUtil.readLn() );
+ System.out.println("Enter operation name:");
+ perm.setOpName( ReaderUtil.readLn() );
+ System.out.println("Enter object id (or NULL to skip):");
+ String val = ReaderUtil.readLn();
+ if ( val != null && val.length() > 0 )
+ {
+ perm.setObjId( val );
+ }
+
+ boolean result = am.checkAccess( session, perm );
+ System.out.println("CheckAccess return [" + result + "] for user [" + session.getUserId() + "], objName [" + perm.getObjName() + "], operationName [" + perm.getOpName() + "]" +
+ ", objId [" + perm.getObjId() + "]");
+ System.out.println("ENTER to continue");
+ }
+ catch (SecurityException e)
+ {
+ LOG.error("checkAccess caught SecurityException rc=" + e.getErrorId() + ", msg=" + e.getMessage(), e);
+ }
+ ReaderUtil.readChar();
+ }
+
+ void sessionRoles()
+ {
+ try
+ {
+ VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, "AccelMgrConsole.sessionRoles");
+ ReaderUtil.clearScreen();
+ List<UserRole> roles = am.sessionRoles( session );
+ //System.out.println(" USER [" + session.getUserId() + "]:");
+ if (roles != null)
+ {
+ for (int i = 0; i < roles.size(); i++)
+ {
+ UserRole ur = roles.get(i);
+ System.out.println(" USER ROLE[" + i + "]:");
+ System.out.println(" role name [" + ur.getName() + "]");
+ System.out.println(" begin time [" + ur.getBeginTime() + "]");
+ System.out.println(" end time [" + ur.getEndTime() + "]");
+ System.out.println(" begin date [" + ur.getBeginDate() + "]");
+ System.out.println(" end date [" + ur.getEndDate() + "]");
+ System.out.println(" begin lock [" + ur.getBeginLockDate() + "]");
+ System.out.println(" end lock [" + ur.getEndLockDate() + "]");
+ System.out.println(" day mask [" + ur.getDayMask() + "]");
+ System.out.println(" time out [" + ur.getTimeout() + "]");
+ }
+ }
+
+ System.out.println("ENTER to continue");
+ }
+ catch (SecurityException e)
+ {
+ LOG.error("sessionRoles caught SecurityException=" + e, e);
+ }
+ ReaderUtil.readChar();
+ }
+
+
+ void addActiveRole()
+ {
+ try
+ {
+ VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, "AccelMgrConsole.addActiveRole");
+ ReaderUtil.clearScreen();
+ System.out.println("Enter role name");
+ String role = ReaderUtil.readLn();
+ am.addActiveRole(session, new UserRole(role));
+ System.out.println("addActiveRole successful");
+ System.out.println("ENTER to continue");
+ }
+ catch (SecurityException e)
+ {
+ LOG.error("addActiveRole caught SecurityException rc=" + e.getErrorId() + ", msg=" + e.getMessage(), e);
+ }
+ ReaderUtil.readChar();
+ }
+
+ void dropActiveRole()
+ {
+ try
+ {
+ VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, "AccelMgrConsole.dropActiveRole");
+ ReaderUtil.clearScreen();
+ System.out.println("Enter role name");
+ String role = ReaderUtil.readLn();
+ am.dropActiveRole( session, new UserRole( role ) );
+ System.out.println("dropActiveRole successful");
+ System.out.println("ENTER to continue");
+ }
+ catch (SecurityException e)
+ {
+ LOG.error("dropActiveRole caught SecurityException rc=" + e.getErrorId() + ", msg=" + e.getMessage(), e);
+ }
+ ReaderUtil.readChar();
+ }
+
+ void deleteSession()
+ {
+ try
+ {
+ VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, "AccelMgrConsole.deleteSession");
+ am.deleteSession( session );
+ System.out.println("deleteSession successful");
+ System.out.println("ENTER to continue");
+ }
+ catch (SecurityException e)
+ {
+ LOG.error("deleteSession caught SecurityException rc=" + e.getErrorId() + ", msg=" + e.getMessage(), e);
+ }
+ ReaderUtil.readChar();
+ }
+
+}
+
+
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7cc98592/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java b/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java
index 9506d57..3547d9a 100755
--- a/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java
+++ b/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java
@@ -36,6 +36,7 @@ class ProcessMenuCommand
final private AdminMgrConsole adminConsole = new AdminMgrConsole();
final private ReviewMgrConsole reviewConsole = new ReviewMgrConsole();
final private AccessMgrConsole accessConsole = new AccessMgrConsole();
+ final private AccelMgrConsole accelConsole = new AccelMgrConsole();
final private PolicyMgrConsole policyConsole = new PolicyMgrConsole();
final private AuditMgrConsole auditConsole = new AuditMgrConsole();
final private DelegatedAdminMgrConsole delAdminConsole = new DelegatedAdminMgrConsole();
@@ -63,6 +64,7 @@ class ProcessMenuCommand
System.out.println( "9. CONFIG MANAGER FUNCTIONS" );
System.out.println( "A. ENCRYPTION MANAGER FUNCTIONS" );
System.out.println( "B. GROUP MANAGER FUNCTIONS" );
+ System.out.println( "C. ACCEL MANAGER FUNCTIONS" );
System.out.println( "Enter q or Q to quit" );
}
@@ -118,6 +120,10 @@ class ProcessMenuCommand
case 'B':
processGroupManagerFunction();
break;
+ case 'c':
+ case 'C':
+ processAccelFunction();
+ break;
case 'q':
case 'Q':
done = true;
@@ -753,6 +759,75 @@ class ProcessMenuCommand
/**
*
*/
+ private void showAccelFunctionMenu()
+ {
+ ReaderUtil.clearScreen();
+ System.out.println( "CHOOSE ACCEL MANAGER FUNCTION" );
+ System.out.println( "1. Create Session" );
+ System.out.println( "2. Check Access - RBAC" );
+ System.out.println( "3. Session Roles" );
+ System.out.println( "4. Add Active Role to Session" );
+ System.out.println( "5. Drop Active Role from Session" );
+ System.out.println( "6. Delete Session" );
+ System.out.println( "Enter q or Q to return to previous menu" );
+ }
+
+
+ /**
+ *
+ */
+ void processAccelFunction()
+ {
+ BufferedReader br = new BufferedReader( new InputStreamReader( System.in ) );
+ boolean done = false;
+ int input;
+
+ try
+ {
+ while ( !done )
+ {
+ showAccelFunctionMenu();
+ input = br.read();
+ switch ( input )
+ {
+ case '1':
+ accelConsole.createSession();
+ break;
+ case '2':
+ accelConsole.checkAccess();
+ break;
+ case '3':
+ accelConsole.sessionRoles();
+ break;
+ case '4':
+ accelConsole.addActiveRole();
+ break;
+ case '5':
+ accelConsole.dropActiveRole();
+ break;
+ case '6':
+ accelConsole.deleteSession();
+ break;
+ case 'q':
+ case 'Q':
+ done = true;
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ catch ( Exception e )
+ {
+ LOG.error( "Exception caught in processAccelFunction = " + e );
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ *
+ */
void processPasswordPolicyFunction()
{
BufferedReader br = new BufferedReader( new InputStreamReader( System.in ) );
[08/23] directory-fortress-core git commit: FC-54 - Benchmark
activities - fix user pool config settings
Posted by sm...@apache.org.
FC-54 - Benchmark activities - fix user pool config settings
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/6df596de
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/6df596de
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/6df596de
Branch: refs/heads/master
Commit: 6df596dedd194b044f56ef5ecc159acf4d62d69c
Parents: 9d9649b
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Dec 23 11:47:19 2014 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Dec 23 11:47:19 2014 -0600
----------------------------------------------------------------------
build.xml | 7 +++++--
config/fortress.properties.src | 8 ++++----
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6df596de/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 1ac04d7..7a96b7a 100644
--- a/build.xml
+++ b/build.xml
@@ -856,8 +856,11 @@
<replace file="${dst.remote.conf}" token="@ADM_MAX_CONN@" value="${admin.max.conn}"/>
<replace file="${dst.remote.conf}" token="@LOG_ROOT_DN@" value="${log.admin.user}"/>
<replace file="${dst.remote.conf}" token="@CFG_LOG_ROOT_PW@" value="${log.admin.pw}"/>
+
<replace file="${dst.remote.conf}" token="@LOG_MIN_CONN@" value="${min.log.conn}"/>
<replace file="${dst.remote.conf}" token="@LOG_MAX_CONN@" value="${max.log.conn}"/>
+ <replace file="${dst.remote.conf}" token="@USR_MIN_CONN@" value="${user.min.conn}"/>
+ <replace file="${dst.remote.conf}" token="@USR_MAX_CONN@" value="${user.max.conn}"/>
<replace file="${dst.remote.conf}" token="@CFG_CRYPTO_PROP@" value="${crypto.prop}"/>
<replace file="${dst.remote.conf}" token="@ENABLE_REST@" value="${enable.mgr.impl.rest}"/>
<replace file="${dst.remote.conf}" token="@REST_HTTP_USER@" value="${http.user}"/>
@@ -873,6 +876,7 @@
<replace file="${dst.remote.conf}" token="@KEY_STORE@" value="${key.store}"/>
<replace file="${dst.remote.conf}" token="@KEY_STORE_PW@" value="${key.store.password}"/>
+
<echo message="############### Modify fortress load scripts per user settings ###############"/>
<delete file="${dst.load.bootstrap.script}"/>
<copy file="${src.load.bootstrap.script}" tofile="${dst.load.bootstrap.script}"/>
@@ -880,8 +884,7 @@
<replace file="${dst.load.bootstrap.script}" token="@SUFFIX_DC@" value="${suffix.dc}"/>
<replace file="${dst.load.bootstrap.script}" token="@SUFFIX_DC2@" value="${suffix.dc2}"/>
<replace file="${dst.load.bootstrap.script}" token="@SUFFIX@" value="${suffix}"/>
- <replace file="${dst.load.bootstrap.script}" token="@USR_MIN_CONN@" value="${log.min.conn}"/>
- <replace file="${dst.load.bootstrap.script}" token="@USR_MAX_CONN@" value="${log.max.conn}"/>
+
<replace file="${dst.load.bootstrap.script}" token="@SERVER_TYPE@" value="${ldap.server.type}"/>
<replace file="${dst.load.bootstrap.script}" token="@USERS_DN@" value="${users.dn}"/>
<replace file="${dst.load.bootstrap.script}" token="@GROUPS_DN@" value="${groups.dn}"/>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/6df596de/config/fortress.properties.src
----------------------------------------------------------------------
diff --git a/config/fortress.properties.src b/config/fortress.properties.src
index 06aa5f9..1e78e0d 100755
--- a/config/fortress.properties.src
+++ b/config/fortress.properties.src
@@ -43,16 +43,16 @@ admin.pw=@CFG_ROOT_PW@
min.admin.conn=@ADM_MIN_CONN@
max.admin.conn=@ADM_MAX_CONN@
-# This is min/max settings for LDAP administrator pool connections that have read/write access to all nodes under suffix:
-min.admin.conn=@ADM_MIN_CONN@
-max.admin.conn=@ADM_MAX_CONN@
+# This is min/max connection pool settings for LDAP User authentication connection pool:
+min.user.conn=@USR_MIN_CONN@
+max.user.conn=@USR_MAX_CONN@
# These credentials are used for read/write access to all nodes under slapd access log suffix:
log.admin.user=@LOG_ROOT_DN@
# For corresponding log user:
log.admin.pw=@CFG_LOG_ROOT_PW@
-# This is min/max settings for LDAP administrator pool connections that have read/write access to all nodes under suffix:
+# This is min/max settings for LDAP connections to read slapo access log:
min.log.conn=@LOG_MIN_CONN@
max.log.conn=@LOG_MAX_CONN@