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 11:26:26 UTC
svn commit: r694662 - in
/portals/jetspeed-2/portal/branches/security-refactoring:
components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/
components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/
com...
Author: ate
Date: Fri Sep 12 02:26:24 2008
New Revision: 694662
URL: http://svn.apache.org/viewvc?rev=694662&view=rev
Log:
Renaming JetspeedPermissionManager (and Factory) back to old PermissionManager name.
Also, several more fixes for new PermissionManager api and PermissionFactory usage
Added:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java (contents, props changed)
- copied, changed from r694589, portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/JetspeedPermissionManagerImpl.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/PermissionFactory.java (contents, props changed)
- copied, changed from r694589, portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionsFactory.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/PermissionManager.java (contents, props changed)
- copied, changed from r694589, portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionManager.java
Removed:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/JetspeedPermissionManagerImpl.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionManager.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionsFactory.java
Modified:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityAccessControllerImpl.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java
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
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermission.java
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/administration.xml
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml
portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java Fri Sep 12 02:26:24 2008
@@ -51,7 +51,7 @@
import org.apache.jetspeed.page.document.impl.NodeImpl;
import org.apache.jetspeed.page.document.impl.NodeSetImpl;
import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
-import org.apache.jetspeed.security.JetspeedPermissionsFactory;
+import org.apache.jetspeed.security.PermissionFactory;
import org.apache.ojb.broker.core.proxy.ProxyHelper;
/**
@@ -89,11 +89,11 @@
private NodeSet allNodeSet;
private FolderMenuDefinitionList menuDefinitions;
- private static JetspeedPermissionsFactory jpf;
+ private static PermissionFactory pf;
- public static void setJetspeedPermissionsFactory(JetspeedPermissionsFactory jpf)
+ public static void setPermissionsFactory(PermissionFactory pf)
{
- FolderImpl.jpf = jpf;
+ FolderImpl.pf = pf;
}
public FolderImpl()
@@ -519,7 +519,7 @@
// to be skipped due to explicity granted access
if (!checkParentsOnly)
{
- AccessController.checkPermission((Permission)jpf.newPermission(jpf.FOLDER_PERMISSION, path, mask));
+ AccessController.checkPermission((Permission)pf.newPermission(pf.FOLDER_PERMISSION, path, mask));
}
// if not checking node only, recursively check
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java Fri Sep 12 02:26:24 2008
@@ -52,7 +52,7 @@
import org.apache.jetspeed.page.document.psml.AbstractNode;
import org.apache.jetspeed.page.document.psml.NodeOrderCompartaor;
import org.apache.jetspeed.page.document.psml.NodeSetImpl;
-import org.apache.jetspeed.security.JetspeedPermissionsFactory;
+import org.apache.jetspeed.security.PermissionFactory;
/**
* FolderImpl
@@ -72,11 +72,11 @@
private static final Log log = LogFactory.getLog(FolderImpl.class);
- private static JetspeedPermissionsFactory jpf;
+ private static PermissionFactory pf;
- public static void setJetspeedPermissionsFactory(JetspeedPermissionsFactory jpf)
+ public static void setPermissionsFactory(PermissionFactory pf)
{
- FolderImpl.jpf = jpf;
+ FolderImpl.pf = pf;
}
public FolderImpl( String path, FolderMetaDataImpl metadata, DocumentHandlerFactory handlerFactory,
@@ -709,7 +709,7 @@
// to be skipped due to explicity granted access
if (!checkParentsOnly)
{
- AccessController.checkPermission((Permission)jpf.newPermission(jpf.FOLDER_PERMISSION, path, mask));
+ AccessController.checkPermission((Permission)pf.newPermission(pf.FOLDER_PERMISSION, path, mask));
}
// if not checking node only, recursively check
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java Fri Sep 12 02:26:24 2008
@@ -34,7 +34,7 @@
import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
import org.apache.jetspeed.security.Group;
import org.apache.jetspeed.security.JSSubject;
-import org.apache.jetspeed.security.JetspeedPermissionsFactory;
+import org.apache.jetspeed.security.PermissionFactory;
import org.apache.jetspeed.security.Role;
import org.apache.jetspeed.security.User;
@@ -54,11 +54,11 @@
private boolean constraintsEnabled;
private boolean permissionsEnabled;
- private static JetspeedPermissionsFactory jpf;
+ private static PermissionFactory pf;
- public static void setJetspeedPermissionsFactory(JetspeedPermissionsFactory jpf)
+ public static void setPermissionsFactory(PermissionFactory pf)
{
- BaseElementImpl.jpf = jpf;
+ BaseElementImpl.pf = pf;
}
protected BaseElementImpl(SecurityConstraintsImpl constraints)
@@ -222,12 +222,12 @@
try
{
// check for granted page permissions
- AccessController.checkPermission((Permission)jpf.newPermission(jpf.PAGE_PERMISSION, path, mask));
+ AccessController.checkPermission((Permission)pf.newPermission(pf.PAGE_PERMISSION, path, mask));
}
catch (SecurityException se)
{
// fallback check for granted folder permissions
- AccessController.checkPermission((Permission)jpf.newPermission(jpf.FOLDER_PERMISSION, path, mask));
+ AccessController.checkPermission((Permission)pf.newPermission(pf.FOLDER_PERMISSION, path, mask));
}
}
@@ -461,7 +461,7 @@
// check access permissions and constraints as enabled
if (getPermissionsEnabled())
{
- int mask = jpf.parseActions(actions);
+ int mask = pf.parseActions(actions);
checkPermissions(mask);
}
if (getConstraintsEnabled())
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java Fri Sep 12 02:26:24 2008
@@ -27,7 +27,7 @@
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.PageSecurity;
import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
-import org.apache.jetspeed.security.JetspeedPermissionsFactory;
+import org.apache.jetspeed.security.PermissionFactory;
/**
* FragmentImpl
@@ -62,11 +62,11 @@
private FragmentPreferenceList fragmentPreferences;
private PageImpl page;
- private static JetspeedPermissionsFactory jpf;
+ private static PermissionFactory pf;
- public static void setJetspeedPermissionsFactory(JetspeedPermissionsFactory jpf)
+ public static void setPermissionsFactory(PermissionFactory pf)
{
- FragmentImpl.jpf = jpf;
+ FragmentImpl.pf = pf;
}
public FragmentImpl()
@@ -565,7 +565,7 @@
public void checkPermissions(String path, int mask, boolean checkNodeOnly, boolean checkParentsOnly) throws SecurityException
{
// always check for granted fragment permissions
- AccessController.checkPermission((Permission)jpf.newPermission(jpf.FRAGMENT_PERMISSION,path, mask));
+ AccessController.checkPermission((Permission)pf.newPermission(pf.FRAGMENT_PERMISSION,path, mask));
}
/* (non-Javadoc)
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java Fri Sep 12 02:26:24 2008
@@ -42,7 +42,7 @@
import org.apache.jetspeed.page.document.psml.NodeSetImpl;
import org.apache.jetspeed.security.Group;
import org.apache.jetspeed.security.JSSubject;
-import org.apache.jetspeed.security.JetspeedPermissionsFactory;
+import org.apache.jetspeed.security.PermissionFactory;
import org.apache.jetspeed.security.Role;
import org.apache.jetspeed.security.User;
@@ -69,11 +69,11 @@
private DocumentHandlerFactory handlerFactory = null;
- private static JetspeedPermissionsFactory jpf;
+ private static PermissionFactory pf;
- public static void setJetspeedPermissionsFactory(JetspeedPermissionsFactory jpf)
+ public static void setPermissionsFactory(PermissionFactory pf)
{
- AbstractBaseElement.jpf = jpf;
+ AbstractBaseElement.pf = pf;
}
public String getId()
@@ -448,12 +448,12 @@
try
{
// check for granted page permissions
- AccessController.checkPermission((Permission)jpf.newPermission(jpf.PAGE_PERMISSION, path, mask));
+ AccessController.checkPermission((Permission)pf.newPermission(pf.PAGE_PERMISSION, path, mask));
}
catch (SecurityException se)
{
// fallback check for granted folder permissions
- AccessController.checkPermission((Permission)jpf.newPermission(jpf.FOLDER_PERMISSION, path, mask));
+ AccessController.checkPermission((Permission)pf.newPermission(pf.FOLDER_PERMISSION, path, mask));
}
}
@@ -497,7 +497,7 @@
// check access permissions and constraints as enabled
if (getPermissionsEnabled())
{
- int mask = jpf.parseActions(actions);
+ int mask = pf.parseActions(actions);
checkPermissions(mask);
}
if (getConstraintsEnabled())
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java Fri Sep 12 02:26:24 2008
@@ -29,7 +29,7 @@
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.PageSecurity;
-import org.apache.jetspeed.security.JetspeedPermissionsFactory;
+import org.apache.jetspeed.security.PermissionFactory;
/**
* @version $Id$
@@ -65,11 +65,11 @@
private boolean dirty = false;
- private static JetspeedPermissionsFactory jpf;
+ private static PermissionFactory pf;
- public static void setJetspeedPermissionsFactory(JetspeedPermissionsFactory jpf)
+ public static void setPermissionsFactory(PermissionFactory pf)
{
- FragmentImpl.jpf = jpf;
+ FragmentImpl.pf = pf;
}
/**
@@ -549,7 +549,7 @@
public void checkPermissions(String path, int mask, boolean checkNodeOnly, boolean checkParentsOnly) throws SecurityException
{
// always check for granted fragment permissions
- AccessController.checkPermission((Permission)jpf.newPermission(jpf.FRAGMENT_PERMISSION, path, mask));
+ AccessController.checkPermission((Permission)pf.newPermission(pf.FRAGMENT_PERMISSION, path, mask));
}
/* (non-Javadoc)
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java Fri Sep 12 02:26:24 2008
@@ -16,9 +16,6 @@
*/
package org.apache.jetspeed.layout.impl;
-import java.lang.reflect.Constructor;
-import java.security.Permission;
-import java.security.Principal;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -32,6 +29,8 @@
import org.apache.jetspeed.ajax.AjaxBuilder;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.security.JetspeedPermission;
+import org.apache.jetspeed.security.JetspeedPrincipal;
import org.apache.jetspeed.security.PermissionManager;
import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.security.impl.TransientRole;
@@ -57,17 +56,14 @@
{
protected static final Log log = LogFactory.getLog(SecurityPermissionAction.class);
protected PermissionManager pm = null;
- protected Map permissionMap = null;
public SecurityPermissionAction(String template,
String errorTemplate,
PermissionManager pm,
- PortletActionSecurityBehavior securityBehavior,
- Map permissionMap)
+ PortletActionSecurityBehavior securityBehavior)
{
super(template, errorTemplate, securityBehavior);
this.pm = pm;
- this.permissionMap = permissionMap;
}
public boolean run(RequestContext requestContext, Map resultMap)
@@ -141,7 +137,7 @@
if (actions == null)
throw new AJAXException("Missing 'actions' parameter");
- Permission permission = createPermissionFromClass(type, resource, actions);
+ JetspeedPermission permission = pm.newPermission(type, resource, actions);
if (pm.permissionExists(permission))
{
throw new AJAXException("Permission " + resource + " already exists");
@@ -177,17 +173,17 @@
// assume no change
oldActions = actions;
}
- Permission permission = null;
+ JetspeedPermission permission = null;
if (!oldActions.equals(actions))
{
- permission = createPermissionFromClass(type, resource, oldActions);
+ permission = pm.newPermission(type, resource, oldActions);
pm.removePermission(permission);
- permission = createPermissionFromClass(type, resource, actions);
+ permission = pm.newPermission(type, resource, actions);
pm.addPermission(permission);
}
else
{
- permission = createPermissionFromClass(type, resource, actions);
+ permission = pm.newPermission(type, resource, actions);
}
String roleNames = getActionParameter(requestContext, "roles");
return updateRoles(permission, roleNames);
@@ -198,21 +194,22 @@
}
}
- protected int updateRoles(Permission permission, String roleNames)
+ protected int updateRoles(JetspeedPermission permission, String roleNames)
throws SecurityException
{
- List principals = new LinkedList();
+ int count = 0;
+ List<JetspeedPrincipal> principals = new LinkedList<JetspeedPrincipal>();
if (roleNames != null)
{
StringTokenizer toke = new StringTokenizer(roleNames, ",");
while (toke.hasMoreTokens())
{
- String roleName = toke.nextToken();
- Principal role = new TransientRole(roleName);
- principals.add(role);
+ principals.add(new TransientRole(toke.nextToken()));
+ count++;
}
}
- return pm.updatePermission(permission, principals);
+ pm.grantPermissionOnlyTo(permission, principals);
+ return count;
}
protected int removePermission(RequestContext requestContext, Map resultMap)
@@ -229,7 +226,7 @@
String actions = getActionParameter(requestContext, "actions");
if (actions == null)
throw new AJAXException("Missing 'actions' parameter");
- Permission permission = createPermissionFromClass(type, resource, actions);
+ JetspeedPermission permission = pm.newPermission(type, resource, actions);
if (pm.permissionExists(permission))
{
pm.removePermission(permission);
@@ -242,32 +239,4 @@
throw new AJAXException(e.toString(), e);
}
}
-
- protected String mapTypeToClassname(String type)
- throws AJAXException
- {
- String classname = (String)this.permissionMap.get(type);
- if (classname != null)
- return classname;
- throw new AJAXException("Bad resource 'type' parameter: " + type);
- }
-
- protected Permission createPermissionFromClass(String type, String resource, String actions)
- throws AJAXException
- {
- String classname = this.mapTypeToClassname(type);
- try
- {
- Class permissionClass = Class.forName(classname);
- Class[] parameterTypes = { String.class, String.class };
- Constructor permissionConstructor = permissionClass.getConstructor(parameterTypes);
- Object[] initArgs = { resource, actions };
- return (Permission)permissionConstructor.newInstance(initArgs);
- }
- catch (Exception e)
- {
- throw new AJAXException("Failed to create permission: " + type, e);
- }
- }
-
}
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityAccessControllerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityAccessControllerImpl.java?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityAccessControllerImpl.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/security/impl/SecurityAccessControllerImpl.java Fri Sep 12 02:26:24 2008
@@ -25,7 +25,7 @@
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.page.PageManager;
-import org.apache.jetspeed.security.JetspeedPermissionsFactory;
+import org.apache.jetspeed.security.PermissionFactory;
import org.apache.jetspeed.security.SecurityAccessController;
/**
@@ -37,13 +37,13 @@
*/
public class SecurityAccessControllerImpl implements SecurityAccessController
{
- protected JetspeedPermissionsFactory jpf;
+ protected PermissionFactory pf;
protected PageManager pageManager;
protected int securityMode = SecurityAccessController.PERMISSIONS;
- public SecurityAccessControllerImpl(JetspeedPermissionsFactory jpf, PageManager pageManager, int securityMode)
+ public SecurityAccessControllerImpl(PermissionFactory pf, PageManager pageManager, int securityMode)
{
- this.jpf = jpf;
+ this.pf = pf;
this.pageManager = pageManager;
this.securityMode = securityMode;
@@ -76,7 +76,7 @@
{
try
{
- AccessController.checkPermission((Permission)jpf.newPermission(jpf.PORTLET_PERMISSION,portlet.getUniqueName(), mask));
+ AccessController.checkPermission((Permission)pf.newPermission(pf.PORTLET_PERMISSION,portlet.getUniqueName(), mask));
}
catch (AccessControlException ace)
{
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-portal/src/main/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java Fri Sep 12 02:26:24 2008
@@ -36,7 +36,7 @@
import org.apache.jetspeed.om.common.servlet.MutableWebApplication;
import org.apache.jetspeed.search.SearchEngine;
import org.apache.jetspeed.security.JetspeedPermission;
-import org.apache.jetspeed.security.JetspeedPermissionManager;
+import org.apache.jetspeed.security.PermissionManager;
import org.apache.jetspeed.security.Role;
import org.apache.jetspeed.security.RoleManager;
import org.apache.jetspeed.security.SecurityException;
@@ -67,7 +67,7 @@
protected PortletWindowAccessor windowAccess;
protected SearchEngine searchEngine;
protected RoleManager roleManager;
- protected JetspeedPermissionManager permissionManager;
+ protected PermissionManager permissionManager;
protected boolean autoCreateRoles;
protected List permissionRoles;
protected int descriptorChangeMonitorInterval = DEFAULT_DESCRIPTOR_CHANGE_MONITOR_INTERVAL;
@@ -86,7 +86,7 @@
*/
public PortletApplicationManager(PortletFactory portletFactory, PortletRegistry registry,
PortletEntityAccessComponent entityAccess, PortletWindowAccessor windowAccess,
- JetspeedPermissionManager permissionManager, SearchEngine searchEngine,
+ PermissionManager permissionManager, SearchEngine searchEngine,
RoleManager roleManager, List permissionRoles, NodeManager nodeManager, String appRoot)
{
this.portletFactory = portletFactory;
Copied: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java (from r694589, portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/JetspeedPermissionManagerImpl.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java?p2=portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java&p1=portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/JetspeedPermissionManagerImpl.java&r1=694589&r2=694662&rev=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/JetspeedPermissionManagerImpl.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java Fri Sep 12 02:26:24 2008
@@ -22,7 +22,7 @@
import java.util.List;
import org.apache.jetspeed.security.JetspeedPermission;
-import org.apache.jetspeed.security.JetspeedPermissionManager;
+import org.apache.jetspeed.security.PermissionManager;
import org.apache.jetspeed.security.JetspeedPrincipal;
import org.apache.jetspeed.security.spi.JetspeedPermissionStorageManager;
import org.apache.jetspeed.security.spi.impl.JetspeedPermissionFactory;
@@ -31,9 +31,9 @@
* @version $Id$
*
*/
-public class JetspeedPermissionManagerImpl implements JetspeedPermissionManager
+public class PermissionManagerImpl implements PermissionManager
{
- public JetspeedPermissionManagerImpl(List<JetspeedPermissionFactory> factories, JetspeedPermissionStorageManager jpsm)
+ public PermissionManagerImpl(List<JetspeedPermissionFactory> factories, JetspeedPermissionStorageManager jpsm)
{
}
Propchange: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/PermissionManagerImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RdbmsPolicy.java Fri Sep 12 02:26:24 2008
@@ -28,7 +28,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.security.JetspeedPermissionManager;
+import org.apache.jetspeed.security.PermissionManager;
import org.apache.jetspeed.security.SecurityHelper;
import org.apache.jetspeed.security.SecurityPolicies;
@@ -57,14 +57,14 @@
* JetspeedPermission Manager Service.
* </p>
*/
- private JetspeedPermissionManager pms = null;
+ private PermissionManager pms = null;
/**
* <p>
* Default constructor.
* </p>
*/
- public RdbmsPolicy(JetspeedPermissionManager pms)
+ public RdbmsPolicy(PermissionManager pms)
{
if (log.isDebugEnabled())
{
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=694662&r1=694661&r2=694662&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 Fri Sep 12 02:26:24 2008
@@ -18,7 +18,7 @@
import java.security.Permission;
-import org.apache.jetspeed.security.JetspeedPermissionsFactory;
+import org.apache.jetspeed.security.PermissionFactory;
/**
* <p>Folder permission.</p>
@@ -57,7 +57,7 @@
{
public Factory()
{
- super(JetspeedPermissionsFactory.FOLDER_PERMISSION);
+ super(PermissionFactory.FOLDER_PERMISSION);
}
public FolderPermission newPermission(String name, String actions)
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=694662&r1=694661&r2=694662&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 Fri Sep 12 02:26:24 2008
@@ -18,7 +18,7 @@
import java.security.Permission;
-import org.apache.jetspeed.security.JetspeedPermissionsFactory;
+import org.apache.jetspeed.security.PermissionFactory;
/**
* <p>Fragment permission.</p>
@@ -51,7 +51,7 @@
{
public Factory()
{
- super(JetspeedPermissionsFactory.FRAGMENT_PERMISSION);
+ super(PermissionFactory.FRAGMENT_PERMISSION);
}
public FragmentPermission newPermission(String name, String actions)
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=694662&r1=694661&r2=694662&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 Fri Sep 12 02:26:24 2008
@@ -18,7 +18,7 @@
import java.security.Permission;
-import org.apache.jetspeed.security.JetspeedPermissionsFactory;
+import org.apache.jetspeed.security.PermissionFactory;
/**
* <p>Folder permission.</p>
@@ -38,7 +38,7 @@
{
public Factory()
{
- super(JetspeedPermissionsFactory.PAGE_PERMISSION);
+ super(PermissionFactory.PAGE_PERMISSION);
}
public PagePermission newPermission(String name, String actions)
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=694662&r1=694661&r2=694662&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 Fri Sep 12 02:26:24 2008
@@ -18,7 +18,7 @@
import java.security.Permission;
-import org.apache.jetspeed.security.JetspeedPermissionsFactory;
+import org.apache.jetspeed.security.PermissionFactory;
/**
* <p>Portlet permission.</p>
@@ -38,7 +38,7 @@
{
public Factory()
{
- super(JetspeedPermissionsFactory.PORTLET_PERMISSION);
+ super(PermissionFactory.PORTLET_PERMISSION);
}
public PortletPermission newPermission(String name, String actions)
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java Fri Sep 12 02:26:24 2008
@@ -31,7 +31,7 @@
import org.apache.jetspeed.security.AuthenticationProviderProxy;
import org.apache.jetspeed.security.Group;
import org.apache.jetspeed.security.GroupManager;
-import org.apache.jetspeed.security.JetspeedPermissionManager;
+import org.apache.jetspeed.security.PermissionManager;
import org.apache.jetspeed.security.Role;
import org.apache.jetspeed.security.RoleManager;
import org.apache.jetspeed.security.SecurityProvider;
@@ -85,7 +85,7 @@
protected RoleManager rms;
/** The permission manager. */
- protected JetspeedPermissionManager pms;
+ protected PermissionManager pms;
protected SecurityAttributesProvider sap;
@@ -121,7 +121,7 @@
rms = (RoleManager) scm.getComponent("org.apache.jetspeed.security.RoleManager");
// Authorization.
- pms = (JetspeedPermissionManager) scm.getComponent("org.apache.jetspeed.security.JetspeedPermissionManager");
+ pms = (PermissionManager) scm.getComponent("org.apache.jetspeed.security.PermissionManager");
sap = (SecurityAttributesProvider) scm.getComponent("org.apache.jetspeed.security.attributes.SecurityAttributesProvider");
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java Fri Sep 12 02:26:24 2008
@@ -32,7 +32,7 @@
import org.apache.jetspeed.security.JetspeedPermission;
import org.apache.jetspeed.security.JetspeedPrincipal;
import org.apache.jetspeed.security.PasswordCredential;
-import org.apache.jetspeed.security.JetspeedPermissionManager;
+import org.apache.jetspeed.security.PermissionManager;
import org.apache.jetspeed.security.Role;
import org.apache.jetspeed.security.RoleManager;
import org.apache.jetspeed.security.SecurityAttributeType;
@@ -84,10 +84,10 @@
protected RoleManager roleManager;
protected UserManager userManager;
protected CredentialPasswordEncoder cpe;
- protected JetspeedPermissionManager pm;
+ protected PermissionManager pm;
public JetspeedSecuritySerializer(GroupManager groupManager, RoleManager roleManager, UserManager userManager,
- CredentialPasswordEncoder cpe, JetspeedPermissionManager pm)
+ CredentialPasswordEncoder cpe, PermissionManager pm)
{
this.groupManager = groupManager;
this.roleManager = roleManager;
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermission.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermission.java?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermission.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermission.java Fri Sep 12 02:26:24 2008
@@ -70,49 +70,6 @@
public static final String TYPE_UNKNOWN = "unknown".intern();
- public String getClassForType(String type)
- {
- if ((type == null) || (type.length() == 0) || (type.equals(TYPE_UNKNOWN)))
- return "";
- if (type.equals(TYPE_FOLDER))
- return "org.apache.jetspeed.security.FolderPermission";
- if (type.equals(TYPE_FRAGMENT))
- return "org.apache.jetspeed.security.FragmentPermission";
- if (type.equals(TYPE_PAGE))
- return "org.apache.jetspeed.security.PagePermission";
- if (type.equals(TYPE_PORTALRESOURCE))
- return "org.apache.jetspeed.security.PortalResourcePermission";
- if (type.equals(TYPE_PORTALRESOURCECOLLECTION))
- return "org.apache.jetspeed.security.PortalResourcePermissionCollection";
- if (type.equals(TYPE_PORTAL))
- return "org.apache.jetspeed.security.PortletPermission";
- return "";
- }
-
- public String getTypeForClass(String className)
- {
- if ((className == null) || (className.length() == 0))
- return TYPE_UNKNOWN;
- if (className.equals("org.apache.jetspeed.security.FolderPermission"))
- return TYPE_FOLDER;
-
- if (className.equals("org.apache.jetspeed.security.FragmentPermission"))
- return TYPE_FRAGMENT;
- if (className.equals("org.apache.jetspeed.security.PagePermission"))
- return TYPE_PAGE;
- if (className.equals("org.apache.jetspeed.security.PortletPermission"))
- return TYPE_PORTAL;
-
- if (className
- .equals("org.apache.jetspeed.security.PortalResourcePermission"))
- return TYPE_PORTALRESOURCE;
- if (className
- .equals("org.apache.jetspeed.security.PortalResourcePermissionCollection"))
- return TYPE_PORTALRESOURCECOLLECTION;
- return TYPE_UNKNOWN;
-
- }
-
public JSPermission()
{
}
Copied: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/PermissionFactory.java (from r694589, portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionsFactory.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/PermissionFactory.java?p2=portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/PermissionFactory.java&p1=portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionsFactory.java&r1=694589&r2=694662&rev=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionsFactory.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/PermissionFactory.java Fri Sep 12 02:26:24 2008
@@ -21,7 +21,7 @@
* @version $Id$
*
*/
-public interface JetspeedPermissionsFactory
+public interface PermissionFactory
{
String FOLDER_PERMISSION = "folder";
String FRAGMENT_PERMISSION = "fragment";
Propchange: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/PermissionFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/PermissionFactory.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/PermissionFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/PermissionManager.java (from r694589, portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionManager.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/PermissionManager.java?p2=portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/PermissionManager.java&p1=portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionManager.java&r1=694589&r2=694662&rev=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionManager.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/PermissionManager.java Fri Sep 12 02:26:24 2008
@@ -23,7 +23,7 @@
/**
* @version $Id$
*/
-public interface JetspeedPermissionManager extends JetspeedPermissionsFactory
+public interface PermissionManager extends PermissionFactory
{
boolean permissionExists(JetspeedPermission permission);
Permissions getPermissions(JetspeedPrincipal principal);
@@ -36,14 +36,14 @@
List<JetspeedPermission> getPermissions(String typeName, String nameFilter);
- List<JetspeedPrincipal> getPrincipals(JetspeedPermission permission);
+ List<JetspeedPrincipal> getPrincipals(JetspeedPermission permission) throws SecurityException;
- void addPermission(JetspeedPermission permission);
- void removePermission(JetspeedPermission permission);
- void updatePermission(JetspeedPermission permission, String actions);
+ void addPermission(JetspeedPermission permission) throws SecurityException;
+ void removePermission(JetspeedPermission permission) throws SecurityException;
+ void updatePermission(JetspeedPermission permission, String actions) throws SecurityException;
- void grantPermission(JetspeedPermission permission, JetspeedPrincipal principal);
- void revokePermission(JetspeedPermission permission, JetspeedPrincipal principal);
- void grantPermissionOnlyTo(JetspeedPermission permission, List<JetspeedPrincipal> principal);
- void revokeAllPermissions(JetspeedPrincipal principal);
+ void grantPermission(JetspeedPermission permission, JetspeedPrincipal principal) throws SecurityException;
+ void revokePermission(JetspeedPermission permission, JetspeedPrincipal principal) throws SecurityException;
+ void grantPermissionOnlyTo(JetspeedPermission permission, List<JetspeedPrincipal> principal) throws SecurityException;
+ void revokeAllPermissions(JetspeedPrincipal principal) throws SecurityException;
}
\ No newline at end of file
Propchange: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/PermissionManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/administration.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/administration.xml?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/administration.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/administration.xml Fri Sep 12 02:26:24 2008
@@ -104,7 +104,7 @@
class='org.apache.jetspeed.security.impl.SecurityAccessControllerImpl'>
<meta key="j2:cat" value="default" />
<constructor-arg index='0'>
- <ref bean="org.apache.jetspeed.security.JetspeedPermissionManager" />
+ <ref bean="org.apache.jetspeed.security.PermissionManager" />
</constructor-arg>
<constructor-arg index='1'>
<ref bean="org.apache.jetspeed.page.PageManager" />
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml Fri Sep 12 02:26:24 2008
@@ -457,19 +457,6 @@
<constructor-arg index='3'>
<ref bean="RolesSecurityBehavior" />
</constructor-arg>
- <constructor-arg index='4'>
- <map>
- <entry key="portlet">
- <value>org.apache.jetspeed.security.PortletPermission</value>
- </entry>
- <entry key="page">
- <value>org.apache.jetspeed.security.PagePermission</value>
- </entry>
- <entry key="folder">
- <value>org.apache.jetspeed.security.FolderPermission</value>
- </entry>
- </map>
- </constructor-arg>
</bean>
<bean id="AjaxSecurityConstraints" class="org.apache.jetspeed.layout.impl.SecurityConstraintsAction">
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml Fri Sep 12 02:26:24 2008
@@ -67,7 +67,7 @@
<ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
</constructor-arg>
<constructor-arg>
- <ref bean="org.apache.jetspeed.security.JetspeedPermissionManager" />
+ <ref bean="org.apache.jetspeed.security.PermissionManager" />
</constructor-arg>
<constructor-arg>
<ref bean="org.apache.jetspeed.search.SearchEngine" />
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/security-atz.xml Fri Sep 12 02:26:24 2008
@@ -22,7 +22,7 @@
<bean id="org.apache.jetspeed.security.impl.RdbmsPolicy" class="org.apache.jetspeed.security.impl.RdbmsPolicy">
<meta key="j2:cat" value="default,security" />
<constructor-arg>
- <ref bean="org.apache.jetspeed.security.JetspeedPermissionManager" />
+ <ref bean="org.apache.jetspeed.security.PermissionManager" />
</constructor-arg>
</bean>
Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml?rev=694662&r1=694661&r2=694662&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-portal-resources/src/main/resources/assembly/static-bean-references.xml Fri Sep 12 02:26:24 2008
@@ -43,7 +43,7 @@
</bean>
<bean id="_portletEntityImplPageManagerInitializer" class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
- <meta key="j2:cat" value="xmlPageManager,dbPageManager" />
+ <meta key="j2:cat" value="default,xmlPageManager,dbPageManager" />
<property name="className" value="org.apache.jetspeed.components.portletentity.PortletEntityImpl"/>
<property name="methodName" value="setPageManager"/>
<property name="typeName" value="org.apache.jetspeed.page.PageManager"/>
@@ -59,54 +59,55 @@
</bean>
<bean id="_abstractBaseElementInitializer" class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
- <meta key="j2:cat" value="xmlPageManager,pageSerializer" />
+ <meta key="j2:cat" value="default,xmlPageManager,pageSerializer" />
<property name="className" value="org.apache.jetspeed.om.page.psml.BaseElementImpl"/>
- <property name="methodName" value="setJetspeedPermissionsFactory"/>
- <property name="typeName" value="org.apache.jetspeed.security.JetspeedPermissionsFactory"/>
- <property name="value"><ref bean="org.apache.jetspeed.security.JetspeedPermissionManager"/></property>
+ <property name="methodName" value="setPermissionFactory"/>
+ <property name="typeName" value="org.apache.jetspeed.security.PermissionFactory"/>
+ <property name="value"><ref bean="org.apache.jetspeed.security.PermissionManager"/></property>
</bean>
<bean id="_baseElementImplInitializer" class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
- <meta key="j2:cat" value="dbPageManager,pageSerializer" />
+ <meta key="j2:cat" value="default,dbPageManager,pageSerializer" />
<property name="className" value="org.apache.jetspeed.om.page.impl.BaseElementImpl"/>
- <property name="methodName" value="setJetspeedPermissionsFactory"/>
- <property name="typeName" value="org.apache.jetspeed.security.JetspeedPermissionsFactory"/>
- <property name="value"><ref bean="org.apache.jetspeed.security.JetspeedPermissionManager"/></property>
+ <property name="methodName" value="setPermissionFactory"/>
+ <property name="typeName" value="org.apache.jetspeed.security.PermissionFactory"/>
+ <property name="value"><ref bean="org.apache.jetspeed.security.PermissionManager"/></property>
</bean>
<bean id="_dbFolderImplInitializer" class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
- <meta key="j2:cat" value="dbPageManager,pageSerializer" />
+ <meta key="j2:cat" value="default,dbPageManager,pageSerializer" />
<property name="className" value="org.apache.jetspeed.om.folder.impl.FolderImpl"/>
- <property name="methodName" value="setJetspeedPermissionsFactory"/>
- <property name="typeName" value="org.apache.jetspeed.security.JetspeedPermissionsFactory"/>
- <property name="value"><ref bean="org.apache.jetspeed.security.JetspeedPermissionManager"/></property>
+ <property name="methodName" value="setPermissionFactory"/>
+ <property name="typeName" value="org.apache.jetspeed.security.PermissionFactory"/>
+ <property name="value"><ref bean="org.apache.jetspeed.security.PermissionManager"/></property>
</bean>
<bean id="_xmlFolderImplInitializer" class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
- <meta key="j2:cat" value="xmlPageManager,pageSerializer" />
+ <meta key="j2:cat" value="default,xmlPageManager,pageSerializer" />
<property name="className" value="org.apache.jetspeed.om.folder.psml.FolderImpl"/>
- <property name="methodName" value="setJetspeedPermissionsFactory"/>
- <property name="typeName" value="org.apache.jetspeed.security.JetspeedPermissionsFactory"/>
- <property name="value"><ref bean="org.apache.jetspeed.security.JetspeedPermissionManager"/></property>
+ <property name="methodName" value="setPermissionFactory"/>
+ <property name="typeName" value="org.apache.jetspeed.security.PermissionFactory"/>
+ <property name="value"><ref bean="org.apache.jetspeed.security.PermissionManager"/></property>
</bean>
<bean id="_dbFragmentImplInitializer" class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
- <meta key="j2:cat" value="dbPageManager,pageSerializer" />
+ <meta key="j2:cat" value="default,dbPageManager,pageSerializer" />
<property name="className" value="org.apache.jetspeed.om.page.impl.FragmentImpl"/>
- <property name="methodName" value="setJetspeedPermissionsFactory"/>
- <property name="typeName" value="org.apache.jetspeed.security.JetspeedPermissionsFactory"/>
- <property name="value"><ref bean="org.apache.jetspeed.security.JetspeedPermissionManager"/></property>
+ <property name="methodName" value="setPermissionFactory"/>
+ <property name="typeName" value="org.apache.jetspeed.security.PermissionFactory"/>
+ <property name="value"><ref bean="org.apache.jetspeed.security.PermissionManager"/></property>
</bean>
<bean id="_xmlFragmentImplInitializer" class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
- <meta key="j2:cat" value="xmlPageManager,pageSerializer" />
+ <meta key="j2:cat" value="default,xmlPageManager,pageSerializer" />
<property name="className" value="org.apache.jetspeed.om.page.psml.FragmentImpl"/>
- <property name="methodName" value="setJetspeedPermissionsFactory"/>
- <property name="typeName" value="org.apache.jetspeed.security.JetspeedPermissionsFactory"/>
- <property name="value"><ref bean="org.apache.jetspeed.security.JetspeedPermissionManager"/></property>
+ <property name="methodName" value="setPermissionFactory"/>
+ <property name="typeName" value="org.apache.jetspeed.security.PermissionFactory"/>
+ <property name="value"><ref bean="org.apache.jetspeed.security.PermissionManager"/></property>
</bean>
+
<bean id="_TransientJetspeedPrincipal" class="org.apache.jetspeed.components.LifecycleAwareStaticClassInitializer">
- <meta key="j2:cat" value="JetspeedPrincipal,TransientJetspeedPrincipal" />
+ <meta key="j2:cat" value="default,security" />
<property name="className" value="org.apache.jetspeed.security.impl.TransientJetspeedPrincipal"/>
<property name="methodName" value="setJetspeedPrincipalManagerProvider"/>
<property name="typeName" value="org.apache.jetspeed.security.JetspeedPrincipalManagerProvider"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org