Author: cziegeler
Date: Thu Feb 3 13:28:27 2005
New Revision: 151233
URL: http://svn.apache.org/viewcvs?view=rev&rev=151233
Log:
Remove obsolete users object
Removed:
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/model/User.java
Modified:
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/acting/CheckAccessAction.java
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/MultipleRoleMatcher.java
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/RoleMatcher.java
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/SingleRoleMatcher.java
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/service/UserrightsService.java
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java
cocoon/trunk/src/blocks/portal/samples/tools/sitemap.xmap
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java
Modified:
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/acting/CheckAccessAction.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/acting/CheckAccessAction.java?view=diff&r1=151232&r2=151233
==============================================================================
---
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/acting/CheckAccessAction.java
(original)
+++
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/acting/CheckAccessAction.java
Thu Feb 3 13:28:27 2005
@@ -24,7 +24,6 @@
import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.portal.tools.PortalToolManager;
-import org.apache.cocoon.portal.tools.model.User;
import org.apache.cocoon.portal.tools.service.UserrightsService;
/**
@@ -45,15 +44,12 @@
String source,
Parameters parameters)
throws Exception {
- String name = parameters.getParameter("name", "anonymous");
- String role = parameters.getParameter("role", "guest");
String url = parameters.getParameter("url");
- User user = new User(name, role);
PortalToolManager ptm = (PortalToolManager)
this.manager.lookup(PortalToolManager.ROLE);
try {
UserrightsService userrightsService = ptm.getUserRightsService();
// FIXME: replace the throw with something else
- if (!userrightsService.userIsAllowed(url, user)) {
+ if (!userrightsService.userIsAllowed(url,
ptm.getPortalObjects().getPortalService().getComponentManager().getProfileManager().getUser()))
{
throw new ProcessingException(
"You are not allowed to request this page.");
}
Modified:
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/MultipleRoleMatcher.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/MultipleRoleMatcher.java?view=diff&r1=151232&r2=151233
==============================================================================
---
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/MultipleRoleMatcher.java
(original)
+++
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/MultipleRoleMatcher.java
Thu Feb 3 13:28:27 2005
@@ -17,7 +17,7 @@
import java.util.StringTokenizer;
-import org.apache.cocoon.portal.tools.model.User;
+import org.apache.cocoon.portal.profile.PortalUser;
/**
* A role matcher matching against several role.
@@ -62,11 +62,11 @@
*
* @see
com.vodafone.veap.util.RoleMatcher#matches(com.vodafone.veap.model.User)
*/
- public boolean matches(User user) {
+ public boolean matches(PortalUser user) {
// The user must have all roles
int length = this.roles.length;
for (int i = 0; i < length; i++) {
- if (!user.hasRole(this.roles[i])) {
+ if (!user.isUserInRole(this.roles[i])) {
return false;
}
}
Modified:
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java?view=diff&r1=151232&r2=151233
==============================================================================
---
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java
(original)
+++
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java
Thu Feb 3 13:28:27 2005
@@ -27,7 +27,6 @@
public class PortalObjects {
private PortalService portalService;
- private String portalName;
private PortalComponentManager componentManager;
private ProfileManager profileManager;
private Layout portalLayout;
Modified:
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/RoleMatcher.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/RoleMatcher.java?view=diff&r1=151232&r2=151233
==============================================================================
---
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/RoleMatcher.java
(original)
+++
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/RoleMatcher.java
Thu Feb 3 13:28:27 2005
@@ -15,7 +15,7 @@
*/
package org.apache.cocoon.portal.tools.helper;
-import org.apache.cocoon.portal.tools.model.User;
+import org.apache.cocoon.portal.profile.PortalUser;
/**
* Defines the interface for role matchers.
@@ -27,5 +27,5 @@
/**
* @return Whether the user matches this role.
*/
- boolean matches(User user);
+ boolean matches(PortalUser user);
}
Modified:
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/SingleRoleMatcher.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/SingleRoleMatcher.java?view=diff&r1=151232&r2=151233
==============================================================================
---
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/SingleRoleMatcher.java
(original)
+++
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/helper/SingleRoleMatcher.java
Thu Feb 3 13:28:27 2005
@@ -15,7 +15,7 @@
*/
package org.apache.cocoon.portal.tools.helper;
-import org.apache.cocoon.portal.tools.model.User;
+import org.apache.cocoon.portal.profile.PortalUser;
/**
* A role matcher matching against a single role.
@@ -42,7 +42,7 @@
*
* @see
com.vodafone.veap.util.RoleMatcher#matches(com.vodafone.veap.model.User)
*/
- public boolean matches(User user) {
- return user.hasRole(this.role);
+ public boolean matches(PortalUser user) {
+ return user.isUserInRole(this.role);
}
}
Modified:
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/service/UserrightsService.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/service/UserrightsService.java?view=diff&r1=151232&r2=151233
==============================================================================
---
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/service/UserrightsService.java
(original)
+++
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/service/UserrightsService.java
Thu Feb 3 13:28:27 2005
@@ -23,10 +23,10 @@
import java.util.StringTokenizer;
import org.apache.cocoon.matching.helpers.WildcardHelper;
+import org.apache.cocoon.portal.profile.PortalUser;
import org.apache.cocoon.portal.tools.helper.MultipleRoleMatcher;
import org.apache.cocoon.portal.tools.helper.RoleMatcher;
import org.apache.cocoon.portal.tools.helper.SingleRoleMatcher;
-import org.apache.cocoon.portal.tools.model.User;
import org.apache.excalibur.source.Source;
/**
@@ -128,7 +128,7 @@
/**
* @return Whether the current user is allowed to call the given url.
*/
- public boolean userIsAllowed(String url, User user) {
+ public boolean userIsAllowed(String url, PortalUser user) {
this.initialize();
boolean isAllowed = true;
@@ -160,7 +160,7 @@
return isAllowed;
}
- public boolean userFunctionIsAllowed(String id, User user) {
+ public boolean userFunctionIsAllowed(String id, PortalUser user) {
this.initialize();
boolean isAllowed = true;
Modified:
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java?view=diff&r1=151232&r2=151233
==============================================================================
---
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java
(original)
+++
cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/tools/transformation/CheckAccessTransformer.java
Thu Feb 3 13:28:27 2005
@@ -16,13 +16,9 @@
package org.apache.cocoon.portal.tools.transformation;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.parameters.Parameterizable;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.portal.tools.PortalToolManager;
-import org.apache.cocoon.portal.tools.model.User;
import org.apache.cocoon.portal.tools.service.UserrightsService;
import org.apache.cocoon.transformation.AbstractSAXTransformer;
import org.apache.cocoon.xml.IncludeXMLConsumer;
@@ -34,7 +30,9 @@
*
* @version CVS $Id$
*/
-public class CheckAccessTransformer extends AbstractSAXTransformer implements
Parameterizable, Disposable {
+public class CheckAccessTransformer
+extends AbstractSAXTransformer
+implements Disposable {
public static final String RIGHTS_NAMESPACE_URI =
"http://apache.org/cocoon/portal/tools/rights/1.0";;
@@ -43,16 +41,8 @@
private UserrightsService urs;
private PortalToolManager ptm;
- private User user;
- /* (non-Javadoc)
- * @see
org.apache.avalon.framework.parameters.Parameterizable#parameterize(org.apache.avalon.framework.parameters.Parameters)
- */
- public void parameterize(Parameters para) throws ParameterException {
- this.user = new User(para.getParameter("user"),
para.getParameter("role"));
- }
-
- /* (non-Javadoc)
+ /* (non-Javadoc)
* @see
org.apache.cocoon.transformation.AbstractSAXTransformer#service(org.apache.avalon.framework.service.ServiceManager)
*/
public void service(ServiceManager manager) throws ServiceException {
@@ -64,11 +54,11 @@
/* (non-Javadoc)
* @see
org.apache.cocoon.transformation.AbstractSAXTransformer#startElement(java.lang.String,
java.lang.String, java.lang.String, org.xml.sax.Attributes)
*/
- public void startElement(String uri, String name, String raw,
- Attributes attr) throws SAXException {
- if(RIGHTS_NAMESPACE_URI.equals(uri) && ACCESS_TAG.equals(name)) {
+ public void startElement(String uri, String name, String raw, Attributes
attr)
+ throws SAXException {
+ if (RIGHTS_NAMESPACE_URI.equals(uri) && ACCESS_TAG.equals(name)) {
String id = attr.getValue(RIGHT_ID);
- if(!urs.userIsAllowed(id, user)) {
+ if(!urs.userIsAllowed(id,
this.ptm.getPortalObjects().getProfileManager().getUser())) {
this.stack.push(new Boolean(false));
}
this.startRecording();
Modified: cocoon/trunk/src/blocks/portal/samples/tools/sitemap.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/samples/tools/sitemap.xmap?view=diff&r1=151232&r2=151233
==============================================================================
--- cocoon/trunk/src/blocks/portal/samples/tools/sitemap.xmap (original)
+++ cocoon/trunk/src/blocks/portal/samples/tools/sitemap.xmap Thu Feb 3
13:28:27 2005
@@ -112,8 +112,6 @@
<map:parameter name="handler" value="portal-handler"/>
<map:parameter name="application" value="portal"/>
<map:act type="check-access-action">
- <map:parameter name="name" value="{ID}"/>
- <map:parameter name="role" value="{role}"/>
<map:parameter name="url" value="{../1}/{../2}"/>
<map:mount uri-prefix="plugins/{../../1}"
check-reload="yes" src="plugins/{../../1}/sitemap.xmap"/>
</map:act>
Modified:
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java?view=diff&r1=151232&r2=151233
==============================================================================
---
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java
(original)
+++
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/handler/AbstractComponentHandler.java
Thu Feb 3 13:28:27 2005
@@ -97,7 +97,7 @@
if( Poolable.class.isAssignableFrom( componentClass ) ) {
numInterfaces++;
- info.setModel(ComponentInfo.MODEL_POOLED);
+ info.setModel(ComponentInfo.MODEL_NON_THREAD_SAFE_POOLED);
if (
"non-thread-safe-pooled".equals(info.getConfiguration().getAttribute("model",
null))) {
info.setModel(ComponentInfo.MODEL_NON_THREAD_SAFE_POOLED);
}
