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 at...@apache.org on 2008/09/12 00:10:14 UTC
svn commit: r694510 -
/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/
Author: ate
Date: Thu Sep 11 15:10:13 2008
New Revision: 694510
URL: http://svn.apache.org/viewvc?rev=694510&view=rev
Log:
Renaming PortalResourcePermission to AbstractJetspeedPermission and have it implement JetspeedPermission
Added:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/AbstractJetspeedPermission.java (contents, props changed)
- copied, changed from r694509, portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/PortalResourcePermission.java
Removed:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/PortalResourcePermission.java
Modified:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/FolderPermission.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/FragmentPermission.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/PagePermission.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/PortletPermission.java
Copied: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/AbstractJetspeedPermission.java (from r694509, portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/PortalResourcePermission.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/AbstractJetspeedPermission.java?p2=portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/AbstractJetspeedPermission.java&p1=portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/PortalResourcePermission.java&r1=694509&r2=694510&rev=694510&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/PortalResourcePermission.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/AbstractJetspeedPermission.java Thu Sep 11 15:10:13 2008
@@ -17,6 +17,7 @@
package org.apache.jetspeed.security.spi.impl;
import org.apache.jetspeed.JetspeedActions;
+import org.apache.jetspeed.security.JetspeedPermission;
import java.security.Permission;
import java.security.PermissionCollection;
@@ -35,7 +36,7 @@
* @author <a href="mailto:dlestrat@apache.org">David Le Strat</a>
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
*/
-public abstract class PortalResourcePermission extends Permission
+public abstract class AbstractJetspeedPermission extends Permission implements JetspeedPermission
{
private static class JetspeedPermissionCollection extends PermissionCollection
{
@@ -78,7 +79,7 @@
* @param name The portlet name.
* @param actions The actions on the portlet.
*/
- public PortalResourcePermission(String name, String actions)
+ public AbstractJetspeedPermission(String name, String actions)
{
super(name);
mask = parseActions(actions);
@@ -90,7 +91,7 @@
* @param name The portlet name.
* @param mask The mask representing actions on the portlet.
*/
- public PortalResourcePermission(String name, int mask)
+ public AbstractJetspeedPermission(String name, int mask)
{
super(name);
this.mask = mask;
Propchange: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/AbstractJetspeedPermission.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.1
Propchange: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/AbstractJetspeedPermission.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/AbstractJetspeedPermission.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/FolderPermission.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/FolderPermission.java?rev=694510&r1=694509&r2=694510&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/FolderPermission.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/FolderPermission.java Thu Sep 11 15:10:13 2008
@@ -42,8 +42,9 @@
* @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
* @version $Id$
*/
-public class FolderPermission extends PortalResourcePermission
+public class FolderPermission extends AbstractJetspeedPermission
{
+ private static final long serialVersionUID = -4005330590344182308L;
public static final char RECURSIVE_CHAR = '-';
public static final char WILD_CHAR = '*';
public static final String WILD_CHAR_STR = new String(new char[]{WILD_CHAR});
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/FragmentPermission.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/FragmentPermission.java?rev=694510&r1=694509&r2=694510&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/FragmentPermission.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/FragmentPermission.java Thu Sep 11 15:10:13 2008
@@ -41,8 +41,10 @@
*
* @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
*/
-public class FragmentPermission extends PortalResourcePermission
+public class FragmentPermission extends AbstractJetspeedPermission
{
+ private static final long serialVersionUID = -7577936466248811111L;
+
/**
* <p>Constructor for FragmentPermission.</p>
*
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/PagePermission.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/PagePermission.java?rev=694510&r1=694509&r2=694510&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/PagePermission.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/PagePermission.java Thu Sep 11 15:10:13 2008
@@ -28,8 +28,10 @@
*
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
*/
-public class PagePermission extends PortalResourcePermission
+public class PagePermission extends AbstractJetspeedPermission
{
+ private static final long serialVersionUID = -3374203894346164388L;
+
/**
* <p>Constructor for PagePermission.</p>
*
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/PortletPermission.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/PortletPermission.java?rev=694510&r1=694509&r2=694510&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/PortletPermission.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/spi/impl/PortletPermission.java Thu Sep 11 15:10:13 2008
@@ -28,8 +28,9 @@
*
* @author <a href="mailto:dlestrat@apache.org">David Le Strat</a>
*/
-public class PortletPermission extends PortalResourcePermission
+public class PortletPermission extends AbstractJetspeedPermission
{
+ private static final long serialVersionUID = 3246898917185555596L;
/**
* <p>Constructor for PortletPermission.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org