You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2004/09/03 20:22:01 UTC
cvs commit: jakarta-jetspeed-2/components/security project.xml
taylor 2004/09/03 11:22:01
Modified: components/security/src/test/org/apache/jetspeed/security
TestRdbmsPolicy.java TestPermissionManager.java
components/security project.xml
Log:
added 2 new permissions for file and folder resources
refactored the permissions into a common abstract base class
http://nagoya.apache.org/jira/browse/JS2-111
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.5 +1 -1 jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicy.java
Index: TestRdbmsPolicy.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicy.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestRdbmsPolicy.java 27 May 2004 19:45:32 -0000 1.4
+++ TestRdbmsPolicy.java 3 Sep 2004 18:22:01 -0000 1.5
@@ -174,7 +174,7 @@
{
public Object run()
{
- PortletPermission perm2 = new PortletPermission("myportlet", "delete");
+ PortletPermission perm2 = new PortletPermission("myportlet", "secure");
AccessController.checkPermission(perm2);
return null;
}
1.3 +15 -15 jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestPermissionManager.java
Index: TestPermissionManager.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestPermissionManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestPermissionManager.java 27 May 2004 19:45:32 -0000 1.2
+++ TestPermissionManager.java 3 Sep 2004 18:22:01 -0000 1.3
@@ -110,8 +110,8 @@
// Init test.
UserPrincipal user = new UserPrincipalImpl("removepermission");
RolePrincipal role = new RolePrincipalImpl("removepermissionrole");
- PortletPermission perm1 = new PortletPermission("removepermission1", "view, edit, delete, minimize, maximize");
- PortletPermission perm2 = new PortletPermission("removepermission2", "view, edit, minimize, maximize");
+ PortletPermission perm1 = new PortletPermission("removepermission1", "view, edit, secure, minimized, maximized");
+ PortletPermission perm2 = new PortletPermission("removepermission2", "view, edit, minimized, maximized");
try
{
ums.addUser(user.getName(), "password");
@@ -172,8 +172,8 @@
// Init test.
UserPrincipal user1 = new UserPrincipalImpl("testgrantpermission1");
UserPrincipal user2 = new UserPrincipalImpl("testgrantpermission2");
- PortletPermission perm1 = new PortletPermission("testportlet", "view, minimize, delete");
- PortletPermission perm2 = new PortletPermission("testportlet", "view, minimize, maximize, delete");
+ PortletPermission perm1 = new PortletPermission("testportlet", "view, minimized, secure");
+ PortletPermission perm2 = new PortletPermission("testportlet", "view, minimized, maximized, secure");
try
{
ums.addUser(user2.getName(), "password");
@@ -306,8 +306,8 @@
GroupPrincipal group2 = new GroupPrincipalImpl("anongroup2");
PortletPermission perm1 = new PortletPermission("anontestportlet", "view");
PortletPermission perm2 = new PortletPermission("anontestportlet", "view, edit");
- PortletPermission perm3 = new PortletPermission("anontestportlet", "view, edit, delete");
- PortletPermission perm4 = new PortletPermission("anontestportlet", "view, edit, delete, minimize");
+ PortletPermission perm3 = new PortletPermission("anontestportlet", "view, edit, secure");
+ PortletPermission perm4 = new PortletPermission("anontestportlet", "view, edit, secure, minimized");
try
{
ums.addUser(user.getName(), "password");
@@ -393,8 +393,8 @@
{
// Init test.
UserPrincipal user = new UserPrincipalImpl("revokepermission");
- PortletPermission perm1 = new PortletPermission("revokepermission1", "view, edit, minimize, maximize");
- PortletPermission perm2 = new PortletPermission("revokepermission2", "view, edit, minimize, maximize");
+ PortletPermission perm1 = new PortletPermission("revokepermission1", "view, edit, minimized, maximized");
+ PortletPermission perm2 = new PortletPermission("revokepermission2", "view, edit, minimized, maximized");
try
{
ums.addUser(user.getName(), "password");
@@ -489,13 +489,13 @@
// Remove permissions.
PortletPermission perm1 = new PortletPermission("anontestportlet", "view");
PortletPermission perm2 = new PortletPermission("anontestportlet", "view, edit");
- PortletPermission perm3 = new PortletPermission("anontestportlet", "view, edit, delete");
- PortletPermission perm4 = new PortletPermission("anontestportlet", "view, edit, delete, minimize");
- PortletPermission perm5 = new PortletPermission("removepermission1", "view, edit, delete, minimize, maximize");
- PortletPermission perm6 = new PortletPermission("removepermission2", "view, edit, minimize, maximize");
- PortletPermission perm7 = new PortletPermission("revokepermission1", "view, edit, minimize, maximize");
- PortletPermission perm8 = new PortletPermission("revokepermission2", "view, edit, minimize, maximize");
- PortletPermission perm9 = new PortletPermission("testportlet", "view, minimize, delete");
+ PortletPermission perm3 = new PortletPermission("anontestportlet", "view, edit, secure");
+ PortletPermission perm4 = new PortletPermission("anontestportlet", "view, edit, secure, minimized");
+ PortletPermission perm5 = new PortletPermission("removepermission1", "view, edit, secure, minimized, maximized");
+ PortletPermission perm6 = new PortletPermission("removepermission2", "view, edit, minimized, maximized");
+ PortletPermission perm7 = new PortletPermission("revokepermission1", "view, edit, minimized, maximized");
+ PortletPermission perm8 = new PortletPermission("revokepermission2", "view, edit, minimized, maximized");
+ PortletPermission perm9 = new PortletPermission("testportlet", "view, minimized, secure");
try
{
pms.removePermission(perm1);
1.20 +8 -0 jakarta-jetspeed-2/components/security/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/security/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 11 Jul 2004 03:25:23 -0000 1.19
+++ project.xml 3 Sep 2004 18:22:01 -0000 1.20
@@ -238,6 +238,14 @@
<war.bundle>false</war.bundle>
</properties>
</dependency>
+ <dependency>
+ <!-- portlet-api.jar must be in %MAVEN_HOME%respository/portlet-api/jars -->
+ <id>portlet-api</id>
+ <version>1.0</version>
+ <properties>
+ <war.bundle>false</war.bundle>
+ </properties>
+ </dependency>
<dependency>
<id>jta</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org