paulsp 02/05/28 21:27:29
Modified: src/java/org/apache/jetspeed/portal/portlets/admin Tag:
security_14 DaemonAdminPortlet.java
src/java/org/apache/jetspeed/portal/security/portlets Tag:
security_14 PortletWrapper.java
src/java/org/apache/jetspeed/portal/controls Tag:
security_14 AbstractPortletControl.java
src/java/org/apache/jetspeed/portal Tag: security_14
BasePortletSet.java
Log:
Convert to PortalAccessController version of getPermission via the
JetspeedSecurity static accessor
Revision Changes Path
No revision
No revision
1.22.2.1 +5 -4
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/DaemonAdminPortlet.java
Index: DaemonAdminPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/DaemonAdminPortlet.java,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -r1.22 -r1.22.2.1
--- DaemonAdminPortlet.java 4 Dec 2001 16:57:18 -0000 1.22
+++ DaemonAdminPortlet.java 29 May 2002 04:27:28 -0000 1.22.2.1
@@ -65,6 +65,7 @@
import org.apache.jetspeed.daemon.*;
import org.apache.jetspeed.daemon.impl.*;
import org.apache.jetspeed.cache.disk.*;
+import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.services.daemonfactory.DaemonFactory;
import org.apache.jetspeed.services.JetspeedSecurity;
@@ -82,7 +83,7 @@
@author <a href="mailto:[EMAIL PROTECTED]";>Kevin A. Burton</a>
@author <a href="mailto:[EMAIL PROTECTED]";>Raphael Luta</a>
@author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
-@version $Id: DaemonAdminPortlet.java,v 1.22 2001/12/04 16:57:18 sgala Exp $
+@version $Id: DaemonAdminPortlet.java,v 1.22.2.1 2002/05/29 04:27:28 paulsp Exp $
*/
public class DaemonAdminPortlet extends AbstractPortlet {
@@ -96,9 +97,9 @@
public ConcreteElement getContent( RunData rundata ) {
- if (!JetspeedSecurity.checkPermission(rundata,
- JetspeedSecurity.PERMISSION_VIEW,
- this))
+ if (!JetspeedSecurity.checkPermission((JetspeedUser) rundata.getUser(),
+ this,
+ JetspeedSecurity.PERMISSION_VIEW))
{
return new ClearElement("Sorry, you have no permission to see this
portlet");
}
No revision
No revision
1.5.2.1 +7 -7
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets/PortletWrapper.java
Index: PortletWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/security/portlets/PortletWrapper.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- PortletWrapper.java 18 Apr 2002 00:10:21 -0000 1.5
+++ PortletWrapper.java 29 May 2002 04:27:28 -0000 1.5.2.1
@@ -55,6 +55,7 @@
package org.apache.jetspeed.portal.security.portlets;
//jetspeed
+import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.portal.PortletState;
import org.apache.jetspeed.portal.PortletConfig;
@@ -65,6 +66,7 @@
import org.apache.jetspeed.services.JetspeedSecurity;
+import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineRuntimeException;
@@ -80,7 +82,7 @@
</p>
@author <A HREF="mailto:[EMAIL PROTECTED]";>Santiago Gala</A>
-@version $Id: PortletWrapper.java,v 1.5 2002/04/18 00:10:21 taylor Exp $
+@version $Id: PortletWrapper.java,v 1.5.2.1 2002/05/29 04:27:28 paulsp Exp $
*/
public class PortletWrapper implements Portlet
{
@@ -261,15 +263,13 @@
protected boolean checkPermission( RunData rundata,
String permissionName )
{
- /*
- org.apache.turbine.util.Log.debug( "checking for Portlet permission: " +
+ Log.debug( "checking for Portlet permission: " +
permissionName +
" for portlet: " +
wrappedPortlet.getName() );
- */
- return JetspeedSecurity.checkPermission( rundata,
- permissionName,
- wrappedPortlet );
+ return JetspeedSecurity.checkPermission( (JetspeedUser) rundata.getUser(),
+ wrappedPortlet,
+ permissionName);
}
No revision
No revision
1.15.2.1 +24 -19
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/AbstractPortletControl.java
Index: AbstractPortletControl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/AbstractPortletControl.java,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- AbstractPortletControl.java 11 Mar 2002 07:22:11 -0000 1.15
+++ AbstractPortletControl.java 29 May 2002 04:27:28 -0000 1.15.2.1
@@ -59,6 +59,10 @@
import java.util.Iterator;
import java.util.Vector;
+// Jetspeed imports
+import org.apache.jetspeed.om.registry.PortletControlEntry;
+import org.apache.jetspeed.om.registry.MediaTypeEntry;
+import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.portal.PortletState;
import org.apache.jetspeed.portal.PortletConfig;
@@ -70,13 +74,14 @@
import org.apache.jetspeed.portal.PortletException;
import org.apache.jetspeed.portal.portlets.AbstractPortlet;
import org.apache.jetspeed.services.Registry;
-import org.apache.jetspeed.om.registry.PortletControlEntry;
-import org.apache.jetspeed.om.registry.MediaTypeEntry;
+import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.util.MimeType;
+
+// Turbine imports
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.Log;
-import org.apache.jetspeed.services.JetspeedSecurity;
+// ECS imports
import org.apache.ecs.ElementContainer;
import org.apache.ecs.ConcreteElement;
@@ -91,7 +96,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rapha�l Luta</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
- * @version $Id: AbstractPortletControl.java,v 1.15 2002/03/11 07:22:11 taylor Exp $
+ * @version $Id: AbstractPortletControl.java,v 1.15.2.1 2002/05/29 04:27:28 paulsp
Exp $
*/
public abstract class AbstractPortletControl extends AbstractPortlet
implements PortletControl
@@ -570,9 +575,9 @@
if (p==null) return false;
if ((p instanceof PortletSet)
- ||(JetspeedSecurity.checkPermission(rundata,
- JetspeedSecurity.PERMISSION_CLOSE,
- p)))
+ ||(JetspeedSecurity.checkPermission((JetspeedUser) rundata.getUser(),
+ p,
+ JetspeedSecurity.PERMISSION_CLOSE)))
{
if (p instanceof PortletState)
{
@@ -627,9 +632,9 @@
if (p==null) return false;
if ((p instanceof PortletSet)
- ||(JetspeedSecurity.checkPermission(rundata,
- JetspeedSecurity.PERMISSION_INFO,
- p)))
+ ||(JetspeedSecurity.checkPermission((JetspeedUser) rundata.getUser(),
+ p,
+ JetspeedSecurity.PERMISSION_INFO)))
{
if (p instanceof PortletState)
{
@@ -653,9 +658,9 @@
if (p==null) return false;
if ((p instanceof PortletSet)
- ||(JetspeedSecurity.checkPermission(rundata,
-
JetspeedSecurity.PERMISSION_CUSTOMIZE,
- p)))
+ ||(JetspeedSecurity.checkPermission((JetspeedUser) rundata.getUser(),
+ p,
+
JetspeedSecurity.PERMISSION_CUSTOMIZE)))
{
if (p instanceof PortletState)
{
@@ -679,9 +684,9 @@
if (p==null) return false;
if ((p instanceof PortletSet)
- ||(JetspeedSecurity.checkPermission(rundata,
-
JetspeedSecurity.PERMISSION_MAXIMIZE,
- p)))
+ ||(JetspeedSecurity.checkPermission((JetspeedUser) rundata.getUser(),
+ p,
+
JetspeedSecurity.PERMISSION_MAXIMIZE)))
{
if (p instanceof PortletState)
{
@@ -705,9 +710,9 @@
if (p==null) return false;
if ((p instanceof PortletSet)
- ||(JetspeedSecurity.checkPermission(rundata,
-
JetspeedSecurity.PERMISSION_MINIMIZE,
- p)))
+ ||(JetspeedSecurity.checkPermission((JetspeedUser) rundata.getUser(),
+ p,
+
JetspeedSecurity.PERMISSION_MINIMIZE)))
{
if (p instanceof PortletState)
{
No revision
No revision
1.18.2.1 +8 -8
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSet.java
Index: BasePortletSet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSet.java,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- BasePortletSet.java 29 Mar 2002 20:12:32 -0000 1.18
+++ BasePortletSet.java 29 May 2002 04:27:29 -0000 1.18.2.1
@@ -60,12 +60,12 @@
import java.util.Enumeration;
//Jetspeed stuff
-import org.apache.jetspeed.capability.*;
-import org.apache.jetspeed.util.*;
-import org.apache.jetspeed.portal.expire.*;
-import org.apache.jetspeed.services.JetspeedSecurity;
+import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.portal.service.PersistenceService;
import org.apache.jetspeed.portal.service.ServiceFactory;
+import org.apache.jetspeed.services.JetspeedSecurity;
+import org.apache.jetspeed.util.MetaData;
+import org.apache.jetspeed.util.MimeType;
//turbine stuff
import org.apache.turbine.util.Log;
@@ -84,7 +84,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rapha�l Luta</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Kevin A. Burton</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
- * @version $Id: BasePortletSet.java,v 1.18 2002/03/29 20:12:32 taylor Exp $
+ * @version $Id: BasePortletSet.java,v 1.18.2.1 2002/05/29 04:27:29 paulsp Exp $
*/
public class BasePortletSet implements PortletSet, Portlet, PortletState
{
@@ -574,9 +574,9 @@
{
return false; //No permission if user not logged in
}
- return (JetspeedSecurity.checkPermission(rundata,
- JetspeedSecurity.PERMISSION_INFO,
- this));
+ return (JetspeedSecurity.checkPermission((JetspeedUser)rundata.getUser(),
+ this,
+ JetspeedSecurity.PERMISSION_INFO));
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
