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, 15 insertions, 15 deletions

diff --git a/src/main/java/com/c2kernel/lookup/Lookup.java b/src/main/java/com/c2kernel/lookup/Lookup.java
index 924057a..f7e4f59 100644
--- a/src/main/java/com/c2kernel/lookup/Lookup.java
+++ b/src/main/java/com/c2kernel/lookup/Lookup.java
@@ -22,7 +22,7 @@ package com.c2kernel.lookup;
 

 import java.util.Iterator;

 

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.ObjectNotFound;

 import com.c2kernel.process.auth.Authenticator;

 import com.c2kernel.property.Property;

 import com.c2kernel.property.PropertyDescriptionList;

@@ -53,9 +53,9 @@ public interface Lookup {
 	 * @param sysKey The system key of the Item

 	 * @return an ItemPath or AgentPath

 	 * @throws InvalidItemPathException When the system key is invalid/out-of-range

-	 * @throws ObjectNotFoundException When the Item does not exist in the directory.

+	 * @throws ObjectNotFound When the Item does not exist in the directory.

 	 */

-	public ItemPath getItemPath(String sysKey) throws InvalidItemPathException, ObjectNotFoundException;

+	public ItemPath getItemPath(String sysKey) throws InvalidItemPathException, ObjectNotFound;

 	

 	/**

 	 * Find the ItemPath for which a DomainPath is an alias.

@@ -63,18 +63,18 @@ public interface Lookup {
 	 * @param domainPath The path to resolve

 	 * @return The ItemPath it points to (should be an AgentPath if the path references an Agent)

 	 * @throws InvalidItemPathException

-	 * @throws ObjectNotFoundException

+	 * @throws ObjectNotFound

 	 */

-	public ItemPath resolvePath(DomainPath domainPath) throws InvalidItemPathException, ObjectNotFoundException;

+	public ItemPath resolvePath(DomainPath domainPath) throws InvalidItemPathException, ObjectNotFound;

 

 	/**

 	 * Resolve a path to a CORBA Object Item or Agent

 	 * 

 	 * @param path The path to be resolved

 	 * @return The CORBA Object

-	 * @throws ObjectNotFoundException When the Path doesn't exist, or doesn't have an IOR associated with it

+	 * @throws ObjectNotFound When the Path doesn't exist, or doesn't have an IOR associated with it

 	 */

-	public org.omg.CORBA.Object resolve(Path path) throws ObjectNotFoundException;

+	public org.omg.CORBA.Object resolve(Path path) throws ObjectNotFound;

 

 	// Path finding and searching

 	

@@ -131,23 +131,23 @@ public interface Lookup {
 	/**

 	 * @param agentName

 	 * @return

-	 * @throws ObjectNotFoundException

+	 * @throws ObjectNotFound

 	 */

-	public AgentPath getAgentPath(String agentName) throws ObjectNotFoundException;

+	public AgentPath getAgentPath(String agentName) throws ObjectNotFound;

 

 	/**

 	 * @param roleName

 	 * @return

-	 * @throws ObjectNotFoundException

+	 * @throws ObjectNotFound

 	 */

-	public RolePath getRolePath(String roleName) throws ObjectNotFoundException;

+	public RolePath getRolePath(String roleName) throws ObjectNotFound;

 	

 	/**

 	 * @param rolePath

 	 * @return

-	 * @throws ObjectNotFoundException

+	 * @throws ObjectNotFound

 	 */

-	public AgentPath[] getAgents(RolePath rolePath) throws ObjectNotFoundException;

+	public AgentPath[] getAgents(RolePath rolePath) throws ObjectNotFound;

 

 	/**

 	 * @param agentPath

@@ -167,8 +167,8 @@ public interface Lookup {
 	/**

 	 * @param agentPath

 	 * @return

-	 * @throws ObjectNotFoundException

+	 * @throws ObjectNotFound

 	 */

-	public String getAgentName(AgentPath agentPath) throws ObjectNotFoundException;

+	public String getAgentName(AgentPath agentPath) throws ObjectNotFound;

 	

 }