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 2016/01/09 01:15:04 UTC
[1/5] directory-fortress-core git commit: fixed test classes
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 5d4d78923 -> dc5bd437e
fixed test classes
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/95f172c8
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/95f172c8
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/95f172c8
Branch: refs/heads/master
Commit: 95f172c8a234b6f504aaa47c0a76406ebe43d0e1
Parents: 830acef
Author: clp207 <cl...@psu.edu>
Authored: Tue Jan 5 13:21:14 2016 -0500
Committer: clp207 <cl...@psu.edu>
Committed: Fri Jan 8 14:51:37 2016 -0500
----------------------------------------------------------------------
.../fortress/core/impl/AdminRoleTestData.java | 4 +--
.../core/impl/accelerator/TestAccelerator.java | 27 +++++++++++---------
.../core/samples/CreateSessionSample.java | 17 ++++++------
3 files changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/95f172c8/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java b/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java
index 1019763..a2e29ca 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java
@@ -980,8 +980,8 @@ public class AdminRoleTestData extends TestCase
AdminRole role = ( AdminRole ) getRoleConstraint( rle );
role.setName( RoleTestData.getName( rle ) );
role.setDescription( RoleTestData.getDescription( rle ) );
- role.setOsU( getOsU( rle ) );
- role.setOsP( getOsP( rle ) );
+ role.setOsUList( getOsU( rle ) );
+ role.setOsPList( getOsP( rle ) );
role.setBeginRange( getBeginRange( rle ) );
role.setEndRange( getEndRange( rle ) );
role.setBeginInclusive( isBeginInclusive( rle ) );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/95f172c8/src/test/java/org/apache/directory/fortress/core/impl/accelerator/TestAccelerator.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/accelerator/TestAccelerator.java b/src/test/java/org/apache/directory/fortress/core/impl/accelerator/TestAccelerator.java
index 73826ba..c05da95 100644
--- a/src/test/java/org/apache/directory/fortress/core/impl/accelerator/TestAccelerator.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/accelerator/TestAccelerator.java
@@ -19,21 +19,24 @@
*/
package org.apache.directory.fortress.core.impl.accelerator;
-import org.apache.directory.fortress.core.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.apache.directory.fortress.core.AccelMgr;
+import org.apache.directory.fortress.core.AccelMgrFactory;
import org.apache.directory.fortress.core.SecurityException;
+import org.apache.directory.fortress.core.impl.TestUtils;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserRole;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.directory.fortress.core.AccelMgr;
-import org.apache.directory.fortress.core.model.Permission;
-import org.apache.directory.fortress.core.model.Session;
-import org.apache.directory.fortress.core.impl.TestUtils;
-import org.apache.directory.fortress.core.model.User;
-import org.apache.directory.fortress.core.model.UserRole;
-
-import static org.junit.Assert.*;
public class TestAccelerator
{
@@ -83,8 +86,8 @@ public class TestAccelerator
// positive test case:
user.setUserId( "rbacuser1" );
user.setPassword( "secret".toCharArray() );
- user.setRole( "rbacrole1" );
- user.setRole( "rbacrole2" );
+ user.setRoleName( "rbacrole1" );
+ user.setRoleName( "rbacrole2" );
session = accelMgr.createSession( user, false );
assertNotNull( session );
assertTrue( session.isAuthenticated() );
@@ -188,7 +191,7 @@ public class TestAccelerator
// positive test case:
user.setUserId( "rbacuser1" );
user.setPassword( "secret".toCharArray() );
- user.setRole( "rbacrole1" );
+ user.setRoleName( "rbacrole1" );
//user.setRole( "rbacrole2" );
session = accelMgr.createSession( user, false );
assertNotNull( session );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/95f172c8/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 0e889c4..1ecd077 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
@@ -19,23 +19,24 @@
*/
package org.apache.directory.fortress.core.samples;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
import org.apache.directory.fortress.core.AccessMgr;
import org.apache.directory.fortress.core.AccessMgrFactory;
+import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.PasswordException;
import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.impl.TestUtils;
-import org.apache.directory.fortress.core.model.User;
import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.User;
import org.apache.directory.fortress.core.model.UserRole;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.List;
-
/**
* CreateSessionSample JUnit Test. Fortress Sessions are modeled on the RBAC specification. Each Session
* may contain User attributes plus all of their activated Roles. The Session will also contain pw policy
@@ -230,7 +231,7 @@ public class CreateSessionSample extends TestCase
for (String roleName : roles)
{
// Add the Role name to list of Roles to be activated on Session.
- user.setRole(roleName);
+ user.setRoleName(roleName);
}
// The API will verify User is good and perform Role activations. Request will fail if User is locked out of ldap for any reason.
[2/5] directory-fortress-core git commit: changed method name to have
List isntead of 's'
Posted by sm...@apache.org.
changed method name to have List isntead of 's'
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/830acefb
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/830acefb
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/830acefb
Branch: refs/heads/master
Commit: 830acefbb6b99df94e3424f652fd9a8571b4bf19
Parents: 463c791
Author: clp207 <cl...@psu.edu>
Authored: Tue Jan 5 13:12:31 2016 -0500
Committer: clp207 <cl...@psu.edu>
Committed: Fri Jan 8 14:51:37 2016 -0500
----------------------------------------------------------------------
.../org/apache/directory/fortress/core/impl/AdminRoleDAO.java | 4 ++--
.../org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java | 4 ++--
src/main/java/org/apache/directory/fortress/core/impl/UserP.java | 4 ++--
.../java/org/apache/directory/fortress/core/model/AdminRole.java | 4 ++--
.../org/apache/directory/fortress/core/model/Administrator.java | 4 ++--
.../org/apache/directory/fortress/core/model/UserAdminRole.java | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/830acefb/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
index 49a3d17..4df4aa0 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
@@ -676,8 +676,8 @@ final class AdminRoleDAO extends ApacheDsDataProvider
entity.setId( getAttribute( le, GlobalIds.FT_IID ) );
entity.setDescription( getAttribute( le, SchemaConstants.DESCRIPTION_AT ) );
entity.setOccupants( getAttributes( le, ROLE_OCCUPANT ) );
- entity.setOsPs( getAttributeSet( le, ROLE_OSP ) );
- entity.setOsUs( getAttributeSet( le, ROLE_OSU ) );
+ entity.setOsPList( getAttributeSet( le, ROLE_OSP ) );
+ entity.setOsUList( getAttributeSet( le, ROLE_OSU ) );
entity.setName( getAttribute( le, SchemaConstants.CN_AT ) );
unloadTemporal( le, entity );
entity.setRoleRangeRaw( getAttribute( le, ROLE_RANGE ) );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/830acefb/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
index 8a9e45c..b690ebd 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
@@ -146,8 +146,8 @@ public final class DelAdminMgrImpl extends Manageable implements DelAdminMgr
UserAdminRole chgRole = new UserAdminRole();
chgRole.setName(role.getName());
chgRole.setUserId(ue.getUserId());
- chgRole.setOsPs(role.getOsP());
- chgRole.setOsUs(role.getOsU());
+ chgRole.setOsPList(role.getOsP());
+ chgRole.setOsUList(role.getOsU());
uaRoles.remove(chgRole);
ConstraintUtil.copy( re, chgRole );
uaRoles.add(chgRole);
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/830acefb/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
index 0a1ce88..f00b8fe 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
@@ -881,7 +881,7 @@ final class UserP
trgR.setBeginRange(srcR.getBeginRange());
trgR.setEndRange(srcR.getEndRange());
// copy the user and perm pools:
- trgR.setOsPs(srcR.getOsP());
- trgR.setOsUs(srcR.getOsU());
+ trgR.setOsPList(srcR.getOsP());
+ trgR.setOsUList(srcR.getOsU());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/830acefb/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
index ad39bc8..e320bec 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
@@ -313,7 +313,7 @@ public class AdminRole extends Role implements Administrator
* @param osPs is a List of type String containing Perm OU. This maps to 'ftOSP' attribute on 'ftPools' aux object class.
*/
@Override
- public void setOsPs( Set<String> osPs )
+ public void setOsPList( Set<String> osPs )
{
this.osPs = osPs;
}
@@ -354,7 +354,7 @@ public class AdminRole extends Role implements Administrator
* @param osUs is a List of type String containing User OU. This maps to 'ftOSU' attribute on 'ftPools' aux object class.
*/
@Override
- public void setOsUs( Set<String> osUs )
+ public void setOsUList( Set<String> osUs )
{
this.osUs = osUs;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/830acefb/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Administrator.java b/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
index 55db8e8..67871ec 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
@@ -45,7 +45,7 @@ public interface Administrator
*
* @param osPs is a List of type String containing Perm OU. This maps to 'ftOSP' attribute on 'ftPools' aux object class.
*/
- void setOsPs( Set<String> osPs );
+ void setOsPList( Set<String> osPs );
/**
@@ -69,7 +69,7 @@ public interface Administrator
*
* @param osUs is a List of type String containing User OU. This maps to 'ftOSU' attribute on 'ftPools' aux object class.
*/
- void setOsUs( Set<String> osUs );
+ void setOsUList( Set<String> osUs );
/**
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/830acefb/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
index 4bb60e4..7ed6d6e 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
@@ -425,7 +425,7 @@ public class UserAdminRole extends UserRole implements Administrator
* @param osPs is a List of type String containing Perm OU. This maps to 'ftARC' attribute on 'ftUserAttrs' aux object class.
*/
@Override
- public void setOsPs( Set<String> osPs )
+ public void setOsPList( Set<String> osPs )
{
this.osPs = osPs;
}
@@ -466,7 +466,7 @@ public class UserAdminRole extends UserRole implements Administrator
* @param osUs is a List of type String containing User OU. This maps to 'ftARC' attribute on 'ftUserAttrs' aux object class.
*/
@Override
- public void setOsUs( Set<String> osUs )
+ public void setOsUList( Set<String> osUs )
{
this.osUs = osUs;
}
[4/5] directory-fortress-core git commit: Merge branch 'master' of
https://github.com/PennState/directory-fortress-core-1
Posted by sm...@apache.org.
Merge branch 'master' of https://github.com/PennState/directory-fortress-core-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/9adc6110
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/9adc6110
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/9adc6110
Branch: refs/heads/master
Commit: 9adc6110d57d243ccbb5d77bd1f6b267a3f8c9b9
Parents: 5d4d789 95f172c
Author: Shawn McKinney <sm...@apache.org>
Authored: Fri Jan 8 15:17:55 2016 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Fri Jan 8 15:17:55 2016 -0600
----------------------------------------------------------------------
.../directory/fortress/core/cli/Options.java | 12 ++++-----
.../fortress/core/impl/AdminRoleDAO.java | 8 +++---
.../fortress/core/impl/DelAdminMgrImpl.java | 12 ++++-----
.../directory/fortress/core/impl/UserP.java | 19 +++++++-------
.../fortress/core/model/AdminRole.java | 4 +--
.../fortress/core/model/Administrator.java | 4 +--
.../directory/fortress/core/model/User.java | 4 +--
.../fortress/core/model/UserAdminRole.java | 4 +--
.../fortress/core/impl/AdminRoleTestData.java | 4 +--
.../core/impl/accelerator/TestAccelerator.java | 27 +++++++++++---------
.../core/samples/CreateSessionSample.java | 17 ++++++------
11 files changed, 59 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
[5/5] directory-fortress-core git commit: FC-135 - Rename ambigous
getter and setters names on User and UserAdminRole
Posted by sm...@apache.org.
FC-135 - Rename ambigous getter and setters names on User and UserAdminRole
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/dc5bd437
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/dc5bd437
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/dc5bd437
Branch: refs/heads/master
Commit: dc5bd437e5767828290e6899b428cea419b04d27
Parents: 9adc611
Author: Shawn McKinney <sm...@apache.org>
Authored: Fri Jan 8 18:14:49 2016 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Fri Jan 8 18:14:49 2016 -0600
----------------------------------------------------------------------
README.md | 1 -
pom.xml | 4 ++--
.../fortress/core/cli/CommandLineInterpreter.java | 8 ++++----
.../directory/fortress/core/impl/AdminRoleDAO.java | 12 ++++++------
.../directory/fortress/core/impl/AdminRoleP.java | 8 ++++----
.../fortress/core/impl/DelAccessMgrImpl.java | 4 ++--
.../fortress/core/impl/DelAdminMgrImpl.java | 4 ++--
.../apache/directory/fortress/core/impl/UserP.java | 4 ++--
.../directory/fortress/core/model/AdminRole.java | 8 ++++----
.../fortress/core/model/Administrator.java | 8 ++++----
.../fortress/core/model/UserAdminRole.java | 16 ++++++++--------
.../directory/fortress/core/AccessMgrConsole.java | 8 ++++----
.../fortress/core/DelegatedReviewMgrConsole.java | 12 ++++++------
.../directory/fortress/core/ReviewMgrConsole.java | 4 ++--
.../fortress/core/impl/AdminRoleTestData.java | 8 ++++----
.../fortress/core/samples/AccessMgrSample.java | 4 ++--
16 files changed, 56 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 39622d5..289fbfa 100755
--- a/README.md
+++ b/README.md
@@ -785,6 +785,5 @@ use the 'encrypt' ant target.
cfg.log.root.pw=wApnJUnuYZRBTF1zQNxX/Q==
```
-
___________________________________________________________________________________
#### END OF README
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 193e9f5..95ff80d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -608,9 +608,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <!--<artifactId>maven-javadoc-plugin</artifactId>-->
+ <artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
+ <!--<additionalparam>-Xdoclint:none</additionalparam>-->
<stylesheet>java</stylesheet>
<bottom><small>Copyright &copy; 2003-2015, The Apache Software Foundation. All Rights Reserved. Generated ${maven.build.timestamp}</small></bottom>
<overview>src/main/java/org/apache/directory/fortress/core/overview.html</overview>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/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 5a547bc..c7ad523 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
@@ -1421,13 +1421,13 @@ public class CommandLineInterpreter
{
printRow( type, "BEGR", ur.getBeginRange() );
printRow( type, "ENDR", ur.getEndRange() );
- if ( CollectionUtils.isNotEmpty( ur.getOsP() ) )
+ if ( CollectionUtils.isNotEmpty( ur.getOsPSet() ) )
{
- printRow( type, "POUS", "" + ur.getOsP() );
+ printRow( type, "POUS", "" + ur.getOsPSet() );
}
- if ( CollectionUtils.isNotEmpty( ur.getOsU() ) )
+ if ( CollectionUtils.isNotEmpty( ur.getOsUSet() ) )
{
- printRow( type, "UOUS", "" + ur.getOsU() );
+ printRow( type, "UOUS", "" + ur.getOsUSet() );
}
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
index 4df4aa0..7fe3094 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
@@ -173,8 +173,8 @@ final class AdminRoleDAO extends ApacheDsDataProvider
// CN attribute is required for this object class:
entry.add( SchemaConstants.CN_AT, entity.getName() );
entry.add( GlobalIds.CONSTRAINT, ConstraintUtil.setConstraint( entity ) );
- loadAttrs( entity.getOsP(), entry, ROLE_OSP );
- loadAttrs( entity.getOsU(), entry, ROLE_OSU );
+ loadAttrs( entity.getOsPSet(), entry, ROLE_OSP );
+ loadAttrs( entity.getOsUSet(), entry, ROLE_OSU );
String szRaw = entity.getRoleRangeRaw();
if ( StringUtils.isNotEmpty( szRaw ) )
@@ -246,8 +246,8 @@ final class AdminRoleDAO extends ApacheDsDataProvider
}
}
- loadAttrs( entity.getOsU(), mods, ROLE_OSU );
- loadAttrs( entity.getOsP(), mods, ROLE_OSP );
+ loadAttrs( entity.getOsUSet(), mods, ROLE_OSU );
+ loadAttrs( entity.getOsPSet(), mods, ROLE_OSP );
String szRaw = entity.getRoleRangeRaw();
if ( StringUtils.isNotEmpty( szRaw ) )
@@ -676,8 +676,8 @@ final class AdminRoleDAO extends ApacheDsDataProvider
entity.setId( getAttribute( le, GlobalIds.FT_IID ) );
entity.setDescription( getAttribute( le, SchemaConstants.DESCRIPTION_AT ) );
entity.setOccupants( getAttributes( le, ROLE_OCCUPANT ) );
- entity.setOsPList( getAttributeSet( le, ROLE_OSP ) );
- entity.setOsUList( getAttributeSet( le, ROLE_OSU ) );
+ entity.setOsPSet( getAttributeSet( le, ROLE_OSP ) );
+ entity.setOsUSet( getAttributeSet( le, ROLE_OSU ) );
entity.setName( getAttribute( le, SchemaConstants.CN_AT ) );
unloadTemporal( le, entity );
entity.setRoleRangeRaw( getAttribute( le, ROLE_RANGE ) );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
index fc96d7a..8a16107 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
@@ -393,14 +393,14 @@ public final class AdminRoleP
constraintValidator.endDate( entity.getEndLockDate() );
}
- if ( CollectionUtils.isNotEmpty( entity.getOsU() ) )
+ if ( CollectionUtils.isNotEmpty( entity.getOsUSet() ) )
{
- validateOrgs( entity.getOsU(), OrgUnit.Type.USER, entity.getContextId() );
+ validateOrgs( entity.getOsUSet(), OrgUnit.Type.USER, entity.getContextId() );
}
- if ( CollectionUtils.isNotEmpty( entity.getOsP() ) )
+ if ( CollectionUtils.isNotEmpty( entity.getOsPSet() ) )
{
- validateOrgs( entity.getOsP(), OrgUnit.Type.PERM, entity.getContextId() );
+ validateOrgs( entity.getOsPSet(), OrgUnit.Type.PERM, entity.getContextId() );
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/src/main/java/org/apache/directory/fortress/core/impl/DelAccessMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/DelAccessMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/DelAccessMgrImpl.java
index 31d1b66..975d24a 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/DelAccessMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/DelAccessMgrImpl.java
@@ -264,7 +264,7 @@ public class DelAccessMgrImpl extends AccessMgrImpl implements DelAccessMgr
result = true;
break;
}
- Set<String> osUs = uaRole.getOsU();
+ Set<String> osUs = uaRole.getOsUSet();
if(CollectionUtils.isNotEmpty( osUs ))
{
// create Set with case insensitive comparator:
@@ -338,7 +338,7 @@ public class DelAccessMgrImpl extends AccessMgrImpl implements DelAccessMgr
result = true;
break;
}
- Set<String> osPs = uaRole.getOsP();
+ Set<String> osPs = uaRole.getOsPSet();
if(CollectionUtils.isNotEmpty( osPs ))
{
// create Set with case insensitive comparator:
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
index b690ebd..3e10247 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
@@ -146,8 +146,8 @@ public final class DelAdminMgrImpl extends Manageable implements DelAdminMgr
UserAdminRole chgRole = new UserAdminRole();
chgRole.setName(role.getName());
chgRole.setUserId(ue.getUserId());
- chgRole.setOsPList(role.getOsP());
- chgRole.setOsUList(role.getOsU());
+ chgRole.setOsPSet( role.getOsPSet() );
+ chgRole.setOsUSet( role.getOsUSet() );
uaRoles.remove(chgRole);
ConstraintUtil.copy( re, chgRole );
uaRoles.add(chgRole);
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
index f00b8fe..f5be195 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
@@ -881,7 +881,7 @@ final class UserP
trgR.setBeginRange(srcR.getBeginRange());
trgR.setEndRange(srcR.getEndRange());
// copy the user and perm pools:
- trgR.setOsPList(srcR.getOsP());
- trgR.setOsUList(srcR.getOsU());
+ trgR.setOsPSet( srcR.getOsPSet() );
+ trgR.setOsUSet( srcR.getOsUSet() );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
index e320bec..6c2270d 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
@@ -301,7 +301,7 @@ public class AdminRole extends Role implements Administrator
* @return List of type String containing Perm OU. This maps to 'ftOSP' attribute on 'ftPools' aux object class.
*/
@Override
- public Set<String> getOsP()
+ public Set<String> getOsPSet()
{
return osPs;
}
@@ -313,7 +313,7 @@ public class AdminRole extends Role implements Administrator
* @param osPs is a List of type String containing Perm OU. This maps to 'ftOSP' attribute on 'ftPools' aux object class.
*/
@Override
- public void setOsPList( Set<String> osPs )
+ public void setOsPSet(Set<String> osPs)
{
this.osPs = osPs;
}
@@ -342,7 +342,7 @@ public class AdminRole extends Role implements Administrator
* @return List of type String containing User OU. This maps to 'ftOSU' attribute on 'ftPools' aux object class.
*/
@Override
- public Set<String> getOsU()
+ public Set<String> getOsUSet()
{
return osUs;
}
@@ -354,7 +354,7 @@ public class AdminRole extends Role implements Administrator
* @param osUs is a List of type String containing User OU. This maps to 'ftOSU' attribute on 'ftPools' aux object class.
*/
@Override
- public void setOsUList( Set<String> osUs )
+ public void setOsUSet(Set<String> osUs)
{
this.osUs = osUs;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Administrator.java b/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
index 67871ec..7e31c50 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
@@ -37,7 +37,7 @@ public interface Administrator
*
* @return List of type String containing Perm OU. This maps to 'ftOSP' attribute on 'ftPools' aux object class.
*/
- Set<String> getOsP();
+ Set<String> getOsPSet();
/**
@@ -45,7 +45,7 @@ public interface Administrator
*
* @param osPs is a List of type String containing Perm OU. This maps to 'ftOSP' attribute on 'ftPools' aux object class.
*/
- void setOsPList( Set<String> osPs );
+ void setOsPSet(Set<String> osPs);
/**
@@ -61,7 +61,7 @@ public interface Administrator
*
* @return List of type String containing User OU. This maps to 'ftOSU' attribute on 'ftPools' aux object class.
*/
- Set<String> getOsU();
+ Set<String> getOsUSet();
/**
@@ -69,7 +69,7 @@ public interface Administrator
*
* @param osUs is a List of type String containing User OU. This maps to 'ftOSU' attribute on 'ftPools' aux object class.
*/
- void setOsUList( Set<String> osUs );
+ void setOsUSet(Set<String> osUs);
/**
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
index 7ed6d6e..7b3b557 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
@@ -300,9 +300,9 @@ public class UserAdminRole extends UserRole implements Administrator
sb.append( this.getDayMask() );
}
- if ( this.getOsU() != null )
+ if ( this.getOsUSet() != null )
{
- for ( String org : this.getOsU() )
+ for ( String org : this.getOsUSet() )
{
sb.append( GlobalIds.DELIMITER );
sb.append( U );
@@ -311,9 +311,9 @@ public class UserAdminRole extends UserRole implements Administrator
}
}
- if ( this.getOsP() != null )
+ if ( this.getOsPSet() != null )
{
- for ( String org : this.getOsP() )
+ for ( String org : this.getOsPSet() )
{
sb.append( GlobalIds.DELIMITER );
sb.append( P );
@@ -413,7 +413,7 @@ public class UserAdminRole extends UserRole implements Administrator
* @return List of type String containing Perm OU. This maps to 'ftARC' attribute on 'ftUserAttrs' aux object class.
*/
@Override
- public Set<String> getOsP()
+ public Set<String> getOsPSet()
{
return osPs;
}
@@ -425,7 +425,7 @@ public class UserAdminRole extends UserRole implements Administrator
* @param osPs is a List of type String containing Perm OU. This maps to 'ftARC' attribute on 'ftUserAttrs' aux object class.
*/
@Override
- public void setOsPList( Set<String> osPs )
+ public void setOsPSet(Set<String> osPs)
{
this.osPs = osPs;
}
@@ -454,7 +454,7 @@ public class UserAdminRole extends UserRole implements Administrator
* @return List of type String containing User OU. This maps to 'ftARC' attribute on 'ftUserAttrs' aux object class.
*/
@Override
- public Set<String> getOsU()
+ public Set<String> getOsUSet()
{
return osUs;
}
@@ -466,7 +466,7 @@ public class UserAdminRole extends UserRole implements Administrator
* @param osUs is a List of type String containing User OU. This maps to 'ftARC' attribute on 'ftUserAttrs' aux object class.
*/
@Override
- public void setOsUList( Set<String> osUs )
+ public void setOsUSet(Set<String> osUs)
{
this.osUs = osUs;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/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 a3b6a1e..3aaa646 100755
--- a/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
@@ -343,8 +343,8 @@ class AccessMgrConsole
UserAdminRole ur = aRoles.get(i);
System.out.println(" USER ADMIN ROLE[" + i + "]:");
System.out.println(" admin role name [" + ur.getName() + "]");
- System.out.println(" OsU [" + ur.getOsU() + "]");
- System.out.println(" OsP [" + ur.getOsP() + "]");
+ System.out.println(" OsU [" + ur.getOsUSet() + "]");
+ System.out.println(" OsP [" + ur.getOsPSet() + "]");
System.out.println(" begin range [" + ur.getBeginRange() + "]");
System.out.println(" end range [" + ur.getEndRange() + "]");
System.out.println(" begin time [" + ur.getBeginTime() + "]");
@@ -530,8 +530,8 @@ class AccessMgrConsole
UserAdminRole ur = aRoles.get(i);
System.out.println(" USER ADMIN ROLE[" + i + "]:");
System.out.println(" admin role name [" + ur.getName() + "]");
- System.out.println(" OsU [" + ur.getOsU() + "]");
- System.out.println(" OsP [" + ur.getOsP() + "]");
+ System.out.println(" OsU [" + ur.getOsUSet() + "]");
+ System.out.println(" OsP [" + ur.getOsPSet() + "]");
System.out.println(" begin range [" + ur.getBeginRange() + "]");
System.out.println(" end range [" + ur.getEndRange() + "]");
System.out.println(" begin time [" + ur.getBeginTime() + "]");
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/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 034184c..f425d52 100755
--- a/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java
@@ -77,8 +77,8 @@ class DelegatedReviewMgrConsole
System.out.println( " name [" + re.getName() + "]" );
System.out.println( " internalId [" + re.getId() + "]" );
System.out.println( " description [" + re.getDescription() + "]" );
- System.out.println( " osU [" + re.getOsU() + "]" );
- System.out.println( " osP [" + re.getOsP() + "]" );
+ System.out.println( " osU [" + re.getOsUSet() + "]" );
+ System.out.println( " osP [" + re.getOsPSet() + "]" );
ReviewMgrConsole.printTemporal( re, "ADMINROLE" );
}
else
@@ -112,8 +112,8 @@ class DelegatedReviewMgrConsole
System.out.println( " name [" + re.getName() + "]" );
System.out.println( " internalId [" + re.getId() + "]" );
System.out.println( " description [" + re.getDescription() + "]" );
- System.out.println( " osU [" + re.getOsU() + "]" );
- System.out.println( " osP [" + re.getOsP() + "]" );
+ System.out.println( " osU [" + re.getOsUSet() + "]" );
+ System.out.println( " osP [" + re.getOsPSet() + "]" );
ReviewMgrConsole.printTemporal( re, "ADMINROLE" );
}
}
@@ -183,8 +183,8 @@ class DelegatedReviewMgrConsole
{
System.out.println( "USER OBJECT:" );
System.out.println( " admin role [" + re.getName() + "]" );
- System.out.println( " OsU [" + re.getOsU() + "]" );
- System.out.println( " OsP [" + re.getOsP() + "]" );
+ System.out.println( " OsU [" + re.getOsUSet() + "]" );
+ System.out.println( " OsP [" + re.getOsPSet() + "]" );
ReviewMgrConsole.printTemporal( re, "ADMINROLE" );
}
System.out.println( "ENTER to continue" );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/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 4a5bee2..b91c213 100755
--- a/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
@@ -513,8 +513,8 @@ class ReviewMgrConsole
System.out.println( " ADMINATTR UID[" + ur.getUserId() + "]:" );
System.out.println( " begin range [" + ur.getBeginRange() + "]" );
System.out.println( " end range [" + ur.getEndRange() + "]" );
- System.out.println( " OsP [" + ur.getOsP() + "]" );
- System.out.println( " OsU [" + ur.getOsU() + "]" );
+ System.out.println( " OsP [" + ur.getOsPSet() + "]" );
+ System.out.println( " OsU [" + ur.getOsUSet() + "]" );
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java b/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java
index a2e29ca..a0afe92 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java
@@ -900,7 +900,7 @@ public class AdminRoleTestData extends TestCase
private final static int OSP = 18;
- private static Set<String> getOsU( String[] rle )
+ private static Set<String> getOsUSet(String[] rle)
{
Set<String> members = new HashSet<>();
if ( StringUtils.isNotEmpty( rle[OSU] ) )
@@ -919,7 +919,7 @@ public class AdminRoleTestData extends TestCase
}
- private static Set<String> getOsP( String[] rle )
+ private static Set<String> getOsPSet(String[] rle)
{
Set<String> members = new HashSet<>();
if ( StringUtils.isNotEmpty( rle[OSP] ) )
@@ -980,8 +980,8 @@ public class AdminRoleTestData extends TestCase
AdminRole role = ( AdminRole ) getRoleConstraint( rle );
role.setName( RoleTestData.getName( rle ) );
role.setDescription( RoleTestData.getDescription( rle ) );
- role.setOsUList( getOsU( rle ) );
- role.setOsPList( getOsP( rle ) );
+ role.setOsUSet( getOsUSet( rle ) );
+ role.setOsPSet( getOsPSet( rle ) );
role.setBeginRange( getBeginRange( rle ) );
role.setEndRange( getEndRange( rle ) );
role.setBeginInclusive( isBeginInclusive( rle ) );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/dc5bd437/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 daf0350..c787e37 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
@@ -361,8 +361,8 @@ public class AccessMgrSample extends TestCase
UserAdminRole ur = aRoles.get( i );
LOG.info( " USER ADMIN ROLE[" + i + "]:" );
LOG.info( " admin role name [" + ur.getName() + "]" );
- LOG.info( " OsU [" + ur.getOsU() + "]" );
- LOG.info( " OsP [" + ur.getOsP() + "]" );
+ LOG.info( " OsU [" + ur.getOsUSet() + "]" );
+ LOG.info( " OsP [" + ur.getOsPSet() + "]" );
LOG.info( " begin range [" + ur.getBeginRange() + "]" );
LOG.info( " end range [" + ur.getEndRange() + "]" );
LOG.info( " begin time [" + ur.getBeginTime() + "]" );
[3/5] directory-fortress-core git commit: renamed set methods with
same name in models
Posted by sm...@apache.org.
renamed set methods with same name in models
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/463c7912
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/463c7912
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/463c7912
Branch: refs/heads/master
Commit: 463c7912ae4428ca0b839be1cee1ce41cc8ae76e
Parents: af716a3
Author: clp207 <cl...@psu.edu>
Authored: Tue Jan 5 12:01:31 2016 -0500
Committer: clp207 <cl...@psu.edu>
Committed: Fri Jan 8 14:51:37 2016 -0500
----------------------------------------------------------------------
.../directory/fortress/core/cli/Options.java | 12 ++++++------
.../fortress/core/impl/AdminRoleDAO.java | 8 ++++----
.../fortress/core/impl/DelAdminMgrImpl.java | 12 ++++++------
.../directory/fortress/core/impl/UserP.java | 19 +++++++++----------
.../directory/fortress/core/model/AdminRole.java | 4 ++--
.../fortress/core/model/Administrator.java | 4 ++--
.../directory/fortress/core/model/User.java | 4 ++--
.../fortress/core/model/UserAdminRole.java | 4 ++--
8 files changed, 33 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/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 f229766..9990a8d 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
@@ -19,11 +19,14 @@
*/
package org.apache.directory.fortress.core.cli;
+import java.util.Vector;
+
import org.apache.commons.lang.StringUtils;
import org.apache.directory.fortress.core.GlobalIds;
-import org.apache.directory.fortress.core.model.Group;
import org.apache.directory.fortress.core.model.Address;
import org.apache.directory.fortress.core.model.AdminRole;
+import org.apache.directory.fortress.core.model.Constraint;
+import org.apache.directory.fortress.core.model.Group;
import org.apache.directory.fortress.core.model.OrgUnit;
import org.apache.directory.fortress.core.model.PermObj;
import org.apache.directory.fortress.core.model.Permission;
@@ -31,9 +34,6 @@ import org.apache.directory.fortress.core.model.Relationship;
import org.apache.directory.fortress.core.model.Role;
import org.apache.directory.fortress.core.model.SDSet;
import org.apache.directory.fortress.core.model.User;
-import org.apache.directory.fortress.core.model.Constraint;
-
-import java.util.Vector;
/**
* This converts between Fortress entities and the JArg Options. It contains attributes passed from JArgs command interpreter.
@@ -411,7 +411,7 @@ public class Options implements java.io.Serializable
for (Object raw : fractionValues)
{
String szRaw = (String) raw;
- user.setRole(szRaw);
+ user.setRoleName(szRaw);
}
}
}
@@ -437,7 +437,7 @@ public class Options implements java.io.Serializable
for (Object raw : fractionValues)
{
String szRaw = (String) raw;
- user.setAdminRole(szRaw);
+ user.setAdminRoleName(szRaw);
}
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
index 999662f..49a3d17 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
@@ -41,13 +41,13 @@ import org.apache.directory.fortress.core.CreateException;
import org.apache.directory.fortress.core.FinderException;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
-import org.apache.directory.fortress.core.model.ConstraintUtil;
-import org.apache.directory.fortress.core.model.ObjectFactory;
import org.apache.directory.fortress.core.RemoveException;
import org.apache.directory.fortress.core.UpdateException;
import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
import org.apache.directory.fortress.core.model.AdminRole;
+import org.apache.directory.fortress.core.model.ConstraintUtil;
import org.apache.directory.fortress.core.model.Graphable;
+import org.apache.directory.fortress.core.model.ObjectFactory;
import org.apache.directory.fortress.core.model.Role;
import org.apache.directory.ldap.client.api.LdapConnection;
@@ -676,8 +676,8 @@ final class AdminRoleDAO extends ApacheDsDataProvider
entity.setId( getAttribute( le, GlobalIds.FT_IID ) );
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 ) );
+ entity.setOsPs( getAttributeSet( le, ROLE_OSP ) );
+ entity.setOsUs( getAttributeSet( le, ROLE_OSU ) );
entity.setName( getAttribute( le, SchemaConstants.CN_AT ) );
unloadTemporal( le, entity );
entity.setRoleRangeRaw( getAttribute( le, ROLE_RANGE ) );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
index cf79a09..8a9e45c 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
@@ -19,12 +19,15 @@
*/
package org.apache.directory.fortress.core.impl;
+import java.util.List;
+import java.util.Set;
+
import org.apache.commons.collections.CollectionUtils;
import org.apache.directory.fortress.core.AdminMgr;
import org.apache.directory.fortress.core.AdminMgrFactory;
import org.apache.directory.fortress.core.DelAdminMgr;
-import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.GlobalErrIds;
+import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.model.AdminRole;
import org.apache.directory.fortress.core.model.ConstraintUtil;
import org.apache.directory.fortress.core.model.Hier;
@@ -36,9 +39,6 @@ import org.apache.directory.fortress.core.model.User;
import org.apache.directory.fortress.core.model.UserAdminRole;
import org.apache.directory.fortress.core.util.VUtil;
-import java.util.List;
-import java.util.Set;
-
/**
* This class implements the ARBAC02 DelAdminMgr interface for performing policy administration of Fortress ARBAC entities
* that reside in LDAP directory.
@@ -146,8 +146,8 @@ public final class DelAdminMgrImpl extends Manageable implements DelAdminMgr
UserAdminRole chgRole = new UserAdminRole();
chgRole.setName(role.getName());
chgRole.setUserId(ue.getUserId());
- chgRole.setOsP(role.getOsP());
- chgRole.setOsU(role.getOsU());
+ chgRole.setOsPs(role.getOsP());
+ chgRole.setOsUs(role.getOsU());
uaRoles.remove(chgRole);
ConstraintUtil.copy( re, chgRole );
uaRoles.add(chgRole);
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
index b947879..0a1ce88 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
@@ -27,9 +27,15 @@ import java.util.Set;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.directory.fortress.core.GlobalErrIds;
+import org.apache.directory.fortress.core.GlobalIds;
+import org.apache.directory.fortress.core.PasswordException;
+import org.apache.directory.fortress.core.SecurityException;
+import org.apache.directory.fortress.core.ValidationException;
import org.apache.directory.fortress.core.model.AdminRole;
import org.apache.directory.fortress.core.model.Administrator;
import org.apache.directory.fortress.core.model.ConstraintUtil;
+import org.apache.directory.fortress.core.model.ObjectFactory;
import org.apache.directory.fortress.core.model.OrgUnit;
import org.apache.directory.fortress.core.model.PwPolicy;
import org.apache.directory.fortress.core.model.Role;
@@ -37,17 +43,10 @@ import org.apache.directory.fortress.core.model.Session;
import org.apache.directory.fortress.core.model.User;
import org.apache.directory.fortress.core.model.UserAdminRole;
import org.apache.directory.fortress.core.model.UserRole;
+import org.apache.directory.fortress.core.util.VUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.directory.fortress.core.GlobalErrIds;
-import org.apache.directory.fortress.core.GlobalIds;
-import org.apache.directory.fortress.core.model.ObjectFactory;
-import org.apache.directory.fortress.core.PasswordException;
-import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.ValidationException;
-import org.apache.directory.fortress.core.util.VUtil;
-
/**
* Process module for the User entity. This class performs data validations and error mapping. It is typically called
@@ -882,7 +881,7 @@ final class UserP
trgR.setBeginRange(srcR.getBeginRange());
trgR.setEndRange(srcR.getEndRange());
// copy the user and perm pools:
- trgR.setOsP(srcR.getOsP());
- trgR.setOsU(srcR.getOsU());
+ trgR.setOsPs(srcR.getOsP());
+ trgR.setOsUs(srcR.getOsU());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
index 7c64471..ad39bc8 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
@@ -313,7 +313,7 @@ public class AdminRole extends Role implements Administrator
* @param osPs is a List of type String containing Perm OU. This maps to 'ftOSP' attribute on 'ftPools' aux object class.
*/
@Override
- public void setOsP( Set<String> osPs )
+ public void setOsPs( Set<String> osPs )
{
this.osPs = osPs;
}
@@ -354,7 +354,7 @@ public class AdminRole extends Role implements Administrator
* @param osUs is a List of type String containing User OU. This maps to 'ftOSU' attribute on 'ftPools' aux object class.
*/
@Override
- public void setOsU( Set<String> osUs )
+ public void setOsUs( Set<String> osUs )
{
this.osUs = osUs;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Administrator.java b/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
index 4d9551d..55db8e8 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
@@ -45,7 +45,7 @@ public interface Administrator
*
* @param osPs is a List of type String containing Perm OU. This maps to 'ftOSP' attribute on 'ftPools' aux object class.
*/
- void setOsP( Set<String> osPs );
+ void setOsPs( Set<String> osPs );
/**
@@ -69,7 +69,7 @@ public interface Administrator
*
* @param osUs is a List of type String containing User OU. This maps to 'ftOSU' attribute on 'ftPools' aux object class.
*/
- void setOsU( Set<String> osUs );
+ void setOsUs( Set<String> osUs );
/**
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/src/main/java/org/apache/directory/fortress/core/model/User.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/User.java b/src/main/java/org/apache/directory/fortress/core/model/User.java
index b69ab53..eb13b95 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/User.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/User.java
@@ -690,7 +690,7 @@ public class User extends FortEntity implements Constraint, Serializable
*
* @param roleName contains role name to target for activation into {@link org.apache.directory.fortress.core.model.Session}.
*/
- public void setRole( String roleName )
+ public void setRoleName( String roleName )
{
if ( roles == null )
{
@@ -764,7 +764,7 @@ public class User extends FortEntity implements Constraint, Serializable
*
* @param roleName contrains adminRole name.
*/
- public void setAdminRole( String roleName )
+ public void setAdminRoleName( String roleName )
{
if ( adminRoles == null )
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
index a88e9a1..4bb60e4 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
@@ -425,7 +425,7 @@ public class UserAdminRole extends UserRole implements Administrator
* @param osPs is a List of type String containing Perm OU. This maps to 'ftARC' attribute on 'ftUserAttrs' aux object class.
*/
@Override
- public void setOsP( Set<String> osPs )
+ public void setOsPs( Set<String> osPs )
{
this.osPs = osPs;
}
@@ -466,7 +466,7 @@ public class UserAdminRole extends UserRole implements Administrator
* @param osUs is a List of type String containing User OU. This maps to 'ftARC' attribute on 'ftUserAttrs' aux object class.
*/
@Override
- public void setOsU( Set<String> osUs )
+ public void setOsUs( Set<String> osUs )
{
this.osUs = osUs;
}