taylor 01/09/04 22:48:06
Modified: src/java/org/apache/jetspeed/services JetspeedSecurity.java
src/java/org/apache/jetspeed/services/security
AccessControl.java JetspeedDBSecurityService.java
Log:
- added support for checking permissions on all registry entries, not just portlet
registry entries
Revision Changes Path
1.8 +3 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/services/JetspeedSecurity.java
Index: JetspeedSecurity.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/JetspeedSecurity.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JetspeedSecurity.java 2001/07/30 06:45:16 1.7
+++ JetspeedSecurity.java 2001/09/05 05:48:06 1.8
@@ -60,7 +60,7 @@
import org.apache.turbine.om.security.Role;
import org.apache.jetspeed.services.security.*;
import org.apache.turbine.util.RunData;
-import org.apache.jetspeed.om.registry.PortletEntry;
+import org.apache.jetspeed.om.registry.RegistryEntry;
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.EntityExistsException;
import org.apache.jetspeed.om.profile.ProfileException;
@@ -73,7 +73,7 @@
*
* @see org.apache.jetspeed.services.security.JetspeedSecurityService
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
- * @version $Id: JetspeedSecurity.java,v 1.7 2001/07/30 06:45:16 taylor Exp $
+ * @version $Id: JetspeedSecurity.java,v 1.8 2001/09/05 05:48:06 taylor Exp $
*/
abstract public class JetspeedSecurity extends TurbineSecurity
@@ -105,7 +105,7 @@
/**
* @see JetspeedSecurityService#checkPermission
*/
- public static boolean checkPermission(RunData runData, String permission,
PortletEntry entry)
+ public static boolean checkPermission(RunData runData, String permission,
RegistryEntry entry)
{
return ((JetspeedSecurityService)getService()).checkPermission(runData,
permission, entry);
}
1.4 +3 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/AccessControl.java
Index: AccessControl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/AccessControl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AccessControl.java 2001/07/29 13:42:01 1.3
+++ AccessControl.java 2001/09/05 05:48:06 1.4
@@ -56,7 +56,7 @@
import org.apache.turbine.util.RunData;
import org.apache.jetspeed.portal.Portlet;
-import org.apache.jetspeed.om.registry.PortletEntry;
+import org.apache.jetspeed.om.registry.RegistryEntry;
import org.apache.jetspeed.om.profile.Profile;
/**
@@ -65,13 +65,13 @@
*
* @see org.apache.jetspeed.services.security.JetspeedSecurityService
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
- * @version $Id: AccessControl.java,v 1.3 2001/07/29 13:42:01 raphael Exp $
+ * @version $Id: AccessControl.java,v 1.4 2001/09/05 05:48:06 taylor Exp $
*/
public interface AccessControl {
boolean checkPermission(RunData runData, String permission, Portlet portlet);
- boolean checkPermission(RunData runData, String action, PortletEntry entry);
+ boolean checkPermission(RunData runData, String action, RegistryEntry entry);
boolean checkPermission(String user, String action, Portlet portlet);
// TODO: get requirements for controlling access to other OM elements
1.11 +3 -3
jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/JetspeedDBSecurityService.java
Index: JetspeedDBSecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/JetspeedDBSecurityService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JetspeedDBSecurityService.java 2001/07/30 06:45:16 1.10
+++ JetspeedDBSecurityService.java 2001/09/05 05:48:06 1.11
@@ -83,7 +83,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
- * @version $Id: JetspeedDBSecurityService.java,v 1.10 2001/07/30 06:45:16 taylor
Exp $
+ * @version $Id: JetspeedDBSecurityService.java,v 1.11 2001/09/05 05:48:06 taylor
Exp $
*/
@@ -127,11 +127,11 @@
*
* @param rundata the request rundata.
* @param permission the jetspeed-action (view, edit, customize, delete...) for
which permission is being checked.
- * @param portlet the portlet entry from the registry.
+ * @param entry the registry entry from the registry.
* @exception Sends a RegistryException if the manager can't add
* the provided entry
*/
- public boolean checkPermission(RunData runData, String permission, PortletEntry
entry)
+ public boolean checkPermission(RunData runData, String permission,
RegistryEntry entry)
{
Security security = entry.getSecurity();
if (null == security)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
