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 02:52:17 UTC

svn commit: r694570 - in /portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security: JetspeedPermission.java JetspeedPermissionManager.java JetspeedPermissionsFactory.java

Author: ate
Date: Thu Sep 11 17:52:16 2008
New Revision: 694570

URL: http://svn.apache.org/viewvc?rev=694570&view=rev
Log:
New JetspeedPermissionsFactory and mostly complete new JetspeedPermissionManager

Added:
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionsFactory.java   (with props)
Modified:
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermission.java
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionManager.java

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermission.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermission.java?rev=694570&r1=694569&r2=694570&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermission.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermission.java Thu Sep 11 17:52:16 2008
@@ -16,14 +16,14 @@
  */
 package org.apache.jetspeed.security;
 
+import java.io.Serializable;
+
 /**
  * @version $Id$
  */
-public interface JetspeedPermission
+public interface JetspeedPermission extends Serializable
 {
-    Long getId();
-
+    String getType();
     String getName();
-
     String getActions();
 }

Modified: 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/JetspeedPermissionManager.java?rev=694570&r1=694569&r2=694570&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/JetspeedPermissionManager.java Thu Sep 11 17:52:16 2008
@@ -16,23 +16,34 @@
  */
 package org.apache.jetspeed.security;
 
-import java.security.Permission;
 import java.security.Permissions;
-
-import org.apache.jetspeed.security.spi.JetspeedPermissionStorageManager;
+import java.security.Principal;
+import java.util.List;
 
 /**
  * @version $Id$
  */
-public interface JetspeedPermissionManager extends JetspeedPermissionStorageManager
+public interface JetspeedPermissionManager extends JetspeedPermissionsFactory
 {
+    boolean permissionExists(JetspeedPermission permission);
     Permissions getPermissions(JetspeedPrincipal principal);
 
-    Permissions getPermissions(Permission[] permissions);
-
-    void addPermission(PortalResourcePermission p);
-
-    void removePermission(JetspeedPermission p);
-
-    void updatePermission(JetspeedPermission p);
+    Permissions getPermissions(Principal[] principals);
+    
+    List<JetspeedPermission> getPermissions();
+
+    List<JetspeedPermission> getPermissions(String typeName);
+
+    List<JetspeedPermission> getPermissions(String typeName, String nameFilter);
+
+    List<JetspeedPrincipal> getPrincipals(JetspeedPermission permission);
+    
+    void addPermission(JetspeedPermission permission);
+    void removePermission(JetspeedPermission permission);
+    void updatePermission(JetspeedPermission permission, String actions);
+
+    void grantPermission(JetspeedPermission permission, JetspeedPrincipal principal);
+    void revokePermission(JetspeedPermission permission, JetspeedPrincipal principal);
+    void grantPermissionOnlyTo(JetspeedPermission permission, List<JetspeedPrincipal> principal);
+    void revokeAllPermissions(JetspeedPrincipal principal);
 }
\ No newline at end of file

Added: 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/JetspeedPermissionsFactory.java?rev=694570&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionsFactory.java (added)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionsFactory.java Thu Sep 11 17:52:16 2008
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jetspeed.security;
+
+/**
+ * @version $Id$
+ *
+ */
+public interface JetspeedPermissionsFactory
+{
+    String FOLDER_PERMISSION = "folder";
+    String FRAGMENT_PERMISSION = "fragment";
+    String PORTLET_PERMISSION = "portlet";
+    String PAGE_PERMISSION = "page";
+
+    JetspeedPermission newPermission(String type, String name, String actions);
+
+    JetspeedPermission newPermission(String type, String name, int mask);    
+}

Propchange: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionsFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionsFactory.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermissionsFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org