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 wo...@apache.org on 2008/09/10 16:40:14 UTC

svn commit: r693855 - in /portals/jetspeed-2/portal/branches/security-refactoring: components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/ jetspeed-api/src/main/java/org/apache/jetspeed/i18n/ jetspeed-api/src/main/java/org/apache/...

Author: woonsan
Date: Wed Sep 10 07:40:14 2008
New Revision: 693855

URL: http://svn.apache.org/viewvc?rev=693855&view=rev
Log:
Flattening Security APIs.
Modified exception-throwing by using scoped SecurityException.

Modified:
    portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java
    portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java
    portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserManagerImpl.java
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/i18n/KeyedMessage.java
    portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java

Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java?rev=693855&r1=693854&r2=693855&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java Wed Sep 10 07:40:14 2008
@@ -20,6 +20,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.jetspeed.security.DependentPrincipalException;
 import org.apache.jetspeed.security.Group;
 import org.apache.jetspeed.security.GroupManager;
 import org.apache.jetspeed.security.JetspeedPrincipal;
@@ -31,6 +32,7 @@
 import org.apache.jetspeed.security.PrincipalAssociationRequiredException;
 import org.apache.jetspeed.security.PrincipalAssociationUnsupportedException;
 import org.apache.jetspeed.security.PrincipalNotFoundException;
+import org.apache.jetspeed.security.PrincipalNotRemovableException;
 import org.apache.jetspeed.security.PrincipalReadOnlyException;
 import org.apache.jetspeed.security.PrincipalUpdateException;
 import org.apache.jetspeed.security.RoleManager;
@@ -119,23 +121,23 @@
         }
         catch (PrincipalAlreadyExistsException e)
         {
-            throw new SecurityException(SecurityException.GROUP_ALREADY_EXISTS.create(groupName)); 
+            throw new SecurityException(SecurityException.PRINCIPAL_ALREADY_EXISTS.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, groupName)); 
         }
         catch (PrincipalAssociationRequiredException e)
         {
-            throw new SecurityException(SecurityException.UNEXPECTED.create("GroupManager.addGroup", "add", e.getMessage()));
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, groupName));
         } 
         catch (PrincipalAssociationNotAllowedException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_NOT_ALLOWED.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, groupName));
         }
         catch (PrincipalAssociationUnsupportedException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, groupName));
         }
         catch (PrincipalNotFoundException e)
         {
-            // cannot occurr as no associations are provided with addPrincipal
+            throw new SecurityException(SecurityException.PRINCIPAL_DOES_NOT_EXIST.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, groupName));
         }
         
         if (log.isDebugEnabled())
@@ -152,10 +154,18 @@
         try
         {
             super.removePrincipal(groupName);
-        } 
-        catch (Exception e)
+        }
+        catch (PrincipalNotFoundException e)
+        {
+            throw new SecurityException(SecurityException.PRINCIPAL_DOES_NOT_EXIST.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, groupName));
+        }
+        catch (PrincipalNotRemovableException e)
+        {
+            throw new SecurityException(SecurityException.PRINCIPAL_NOT_REMOVABLE.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, groupName));
+        }
+        catch (DependentPrincipalException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.DEPENDENT_PRINCIPAL_EXISTS.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, groupName));
         }
     }
 
@@ -176,8 +186,7 @@
         
         if (null == group) 
         { 
-            throw new SecurityException(
-                SecurityException.GROUP_DOES_NOT_EXIST.create(groupName)); 
+            throw new SecurityException(SecurityException.PRINCIPAL_DOES_NOT_EXIST.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, groupName));
         }
 
         return group;
@@ -216,15 +225,15 @@
         } 
         catch (PrincipalNotFoundException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_DOES_NOT_EXIST.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, groupName));
         } 
         catch (PrincipalAssociationNotAllowedException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_NOT_ALLOWED.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, groupName));
         }
         catch (PrincipalAssociationUnsupportedException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, groupName));
         }
     }
 
@@ -243,7 +252,7 @@
         } 
         catch (PrincipalAssociationRequiredException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, groupName));
         }
     }
 
@@ -281,15 +290,15 @@
         }
         catch (PrincipalNotFoundException e)
         {
-            throw new SecurityException(SecurityException.GROUP_DOES_NOT_EXIST.create(group.getName()));
+            throw new SecurityException(SecurityException.PRINCIPAL_DOES_NOT_EXIST.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, group.getName()));
         }
         catch (PrincipalUpdateException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_UPDATE_FAILURE.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, group.getName()), e);
         }
         catch (PrincipalReadOnlyException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_IS_READ_ONLY.createScoped(JetspeedPrincipalType.GROUP_TYPE_NAME, group.getName()));
         }
     }
 

Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java?rev=693855&r1=693854&r2=693855&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java Wed Sep 10 07:40:14 2008
@@ -21,6 +21,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.jetspeed.security.DependentPrincipalException;
 import org.apache.jetspeed.security.Group;
 import org.apache.jetspeed.security.GroupManager;
 import org.apache.jetspeed.security.JetspeedPrincipal;
@@ -32,6 +33,7 @@
 import org.apache.jetspeed.security.PrincipalAssociationRequiredException;
 import org.apache.jetspeed.security.PrincipalAssociationUnsupportedException;
 import org.apache.jetspeed.security.PrincipalNotFoundException;
+import org.apache.jetspeed.security.PrincipalNotRemovableException;
 import org.apache.jetspeed.security.PrincipalReadOnlyException;
 import org.apache.jetspeed.security.PrincipalUpdateException;
 import org.apache.jetspeed.security.Role;
@@ -125,23 +127,23 @@
         }
         catch (PrincipalAlreadyExistsException e)
         {
-            throw new SecurityException(SecurityException.ROLE_ALREADY_EXISTS.create(roleName)); 
+            throw new SecurityException(SecurityException.PRINCIPAL_ALREADY_EXISTS.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
         }
         catch (PrincipalAssociationRequiredException e)
         {
-            throw new SecurityException(SecurityException.UNEXPECTED.create("RoleManager.addRole", "add", e.getMessage()));
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
         } 
         catch (PrincipalAssociationNotAllowedException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_NOT_ALLOWED.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
         }
         catch (PrincipalAssociationUnsupportedException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
         }
         catch (PrincipalNotFoundException e)
         {
-            // cannot occurr as no associations are provided with addPrincipal
+            throw new SecurityException(SecurityException.PRINCIPAL_DOES_NOT_EXIST.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
         }
         
         if (log.isDebugEnabled())
@@ -158,10 +160,18 @@
         try
         {
             super.removePrincipal(roleName);
-        } 
-        catch (Exception e)
+        }
+        catch (PrincipalNotFoundException e)
+        {
+            throw new SecurityException(SecurityException.PRINCIPAL_DOES_NOT_EXIST.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
+        }
+        catch (PrincipalNotRemovableException e)
+        {
+            throw new SecurityException(SecurityException.PRINCIPAL_NOT_REMOVABLE.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
+        }
+        catch (DependentPrincipalException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.DEPENDENT_PRINCIPAL_EXISTS.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
         }
     }
 
@@ -182,8 +192,7 @@
         
         if (null == role) 
         { 
-            throw new SecurityException(
-                SecurityException.ROLE_DOES_NOT_EXIST.create(roleName)); 
+            throw new SecurityException(SecurityException.PRINCIPAL_DOES_NOT_EXIST.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName)); 
         }
 
         return role;
@@ -219,15 +228,15 @@
         } 
         catch (PrincipalNotFoundException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_DOES_NOT_EXIST.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
         } 
         catch (PrincipalAssociationNotAllowedException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_NOT_ALLOWED.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
         }
         catch (PrincipalAssociationUnsupportedException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
         }
     }
 
@@ -245,7 +254,7 @@
         } 
         catch (PrincipalAssociationRequiredException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
         }
     }
 
@@ -272,15 +281,15 @@
         } 
         catch (PrincipalNotFoundException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_DOES_NOT_EXIST.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
         } 
         catch (PrincipalAssociationNotAllowedException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_NOT_ALLOWED.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
         }
         catch (PrincipalAssociationUnsupportedException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
         }
     }
 
@@ -298,7 +307,7 @@
         } 
         catch (PrincipalAssociationRequiredException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, roleName));
         }
     }
 
@@ -335,15 +344,15 @@
         }
         catch (PrincipalNotFoundException e)
         {
-            throw new SecurityException(SecurityException.ROLE_DOES_NOT_EXIST.create(role.getName()));
+            throw new SecurityException(SecurityException.PRINCIPAL_DOES_NOT_EXIST.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, role.getName()));
         }
         catch (PrincipalUpdateException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_UPDATE_FAILURE.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, role.getName()), e);
         } 
         catch (PrincipalReadOnlyException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_IS_READ_ONLY.createScoped(JetspeedPrincipalType.ROLE_TYPE_NAME, role.getName()));
         }
     }
 

Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserManagerImpl.java?rev=693855&r1=693854&r2=693855&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserManagerImpl.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/UserManagerImpl.java Wed Sep 10 07:40:14 2008
@@ -98,24 +98,23 @@
 		}
 		catch (PrincipalAlreadyExistsException e)
 		{
-			throw new SecurityException(SecurityException.USER_ALREADY_EXISTS.create(username));
+			throw new SecurityException(SecurityException.PRINCIPAL_ALREADY_EXISTS.createScoped(JetspeedPrincipalType.USER_TYPE_NAME, username));
 		}
 		catch (PrincipalAssociationRequiredException e)
 		{
-			// TODO: add SecurityException type for this?
-			throw new SecurityException(SecurityException.UNEXPECTED.create("UserManager.addUser", "add", e.getMessage()));
+			throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED.createScoped(JetspeedPrincipalType.USER_TYPE_NAME, username));
 		}
 		catch (PrincipalAssociationNotAllowedException e)
 		{
-			throw new SecurityException(SecurityException.UNEXPECTED.create("UserManager.addUser", "add", e.getMessage()));
+			throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_NOT_ALLOWED.createScoped(JetspeedPrincipalType.USER_TYPE_NAME, username));
 		}		
         catch (PrincipalAssociationUnsupportedException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED.createScoped(JetspeedPrincipalType.USER_TYPE_NAME, username));
         }
         catch (PrincipalNotFoundException e)
         {
-            // cannot occurr as no associations are provided with addPrincipal
+            throw new SecurityException(SecurityException.PRINCIPAL_DOES_NOT_EXIST.createScoped(JetspeedPrincipalType.USER_TYPE_NAME, username));
         }
 		if (log.isDebugEnabled())
 			log.debug("Added user: " + username);
@@ -256,15 +255,15 @@
 		}
 		catch (PrincipalNotFoundException pnfe)
 		{
-			throw new SecurityException(SecurityException.USER_DOES_NOT_EXIST.create(username));
+			throw new SecurityException(SecurityException.PRINCIPAL_DOES_NOT_EXIST.createScoped(JetspeedPrincipalType.USER_TYPE_NAME, username));
 		}
 		catch (PrincipalNotRemovableException pnre)
 		{
-			throw new SecurityException(SecurityException.UNEXPECTED.create(username));
+			throw new SecurityException(SecurityException.PRINCIPAL_NOT_REMOVABLE.createScoped(JetspeedPrincipalType.USER_TYPE_NAME, username));
 		}
 		catch (DependentPrincipalException dpe)
 		{
-			throw new SecurityException(SecurityException.UNEXPECTED.create(username));
+			throw new SecurityException(SecurityException.DEPENDENT_PRINCIPAL_EXISTS.createScoped(JetspeedPrincipalType.USER_TYPE_NAME, username));
 		}
 	}
 
@@ -285,15 +284,15 @@
 		}
 		catch (PrincipalNotFoundException pnfe)
 		{
-			throw new SecurityException(SecurityException.USER_DOES_NOT_EXIST.create(user.getName()));
+			throw new SecurityException(SecurityException.PRINCIPAL_DOES_NOT_EXIST.createScoped(JetspeedPrincipalType.USER_TYPE_NAME, user.getName()));
 		}
 		catch (PrincipalUpdateException pue)
 		{
-			throw new SecurityException(SecurityException.UNEXPECTED.create(user.getName()));
+			throw new SecurityException(SecurityException.PRINCIPAL_UPDATE_FAILURE.createScoped(JetspeedPrincipalType.USER_TYPE_NAME, user.getName()), pue);
 		}
         catch (PrincipalReadOnlyException e)
         {
-            throw new SecurityException(e);
+            throw new SecurityException(SecurityException.PRINCIPAL_IS_READ_ONLY.createScoped(JetspeedPrincipalType.USER_TYPE_NAME, user.getName()));
         }
 	}
 

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/i18n/KeyedMessage.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/i18n/KeyedMessage.java?rev=693855&r1=693854&r2=693855&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/i18n/KeyedMessage.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/i18n/KeyedMessage.java Wed Sep 10 07:40:14 2008
@@ -421,7 +421,7 @@
     }
 
     /**
-     * Simplied version of {@link #create(Object[])}with only one message argument
+     * Simplified version of {@link #create(Object[])}with only one message argument
      * 
      * @param single message format argument
      * @see #create(Object[])
@@ -433,7 +433,19 @@
     }
 
     /**
-     * Simplied version of {@link #createScoped(String, Object[])}with only one message argument
+     * Simplified version of {@link #createScoped(String, Object[])} without message arguments
+     * 
+     * @param scope the optional scope key infix between the containing class name and the field name
+     * @see #createScoped(String,Object[])
+     * @return derived KeyedMessage {@link #equals(Object) equal}to this with its own message format argument
+     */
+    public KeyedMessage createScoped(String scope)
+    {
+        return createScoped(scope, (Object []) null);
+    }
+
+    /**
+     * Simplified version of {@link #createScoped(String, Object[])}with only one message argument
      * 
      * @param scope the optional scope key infix between the containing class name and the field name
      * @param single message format argument
@@ -446,7 +458,7 @@
     }
 
     /**
-     * Simplied version of {@link #create(Object[])}with only two arguments
+     * Simplified version of {@link #create(Object[])}with only two arguments
      * 
      * @param single message format argument
      * @see #create(Object[])
@@ -458,7 +470,7 @@
     }
 
     /**
-     * Simplied version of {@link #createScoped(String, Object[])}with only two arguments
+     * Simplified version of {@link #createScoped(String, Object[])}with only two arguments
      * 
      * @param scope the optional scope key infix between the containing class name and the field name
      * @param single message format argument
@@ -471,7 +483,7 @@
     }
 
     /**
-     * Simplied version of {@link #create(Object[])}with only three arguments
+     * Simplified version of {@link #create(Object[])}with only three arguments
      * 
      * @param single message format argument
      * @see #create(Object[])
@@ -483,7 +495,7 @@
     }
 
     /**
-     * Simplied version of {@link #createScoped(String, Object[])}with only three arguments
+     * Simplified version of {@link #createScoped(String, Object[])}with only three arguments
      * 
      * @param scope the optional scope key infix between the containing class name and the field name
      * @param single message format argument

Modified: portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java?rev=693855&r1=693854&r2=693855&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/jetspeed-api/src/main/java/org/apache/jetspeed/security/SecurityException.java Wed Sep 10 07:40:14 2008
@@ -32,6 +32,30 @@
     /** <p>Principal does not exist exception message.</p> */
     public static final KeyedMessage PRINCIPAL_DOES_NOT_EXIST = new KeyedMessage("The principal {0} does not exist.");
 
+    /** <p>Principal already exists exception message.</p> */
+    public static final KeyedMessage PRINCIPAL_ALREADY_EXISTS = new KeyedMessage("The principal {0} already exists.");
+    
+    /** <p>Principal is read only exception message.</p> */
+    public static final KeyedMessage PRINCIPAL_IS_READ_ONLY = new KeyedMessage("The principal {0} is read-only.");
+
+    /** <p>Principal updating failed exception message.</p> */
+    public static final KeyedMessage PRINCIPAL_UPDATE_FAILURE = new KeyedMessage("Failed to update principal {0}.");
+    
+    /** <p>Principal is not removable exception message.</p> */
+    public static final KeyedMessage PRINCIPAL_NOT_REMOVABLE = new KeyedMessage("The principal {0} cannot be removed.");
+    
+    /** <p>Principal has one or more dependents. */
+    public static final KeyedMessage DEPENDENT_PRINCIPAL_EXISTS = new KeyedMessage("The principal {0} has one or more dependents.");
+    
+    /** <p>Principal association required exception message.</p> */
+    public static final KeyedMessage PRINCIPAL_ASSOCIATION_REQUIRED = new KeyedMessage("The pricipal association to {0} is required.");
+    
+    /** <p>Principal association is not allowed exception message.</p> */
+    public static final KeyedMessage PRINCIPAL_ASSOCIATION_NOT_ALLOWED = new KeyedMessage("The pricipal association to {0} is not allowed.");
+
+    /** <p>Principal association is not supported exception message.</p> */
+    public static final KeyedMessage PRINCIPAL_ASSOCIATION_UNSUPPORTED = new KeyedMessage("The principal association to {0} is not supported.");
+    
     /** <p>Permission does not exist exception message.</p> */
     public static final KeyedMessage PERMISSION_DOES_NOT_EXIST = new KeyedMessage("The permission {0} does not exist.");
     



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