Huge exception overhaul: Merged ClusterStorageException with

PersistencyException. Replaced MembershipException with
InvalidCollectionModification CORBA Exception. Made all predef steps
throw more accurate exceptions when they go wrong, and let more
exceptions bubble through from underneath.

1 files changed, 16 insertions, 16 deletions

diff --git a/src/main/java/com/c2kernel/lookup/LookupManager.java b/src/main/java/com/c2kernel/lookup/LookupManager.java
index b05a4a4..620c522 100644
--- a/src/main/java/com/c2kernel/lookup/LookupManager.java
+++ b/src/main/java/com/c2kernel/lookup/LookupManager.java
@@ -22,9 +22,9 @@ package com.c2kernel.lookup;
 

 import java.security.NoSuchAlgorithmException;

 

-import com.c2kernel.common.ObjectAlreadyExistsException;

+import com.c2kernel.common.ObjectAlreadyExists;

 import com.c2kernel.common.ObjectCannotBeUpdated;

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.ObjectNotFound;

 

 /**

  * @author abranson

@@ -35,9 +35,9 @@ public interface LookupManager extends Lookup {
 	/**

 	 * Called when a server starts up. The Lookup implementation should ensure that the initial structure of its directory is valid, and create it on first boot.

 	 * 

-	 * @throws ObjectNotFoundException When initialization data is not found

+	 * @throws ObjectNotFound When initialization data is not found

 	 */

-	public void initializeDirectory() throws ObjectNotFoundException;

+	public void initializeDirectory() throws ObjectNotFound;

 	

 	// Path management

 	

@@ -46,9 +46,9 @@ public interface LookupManager extends Lookup {
 	 * 

 	 * @param newPath The path to add

 	 * @throws ObjectCannotBeUpdated When there is an error writing to the directory

-	 * @throws ObjectAlreadyExistsException When the Path has already been registered

+	 * @throws ObjectAlreadyExists When the Path has already been registered

 	 */

-	public void add(Path newPath) throws ObjectCannotBeUpdated, ObjectAlreadyExistsException;

+	public void add(Path newPath) throws ObjectCannotBeUpdated, ObjectAlreadyExists;

 

 	/**

 	 * Remove a Path from the directory

@@ -65,10 +65,10 @@ public interface LookupManager extends Lookup {
 	 * @param role

 	 * @param hasJobList

 	 * @return

-	 * @throws ObjectAlreadyExistsException

+	 * @throws ObjectAlreadyExists

 	 * @throws ObjectCannotBeUpdated

 	 */

-	public RolePath createRole(RolePath role) throws ObjectAlreadyExistsException, ObjectCannotBeUpdated;

+	public RolePath createRole(RolePath role) throws ObjectAlreadyExists, ObjectCannotBeUpdated;

 

 	/**

 	 * Adds the given Agent to the given Role, if they both exist.

@@ -76,9 +76,9 @@ public interface LookupManager extends Lookup {
 	 * @param agent - the 

 	 * @param rolePath

 	 * @throws ObjectCannotBeUpdated

-	 * @throws ObjectNotFoundException

+	 * @throws ObjectNotFound

 	 */

-	public void addRole(AgentPath agent, RolePath rolePath) throws ObjectCannotBeUpdated, ObjectNotFoundException;

+	public void addRole(AgentPath agent, RolePath rolePath) throws ObjectCannotBeUpdated, ObjectNotFound;

 

 	/**

 	 * Removes the given Agent from the given Role. Does not delete the Role.

@@ -86,26 +86,26 @@ public interface LookupManager extends Lookup {
 	 * @param agent

 	 * @param role

 	 * @throws ObjectCannotBeUpdated

-	 * @throws ObjectNotFoundException

+	 * @throws ObjectNotFound

 	 */

-	public void removeRole(AgentPath agent, RolePath role) throws ObjectCannotBeUpdated, ObjectNotFoundException;

+	public void removeRole(AgentPath agent, RolePath role) throws ObjectCannotBeUpdated, ObjectNotFound;

 

 	/**

 	 * @param agent

 	 * @param newPassword

-	 * @throws ObjectNotFoundException

+	 * @throws ObjectNotFound

 	 * @throws ObjectCannotBeUpdated

 	 * @throws NoSuchAlgorithmException

 	 */

-	public void setAgentPassword(AgentPath agent, String newPassword) throws ObjectNotFoundException, ObjectCannotBeUpdated, NoSuchAlgorithmException;

+	public void setAgentPassword(AgentPath agent, String newPassword) throws ObjectNotFound, ObjectCannotBeUpdated, NoSuchAlgorithmException;

 	

 	/**

 	 * @param role

 	 * @param hasJobList

-	 * @throws ObjectNotFoundException

+	 * @throws ObjectNotFound

 	 * @throws ObjectCannotBeUpdated

 	 */

-	public void setHasJobList(RolePath role, boolean hasJobList) throws ObjectNotFoundException, ObjectCannotBeUpdated;

+	public void setHasJobList(RolePath role, boolean hasJobList) throws ObjectNotFound, ObjectCannotBeUpdated;

 

 

 }