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/02/11 15:52:55 UTC
directory-fortress-core git commit: FC-62 - Update ant dependencies
Repository: directory-fortress-core
Updated Branches:
refs/heads/master fc30b3d60 -> c49e1ad3d
FC-62 - Update ant dependencies
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/c49e1ad3
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/c49e1ad3
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/c49e1ad3
Branch: refs/heads/master
Commit: c49e1ad3d4ecb4b319e34ff37612d8b850f8670a
Parents: fc30b3d
Author: Shawn McKinney <sm...@apache.org>
Authored: Wed Feb 11 08:52:43 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Wed Feb 11 08:52:43 2015 -0600
----------------------------------------------------------------------
build.xml | 4 +-
ivy.xml | 4 +-
.../core/DelegatedAccessMgrConsole.java | 62 ++++++++++++++++++++
.../fortress/core/ProcessMenuCommand.java | 4 ++
4 files changed, 70 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/c49e1ad3/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4695aad..615db45 100644
--- a/build.xml
+++ b/build.xml
@@ -173,8 +173,8 @@
<property name="slf4j-log4j.jar" value="${lib.dir}/slf4j-log4j12-1.7.5.jar"/>
<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.jar"/>
+ <property name="apacheds-all.jar" value="${lib.dir}/apacheds-all-2.0.0-M19.jar"/>
+ <property name="apacheds-api-all.jar" value="${lib.dir}/api-all-1.0.0-M28.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/c49e1ad3/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 22919de..923d587 100755
--- a/ivy.xml
+++ b/ivy.xml
@@ -48,8 +48,8 @@
<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-M27" conf="default->master"/>
- <dependency org="org.apache.directory.server" name="apacheds-all" rev="2.0.0-M18" conf="default->master"/>
+ <dependency org="org.apache.directory.api" name="api-all" rev="1.0.0-M28" conf="default->master"/>
+ <dependency org="org.apache.directory.server" name="apacheds-all" rev="2.0.0-M19" 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" />
<dependency org="org.apache.jmeter" name="ApacheJMeter_java" rev="2.11" conf="default->master" />
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/c49e1ad3/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java
index c16e912..caa7651 100755
--- a/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java
@@ -29,6 +29,9 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Enumeration;
+import java.util.List;
+
/**
* This class is used to test drive the Fortress Delegated Access Control APIs.
@@ -213,4 +216,63 @@ class DelegatedAccessMgrConsole
ReaderUtil.readChar();
}
+ void sessionPermissions()
+ {
+ try
+ {
+ VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, "DelegatedAccessMgrConsole.sessionPermissions");
+ ReaderUtil.clearScreen();
+ List<Permission> list = dAmgr.sessionPermissions(session);
+
+ //List list = rm.findPermissions(pe);
+ if (list != null)
+ {
+ int i = 0;
+ for (Permission pe : list)
+ {
+ //pe = (Permission) list.get(i);
+ System.out.println("**perm:" + (i++) + "***");
+ System.out.println("object name [" + pe.getObjName() + "]");
+ System.out.println("object id [" + pe.getObjId() + "]");
+ System.out.println("operation name [" + pe.getOpName() + "]");
+ System.out.println("abstract perm name [" + pe.getAbstractName() + "]");
+ System.out.println("internalId [" + pe.getInternalId() + "]");
+ if (pe.getUsers() != null && pe.getUsers().size() > 0)
+ {
+ int ctr = 0;
+ for (String user : pe.getUsers())
+ {
+ System.out.println("user[" + ctr++ + "]=" + user);
+ }
+ }
+ if (pe.getRoles() != null && pe.getRoles().size() > 0)
+ {
+ int ctr = 0;
+ for (String role : pe.getRoles())
+ {
+ System.out.println("name[" + ctr++ + "]=" + role);
+ }
+ }
+ if (pe.getProperties() != null && pe.getProperties().size() > 0)
+ {
+ int ctr = 0;
+ for (Enumeration e = pe.getProperties().propertyNames(); e.hasMoreElements();)
+ {
+ String key = (String) e.nextElement();
+ String val = pe.getProperty(key);
+ System.out.println("prop key[" + ctr + "]=" + key);
+ System.out.println("prop value[" + ctr++ + "]=" + val);
+ }
+ }
+ System.out.println("**");
+ }
+ }
+ System.out.println("ENTER to continue");
+ }
+ catch (SecurityException e)
+ {
+ LOG.error("sessionPermissions caught SecurityException rc=" + e.getErrorId() + ", msg=" + e.getMessage(), e);
+ }
+ ReaderUtil.readChar();
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/c49e1ad3/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 3547d9a..0251422 100755
--- a/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java
+++ b/src/test/java/org/apache/directory/fortress/core/ProcessMenuCommand.java
@@ -1145,6 +1145,7 @@ class ProcessMenuCommand
System.out.println( "5. Can Deassign" );
System.out.println( "6. Can Grant" );
System.out.println( "7. Can Revoke" );
+ System.out.println( "8. Session Permissions" );
System.out.println( "Enter q or Q to return to previous menu" );
}
@@ -1187,6 +1188,9 @@ class ProcessMenuCommand
case '7':
delAccessConsole.canRevoke();
break;
+ case '8':
+ delAccessConsole.sessionPermissions();
+ break;
case 'q':
case 'Q':
done = true;