[jboss-svn-commits] JBoss Portal SVN: r5358 - in trunk: core/src/main/org/jboss/portal/core/impl/model/instance core/src/main/org/jboss/portal/core/impl/model/portal core/src/main/org/jboss/portal/core/metadata core/src/main/org/jboss/portal/core/portlet/management core/src/main/org/jboss/portal/core/portlet/management/actions core/src/main/org/jboss/portal/test/core/model/portal portlet/src/main/org/jboss/portal/portlet/deployment/jboss portlet/src/main/org/jboss/portal/portlet/impl/security security/src/main/org/jboss/portal/security security/src/main/org/jboss/portal/security/impl security/src/main/org/jboss/portal/security/impl/jacc security/src/main/org/jboss/portal/security/spi/provider security/src/main/org/jboss/portal/test/security
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Oct 8 08:06:33 EDT 2006
Author: julien at jboss.com
Date: 2006-10-08 08:06:09 -0400 (Sun, 08 Oct 2006)
New Revision: 5358
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java
trunk/core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java
trunk/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java
trunk/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java
trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/AddPageAction.java
trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java
trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PortalAction.java
trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java
trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
trunk/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java
trunk/security/src/main/org/jboss/portal/security/AuthorizationDomainRegistry.java
trunk/security/src/main/org/jboss/portal/security/RoleSecurityBinding.java
trunk/security/src/main/org/jboss/portal/security/SecurityConstants.java
trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java
trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManager.java
trunk/security/src/main/org/jboss/portal/security/spi/provider/DomainConfigurator.java
trunk/security/src/main/org/jboss/portal/test/security/BaseAuthorizationDomain.java
trunk/security/src/main/org/jboss/portal/test/security/ComplexTestCase.java
trunk/security/src/main/org/jboss/portal/test/security/SimpleTestCase.java
Log:
minor renamings
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -460,7 +460,7 @@
return this;
}
- public Set getBindings(String uri)
+ public Set getSecurityBindings(String uri)
{
Set constraints = null;
InstanceDefinitionImpl instance = lookup(sessionFactory.getCurrentSession(), uri);
@@ -478,7 +478,7 @@
return constraints;
}
- public void setBindings(String uri, Set bindings) throws SecurityConfigurationException
+ public void setSecurityBindings(String uri, Set securityBindings) throws SecurityConfigurationException
{
Session session = sessionFactory.getCurrentSession();
InstanceDefinitionImpl instance = lookup(session, uri);
@@ -494,16 +494,16 @@
//
HashMap map = new HashMap();
- for (Iterator i = bindings.iterator(); i.hasNext();)
+ for (Iterator i = securityBindings.iterator(); i.hasNext();)
{
RoleSecurityBinding sc = (RoleSecurityBinding)i.next();
// Optimize
if (sc.getActions().size() > 0)
{
- InstanceSecurityBinding isc = new InstanceSecurityBinding(sc.getActions(), sc.getRole());
+ InstanceSecurityBinding isc = new InstanceSecurityBinding(sc.getActions(), sc.getRoleName());
isc.setInstance(instance);
- map.put(sc.getRole(), isc);
+ map.put(sc.getRoleName(), isc);
session.save(isc);
}
}
@@ -513,7 +513,7 @@
session.flush();
}
- public void removeBindings(String uri) throws SecurityConfigurationException
+ public void removeSecurityBindings(String uri) throws SecurityConfigurationException
{
Session session = sessionFactory.getCurrentSession();
InstanceDefinitionImpl instance = lookup(session, uri);
@@ -530,13 +530,13 @@
public PortalPermission getPermission(String roleName, String uri) throws PortalSecurityException
{
- Set set = getBindings(uri);
+ Set set = getSecurityBindings(uri);
if (set != null && !set.isEmpty())
{
for (Iterator i = set.iterator(); i.hasNext();)
{
RoleSecurityBinding sc = (RoleSecurityBinding)i.next();
- String constraintRoleName = sc.getRole();
+ String constraintRoleName = sc.getRoleName();
if (constraintRoleName.equals(roleName) || SecurityConstants.UNCHECKED_ROLE_NAME.equals(constraintRoleName))
{
return createPermission(uri, sc.getActions());
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -115,7 +115,7 @@
for (Iterator i = objectNode.getBindings().iterator(); i.hasNext();)
{
RoleSecurityBinding binding = (RoleSecurityBinding)i.next();
- String constraintRoleName = binding.getRole();
+ String constraintRoleName = binding.getRoleName();
if (constraintRoleName.equals(roleName) || SecurityConstants.UNCHECKED_ROLE_NAME.equals(constraintRoleName))
{
return createPermission(uri, binding.getActions());
@@ -125,7 +125,7 @@
return null;
}
- public void removeBindings(String uri) throws SecurityConfigurationException
+ public void removeSecurityBindings(String uri) throws SecurityConfigurationException
{
ObjectNode on = getObjectNode(uri);
if(on == null)
@@ -135,17 +135,17 @@
on.setBindings(new HashSet());
}
- public void setBindings(String uri, Set bindings) throws SecurityConfigurationException
+ public void setSecurityBindings(String uri, Set securityBindings) throws SecurityConfigurationException
{
ObjectNode on = getObjectNode(uri);
if(on == null)
{
throw new SecurityConfigurationException("The object should exist prior its security is configured : fixme");
}
- on.setBindings(bindings);
+ on.setBindings(securityBindings);
}
- public Set getBindings(String uri)
+ public Set getSecurityBindings(String uri)
{
ObjectNode on = getObjectNode(uri);
if (on != null)
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -270,7 +270,7 @@
// Optmize a bit
if (sc.getActions().size() > 0)
{
- ObjectNodeSecurityConstraint onsc = new ObjectNodeSecurityConstraint(sc.getActions(),sc.getRole());
+ ObjectNodeSecurityConstraint onsc = new ObjectNodeSecurityConstraint(sc.getActions(),sc.getRoleName());
//
onsc.setObjectNode(this);
Modified: trunk/core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -307,7 +307,7 @@
}
AuthorizationDomain authDomain = instanceContainer.getAuthorizationDomain();
DomainConfigurator domainConfigurator = authDomain.getConfigurator();
- domainConfigurator.setBindings(id, securityConstraints.getConstraints());
+ domainConfigurator.setSecurityBindings(id, securityConstraints.getConstraints());
//
return instance;
Modified: trunk/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -163,7 +163,7 @@
// Apply the constraint
PortalObjectContainer poc = buildContext.getContainer();
DomainConfigurator domainConfigurator = poc.getAuthorizationDomain().getConfigurator();
- domainConfigurator.setBindings(object.getId(), securityConstraints.getConstraints());
+ domainConfigurator.setSecurityBindings(object.getId(), securityConstraints.getConstraints());
}
}
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -70,21 +70,21 @@
String uri = getURI();
if (uri != null)
{
- Set constraints = getDomainConfigurator().getBindings(uri);
+ Set constraints = getDomainConfigurator().getSecurityBindings(uri);
Map newConstraints = new HashMap();
if (constraints != null)
{
for (Iterator i = constraints.iterator(); i.hasNext();)
{
RoleSecurityBinding binding = (RoleSecurityBinding)i.next();
- newConstraints.put(binding.getRole(), binding);
+ newConstraints.put(binding.getRoleName(), binding);
}
}
Set blah = Tools.toSet(actions);
newConstraints.put(roleName, new RoleSecurityBinding(blah, roleName));
try
{
- getDomainConfigurator().setBindings(uri, new HashSet(newConstraints.values()));
+ getDomainConfigurator().setSecurityBindings(uri, new HashSet(newConstraints.values()));
}
catch (SecurityConfigurationException e)
{
@@ -98,14 +98,14 @@
String uri = getURI();
if (uri != null)
{
- Set constraints = getDomainConfigurator().getBindings(uri);
+ Set constraints = getDomainConfigurator().getSecurityBindings(uri);
if (constraints != null)
{
Set actions = new HashSet();
for (Iterator i = constraints.iterator(); i.hasNext();)
{
RoleSecurityBinding binding = (RoleSecurityBinding)i.next();
- if (binding.getRole().equals(roleName))
+ if (binding.getRoleName().equals(roleName))
{
actions.addAll(binding.getActions());
}
@@ -132,13 +132,13 @@
if (uri != null)
{
Set roleNames = new HashSet();
- Set constraints = getDomainConfigurator().getBindings(uri);
+ Set constraints = getDomainConfigurator().getSecurityBindings(uri);
if (constraints != null)
{
for (Iterator i = constraints.iterator(); i.hasNext();)
{
RoleSecurityBinding binding = (RoleSecurityBinding)i.next();
- roleNames.add(binding.getRole());
+ roleNames.add(binding.getRoleName());
}
}
return (String[])roleNames.toArray(new String[roleNames.size()]);
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/AddPageAction.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/AddPageAction.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/AddPageAction.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -110,7 +110,7 @@
Page page = pageContainer.createPage(pageName);
DomainConfigurator configurator = pomgr.getDomainConfigurator();
Set constraints = Collections.singleton(new RoleSecurityBinding(PortalObjectPermission.VIEW_RECURSIVE_ACTION, SecurityConstants.UNCHECKED_ROLE_NAME));
- configurator.setBindings(page.getId(), constraints);
+ configurator.setSecurityBindings(page.getId(), constraints);
}
catch(Exception e)
{
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -100,7 +100,7 @@
//
DomainConfigurator configurator = instanceMgr.getDomainConfigurator();
Set constraints = Collections.singleton(new RoleSecurityBinding("view", SecurityConstants.UNCHECKED_ROLE_NAME));
- configurator.setBindings(instance.getId(), constraints);
+ configurator.setSecurityBindings(instance.getId(), constraints);
//
return "instances";
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PortalAction.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PortalAction.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PortalAction.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -31,7 +31,6 @@
import org.jboss.portal.security.RoleSecurityBinding;
import org.jboss.portal.security.SecurityConstants;
import org.jboss.portal.theme.ThemeConstants;
-import org.jboss.portal.server.PortalConstants;
import org.jboss.portal.WindowState;
import org.jboss.portal.Mode;
@@ -153,7 +152,7 @@
actions.add(PortalObjectPermission.PERSONALIZE_RECURSIVE_ACTION);
RoleSecurityBinding binding = new RoleSecurityBinding(actions, SecurityConstants.UNCHECKED_ROLE_NAME);
Set constraints = Collections.singleton(binding);
- configurator.setBindings(portal.getId(), constraints);
+ configurator.setSecurityBindings(portal.getId(), constraints);
// We need to add initial layout sets to avoid problems...
portal.setDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT, "generic");
@@ -174,7 +173,7 @@
// Create the default page
Page page = portal.createPage("default");
constraints = Collections.singleton(new RoleSecurityBinding(PortalObjectPermission.VIEW_RECURSIVE_ACTION, SecurityConstants.UNCHECKED_ROLE_NAME));
- configurator.setBindings(page.getId(), constraints);
+ configurator.setSecurityBindings(page.getId(), constraints);
portal.setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, page.getName());
Modified: trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -122,7 +122,7 @@
public void testDomainImplies1() throws Exception
{
//
- domain.getConfigurator().setBindings("", Collections.singleton(new RoleSecurityBinding("viewrecursive", "admin")));
+ domain.getConfigurator().setSecurityBindings("", Collections.singleton(new RoleSecurityBinding("viewrecursive", "admin")));
//
server.execute(new Server.Task()
@@ -140,7 +140,7 @@
public void testDomainImplies2() throws Exception
{
//
- domain.getConfigurator().setBindings("", Collections.singleton(new RoleSecurityBinding("view", "admin")));
+ domain.getConfigurator().setSecurityBindings("", Collections.singleton(new RoleSecurityBinding("view", "admin")));
//
server.execute(new Server.Task()
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -51,16 +51,13 @@
import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
import org.jboss.portal.server.deployment.PortalWebApp;
import org.jboss.portal.server.deployment.jboss.Deployment;
-import org.jboss.system.ServiceControllerMBean;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
import javax.management.MBeanServer;
-import javax.management.ObjectName;
import javax.servlet.ServletContext;
import java.io.IOException;
import java.io.InputStream;
-import java.io.BufferedInputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashSet;
@@ -267,7 +264,7 @@
try
{
String portletId = pwa.getId() + "." + portletMD.getName();
- domainConfigurator.setBindings(portletId, bindings);
+ domainConfigurator.setSecurityBindings(portletId, bindings);
}
catch (SecurityConfigurationException e)
{
@@ -295,7 +292,7 @@
try
{
String portletId = pwa.getId() + "." + portletMD.getName();
- domainConfigurator.removeBindings(portletId);
+ domainConfigurator.removeSecurityBindings(portletId);
}
catch (SecurityConfigurationException e)
{
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -76,30 +76,30 @@
return this;
}
- public Set getBindings(String uri)
+ public Set getSecurityBindings(String uri)
{
return (Set)securityConstraintsMap.get(uri);
}
- public void setBindings(String uri, Set bindings) throws SecurityConfigurationException
+ public void setSecurityBindings(String uri, Set securityBindings) throws SecurityConfigurationException
{
- this.securityConstraintsMap.put(uri, bindings);
+ this.securityConstraintsMap.put(uri, securityBindings);
}
- public void removeBindings(String uri) throws SecurityConfigurationException
+ public void removeSecurityBindings(String uri) throws SecurityConfigurationException
{
this.securityConstraintsMap.remove(uri);
}
public PortalPermission getPermission(String roleName, String uri) throws PortalSecurityException
{
- Set set = getBindings(uri);
+ Set set = getSecurityBindings(uri);
if (set != null && !set.isEmpty())
{
for (Iterator i = set.iterator(); i.hasNext();)
{
RoleSecurityBinding sc = (RoleSecurityBinding)i.next();
- String constraintRoleName = sc.getRole();
+ String constraintRoleName = sc.getRoleName();
if (constraintRoleName.equals(roleName) ||
SecurityConstants.UNCHECKED_ROLE_NAME.equals(constraintRoleName))
{
Modified: trunk/security/src/main/org/jboss/portal/security/AuthorizationDomainRegistry.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/AuthorizationDomainRegistry.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/security/src/main/org/jboss/portal/security/AuthorizationDomainRegistry.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -36,7 +36,7 @@
/**
*
*/
- AuthorizationDomain getDomain(String type);
+ AuthorizationDomain getDomain(String domainType);
/**
*
Modified: trunk/security/src/main/org/jboss/portal/security/RoleSecurityBinding.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/RoleSecurityBinding.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/security/src/main/org/jboss/portal/security/RoleSecurityBinding.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -43,8 +43,8 @@
/** The serialVersionUID */
private static final long serialVersionUID = 2723720035191741138L;
- /** The role of this contraint. */
- private final String role;
+ /** The role name of this contraint. */
+ private final String roleName;
/** The set of actions of this constraint. */
private final Set actions;
@@ -84,7 +84,7 @@
}
//
- this.role = role;
+ this.roleName = role;
this.actions = Collections.unmodifiableSet(set);
}
@@ -106,7 +106,7 @@
}
//
- this.role = role;
+ this.roleName = role;
this.actions = Collections.unmodifiableSet(new HashSet(actions));
}
@@ -121,7 +121,7 @@
}
//
- this.role = other.role;
+ this.roleName = other.roleName;
this.actions = other.actions;
}
@@ -140,9 +140,9 @@
*
* @return the role
*/
- public String getRole()
+ public String getRoleName()
{
- return role;
+ return roleName;
}
/**
@@ -186,7 +186,7 @@
}
tmp.append(action);
}
- tmp.append("] role [").append(role).append("]");
+ tmp.append("] role [").append(roleName).append("]");
toString = tmp.toString();
}
return toString;
@@ -201,7 +201,7 @@
if (o instanceof RoleSecurityBinding)
{
RoleSecurityBinding that = (RoleSecurityBinding)o;
- return actions.equals(that.actions) && role.equals(that.role);
+ return actions.equals(that.actions) && roleName.equals(that.roleName);
}
return false;
}
@@ -212,7 +212,7 @@
{
int hashCode;
hashCode = actions.hashCode();
- hashCode = 29 * hashCode + role.hashCode();
+ hashCode = 29 * hashCode + roleName.hashCode();
this.hashCode = hashCode;
}
return hashCode;
Modified: trunk/security/src/main/org/jboss/portal/security/SecurityConstants.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/SecurityConstants.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/security/src/main/org/jboss/portal/security/SecurityConstants.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -34,6 +34,11 @@
String UNCHECKED_ROLE_NAME = "__unchecked__".intern();
/**
+ * The mandatory role name for each authenticated user.
+ */
+ String AUTHENTICATED_ROLE_NAME = "Authenticated".intern();
+
+ /**
* An identifier that is added to the action in a permission
* to represent a recursive permission.
*/
Modified: trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -77,9 +77,9 @@
}
}
- public AuthorizationDomain getDomain(String type)
+ public AuthorizationDomain getDomain(String domainType)
{
- return (AuthorizationDomain)domains.get(type);
+ return (AuthorizationDomain)domains.get(domainType);
}
public Collection getDomains()
Modified: trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManager.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManager.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManager.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -46,6 +46,7 @@
* Has deep integration with the JBossSX Jacc Layer.
*
* @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @since Jan 30, 2006
*/
public class JACCPortalAuthorizationManager
@@ -56,7 +57,7 @@
private static Logger log = Logger.getLogger(JACCPortalAuthorizationManager.class);
/** . */
- private static final boolean isTrace = log.isTraceEnabled();
+ private static final boolean trace = log.isTraceEnabled();
/** . */
private final JACCPortalAuthorizationManagerFactory factory;
@@ -130,7 +131,7 @@
}
/**
- * @see org.jboss.portal.security.PortalAuthorizationManager#hasPermission(String, String, String)
+ *
*/
public boolean internalCheckPermission(PortalPermission permission) throws Exception
{
@@ -180,22 +181,19 @@
//
ProtectionDomain pd = new ProtectionDomain(null, null, null, principals);
Policy policy = Policy.getPolicy();
- boolean implied = policy.implies(pd, permission);
-
- //
- return implied;
+ return policy.implies(pd, permission);
}
public boolean checkPermission(PortalPermission permission) throws PortalSecurityException
{
try
{
- if (isTrace)
+ if (trace)
{
log.trace("hasPermission:uri=" + permission.getURI() + "::action=" + permission.getType() + "::type=" + permission.getType());
}
boolean result = internalCheckPermission(permission);
- if (isTrace)
+ if (trace)
{
log.trace("hasPermission:result=" + result);
}
Modified: trunk/security/src/main/org/jboss/portal/security/spi/provider/DomainConfigurator.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/spi/provider/DomainConfigurator.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/security/src/main/org/jboss/portal/security/spi/provider/DomainConfigurator.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -38,20 +38,20 @@
* @param uri
* @return a set of SecurityConstraint containing the roles and actions allowed for the resource
*/
- Set getBindings(String uri);
+ Set getSecurityBindings(String uri);
/**
* Add the provided constraints to this policy configuration
*
* @param uri
- * @param bindings
+ * @param securityBindings
*/
- void setBindings(String uri, Set bindings) throws SecurityConfigurationException;
+ void setSecurityBindings(String uri, Set securityBindings) throws SecurityConfigurationException;
/**
* Remove the contstraints for the provided uri
*
* @param uri the identifier of the secured resource
*/
- void removeBindings(String uri) throws SecurityConfigurationException;
+ void removeSecurityBindings(String uri) throws SecurityConfigurationException;
}
Modified: trunk/security/src/main/org/jboss/portal/test/security/BaseAuthorizationDomain.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/test/security/BaseAuthorizationDomain.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/security/src/main/org/jboss/portal/test/security/BaseAuthorizationDomain.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -65,7 +65,7 @@
for (Iterator i = set.iterator(); i.hasNext();)
{
RoleSecurityBinding sc = (RoleSecurityBinding)i.next();
- if (sc.getRole().equals(roleName))
+ if (sc.getRoleName().equals(roleName))
{
return getPermissionFactory().createPermission(uri, sc.getActions());
}
@@ -76,18 +76,18 @@
// ************
- public Set getBindings(String uri)
+ public Set getSecurityBindings(String uri)
{
Set set = (Set)repository.get(uri);
return set;
}
- public void setBindings(String uri, Set bindings) throws SecurityConfigurationException
+ public void setSecurityBindings(String uri, Set securityBindings) throws SecurityConfigurationException
{
- repository.put(uri, bindings);
+ repository.put(uri, securityBindings);
}
- public void removeBindings(String uri) throws SecurityConfigurationException
+ public void removeSecurityBindings(String uri) throws SecurityConfigurationException
{
repository.remove(uri);
}
Modified: trunk/security/src/main/org/jboss/portal/test/security/ComplexTestCase.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/test/security/ComplexTestCase.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/security/src/main/org/jboss/portal/test/security/ComplexTestCase.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -51,9 +51,9 @@
//
FlatAuthorizationDomain domain = new FlatAuthorizationDomain();
- domain.getConfigurator().setBindings("_admin", Collections.singleton(new RoleSecurityBinding("", "admin")));
- domain.getConfigurator().setBindings("_user", Collections.singleton(new RoleSecurityBinding("", "user")));
- domain.getConfigurator().setBindings("_unchecked", Collections.singleton(new RoleSecurityBinding("", SecurityConstants.UNCHECKED_ROLE_NAME)));
+ domain.getConfigurator().setSecurityBindings("_admin", Collections.singleton(new RoleSecurityBinding("", "admin")));
+ domain.getConfigurator().setSecurityBindings("_user", Collections.singleton(new RoleSecurityBinding("", "user")));
+ domain.getConfigurator().setSecurityBindings("_unchecked", Collections.singleton(new RoleSecurityBinding("", SecurityConstants.UNCHECKED_ROLE_NAME)));
//
JBossAuthorizationDomainRegistryImpl registry = new JBossAuthorizationDomainRegistryImpl();
Modified: trunk/security/src/main/org/jboss/portal/test/security/SimpleTestCase.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/test/security/SimpleTestCase.java 2006-10-08 00:53:10 UTC (rev 5357)
+++ trunk/security/src/main/org/jboss/portal/test/security/SimpleTestCase.java 2006-10-08 12:06:09 UTC (rev 5358)
@@ -47,7 +47,7 @@
{
//
AuthorizationDomain domain = new FlatAuthorizationDomain();
- domain.getConfigurator().setBindings("foo", Collections.singleton(new RoleSecurityBinding("", "admin")));
+ domain.getConfigurator().setSecurityBindings("foo", Collections.singleton(new RoleSecurityBinding("", "admin")));
//
PortalPermissionCollection collection = new JACCPortalPermissionCollection("admin", domain);
@@ -70,7 +70,7 @@
{
//
AuthorizationDomain domain = new HierarchyAuthorizationDomain();
- domain.getConfigurator().setBindings("/foo", Collections.singleton(new RoleSecurityBinding("viewrecursive", "admin")));
+ domain.getConfigurator().setSecurityBindings("/foo", Collections.singleton(new RoleSecurityBinding("viewrecursive", "admin")));
//
PortalPermissionCollection collection = new JACCPortalPermissionCollection("admin", domain);
@@ -91,8 +91,8 @@
});
//
- domain.getConfigurator().removeBindings("/foo");
- domain.getConfigurator().setBindings("/", Collections.singleton(new RoleSecurityBinding("viewrecursive", "admin")));
+ domain.getConfigurator().removeSecurityBindings("/foo");
+ domain.getConfigurator().setSecurityBindings("/", Collections.singleton(new RoleSecurityBinding("viewrecursive", "admin")));
//
server.execute(new Server.Task()
@@ -112,7 +112,7 @@
{
//
AuthorizationDomain domain = new HierarchyAuthorizationDomain();
- domain.getConfigurator().setBindings("/foo", Collections.singleton(new RoleSecurityBinding("view", "admin")));
+ domain.getConfigurator().setSecurityBindings("/foo", Collections.singleton(new RoleSecurityBinding("view", "admin")));
//
PortalPermissionCollection collection = new JACCPortalPermissionCollection("admin", domain);
More information about the jboss-svn-commits
mailing list