diff options
Diffstat (limited to 'src/main/java/com/c2kernel/process')
10 files changed, 73 insertions, 73 deletions
diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java index eebdc47..6a82363 100644 --- a/src/main/java/com/c2kernel/process/Bootstrap.java +++ b/src/main/java/com/c2kernel/process/Bootstrap.java @@ -30,8 +30,8 @@ import java.util.UUID; import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.XMLUnit;
-import com.c2kernel.common.InvalidData;
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.ObjectNotFoundException;
import com.c2kernel.entity.proxy.AgentProxy;
import com.c2kernel.entity.proxy.ItemProxy;
import com.c2kernel.events.Event;
@@ -176,7 +176,7 @@ public class Bootstrap Logger.error("Bootstrap.verifyResource() - Module clash! Resource '"+itemName+"' included in module "+moduleName+" but is assigned to '"+itemModule+"'. Not overwriting.");
return path;
}
- } catch (ObjectNotFound ex) {
+ } catch (ObjectNotFoundException ex) {
itemModule = "";
}
@@ -214,7 +214,7 @@ public class Bootstrap }
}
- } catch (ObjectNotFound ex) {
+ } catch (ObjectNotFoundException ex) {
Logger.msg("Bootstrap.verifyResource() - Item "+itemName+" exists but version "+version+" not found! Attempting to insert new.");
}
@@ -225,7 +225,7 @@ public class Bootstrap String error = validator.validate(newOutcome.getData());
if (error.length() > 0) {
Logger.error("Outcome not valid: \n " + error);
- throw new InvalidData(error);
+ throw new InvalidDataException(error);
}
}
@@ -287,7 +287,7 @@ public class Bootstrap if (ns!=null && Gateway.getProperties().getBoolean("Module.debug", false))
try {
ca = (CompositeActivity) ((CompositeActivityDef)LocalObjectLoader.getActDef(impHandler.getWorkflowName(), 0)).instantiate();
- } catch (ObjectNotFound ex) {
+ } catch (ObjectNotFoundException ex) {
Logger.error("Module resource workflow "+impHandler.getWorkflowName()+" not found. Using empty.");
}
@@ -313,7 +313,7 @@ public class Bootstrap systemAgents.put(name, Gateway.getProxyManager().getAgentProxy(lookup.getAgentPath(name)));
Logger.msg(3, "Bootstrap.checkAgent() - User '"+name+"' found.");
return;
- } catch (ObjectNotFound ex) { }
+ } catch (ObjectNotFoundException ex) { }
Logger.msg("Bootstrap.checkAgent() - User '"+name+"' not found. Creating.");
@@ -365,7 +365,7 @@ public class Bootstrap ItemPath serverEntity;
try {
serverEntity = thisServerPath.getItemPath();
- } catch (ObjectNotFound ex) {
+ } catch (ObjectNotFoundException ex) {
Logger.msg("Creating server item "+thisServerPath);
serverEntity = new ItemPath();
Gateway.getCorbaServer().createItem(serverEntity);
diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java index 25f5d9a..5dde6e6 100644 --- a/src/main/java/com/c2kernel/process/Gateway.java +++ b/src/main/java/com/c2kernel/process/Gateway.java @@ -29,9 +29,9 @@ import java.net.MalformedURLException; import java.util.Enumeration;
import java.util.Properties;
-import com.c2kernel.common.CannotManage;
-import com.c2kernel.common.InvalidData;
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.CannotManageException;
+import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.ObjectNotFoundException;
import com.c2kernel.common.PersistencyException;
import com.c2kernel.entity.CorbaServer;
import com.c2kernel.entity.proxy.AgentProxy;
@@ -97,9 +97,9 @@ public class Gateway *
* @param props - java.util.Properties containing all application properties.
* If null, the java system properties are used
- * @throws InvalidData - invalid properties caused a failure in initialisation
+ * @throws InvalidDataException - invalid properties caused a failure in initialisation
*/
- static public void init(Properties props) throws InvalidData {
+ static public void init(Properties props) throws InvalidDataException {
init(props, null);
}
@@ -111,9 +111,9 @@ public class Gateway * If null, the java system properties are used
* @param res - ResourceLoader for the kernel to use to resolve all class resource requests
* such as for bootstrap descriptions and version information
- * @throws InvalidData - invalid properties caused a failure in initialisation
+ * @throws InvalidDataException - invalid properties caused a failure in initialisation
*/
- static public void init(Properties props, ResourceLoader res) throws InvalidData {
+ static public void init(Properties props, ResourceLoader res) throws InvalidDataException {
// Init properties & resources
mC2KProps.clear();
@@ -130,7 +130,7 @@ public class Gateway try {
mMarshaller = new CastorXMLUtility(mResource, props, mResource.getKernelResourceURL("mapFiles/"));
} catch (MalformedURLException e1) {
- throw new InvalidData("Invalid Resource Location");
+ throw new InvalidDataException("Invalid Resource Location");
}
@@ -139,7 +139,7 @@ public class Gateway mModules = new ModuleManager(mResource.getModuleDefURLs(), AbstractMain.isServer);
} catch (Exception e) {
Logger.error(e);
- throw new InvalidData("Could not load module definitions.");
+ throw new InvalidDataException("Could not load module definitions.");
}
// merge in module props
@@ -168,9 +168,9 @@ public class Gateway * bootstrap to create the root LDAP contexts, initialises the CORBA server and
* time-out manager.
*
- * @throws InvalidData - error initialising
+ * @throws InvalidDataException - error initialising
*/
- static public void startServer(Authenticator auth) throws InvalidData, CannotManage {
+ static public void startServer(Authenticator auth) throws InvalidDataException, CannotManageException {
try {
// check top level directory contexts
if (mLookup instanceof LookupManager) {
@@ -178,7 +178,7 @@ public class Gateway mLookupManager.initializeDirectory();
}
else {
- throw new CannotManage("Lookup implementation is not a LookupManager. Cannot write to directory");
+ throw new CannotManageException("Lookup implementation is not a LookupManager. Cannot write to directory");
}
// start entity proxy server
@@ -222,11 +222,11 @@ public class Gateway * Connects to the LDAP server in an administrative context - using the admin username and
* password given in the LDAP.user and LDAP.password props of the kernel properties.
*
- * @throws InvalidData - bad params
+ * @throws InvalidDataException - bad params
* @throws PersistencyException - error starting storages
*/
static public Authenticator connect()
- throws InvalidData,
+ throws InvalidDataException,
PersistencyException
{
try {
@@ -242,7 +242,7 @@ public class Gateway return auth;
} catch (Exception ex) {
Logger.error(ex);
- throw new InvalidData("Cannot connect server process. Please check config.");
+ throw new InvalidDataException("Cannot connect server process. Please check config.");
}
@@ -254,18 +254,18 @@ public class Gateway * @param agentName - username
* @param agentPassword - password
* @return an AgentProxy on the requested user
- * @throws InvalidData
+ * @throws InvalidDataException
* @throws PersistencyException
* @throws ClassNotFoundException
* @throws IllegalAccessException
* @throws InstantiationException
*/
static public AgentProxy connect(String agentName, String agentPassword, String resource)
- throws InvalidData, ObjectNotFound, PersistencyException, InstantiationException, IllegalAccessException, ClassNotFoundException
+ throws InvalidDataException, ObjectNotFoundException, PersistencyException, InstantiationException, IllegalAccessException, ClassNotFoundException
{
Authenticator auth = (Authenticator)mC2KProps.getInstance("Authenticator");
if (!auth.authenticate(agentName, agentPassword, resource))
- throw new InvalidData("Login failed");
+ throw new InvalidDataException("Login failed");
mLookup = (Lookup)mC2KProps.getInstance("Lookup");
mLookup.open(auth);
@@ -286,7 +286,7 @@ public class Gateway }
static public AgentProxy connect(String agentName, String agentPassword)
- throws InvalidData, ObjectNotFound, PersistencyException, InstantiationException, IllegalAccessException, ClassNotFoundException
+ throws InvalidDataException, ObjectNotFoundException, PersistencyException, InstantiationException, IllegalAccessException, ClassNotFoundException
{
return connect(agentName, agentPassword, null);
}
@@ -358,10 +358,10 @@ public class Gateway return mLookup;
}
- static public LookupManager getLookupManager() throws CannotManage
+ static public LookupManager getLookupManager() throws CannotManageException
{
if (mLookupManager == null)
- throw new CannotManage("No Lookup Manager created. Not a server process.");
+ throw new CannotManageException("No Lookup Manager created. Not a server process.");
else
return mLookupManager;
}
diff --git a/src/main/java/com/c2kernel/process/UserCodeProcess.java b/src/main/java/com/c2kernel/process/UserCodeProcess.java index 4a4d7f4..bc7e23e 100644 --- a/src/main/java/com/c2kernel/process/UserCodeProcess.java +++ b/src/main/java/com/c2kernel/process/UserCodeProcess.java @@ -25,7 +25,7 @@ import java.net.UnknownHostException; import java.util.ArrayList;
import java.util.HashMap;
-import com.c2kernel.common.InvalidTransition;
+import com.c2kernel.common.InvalidTransitionException;
import com.c2kernel.entity.C2KLocalObject;
import com.c2kernel.entity.agent.Job;
import com.c2kernel.entity.proxy.AgentProxy;
@@ -139,7 +139,7 @@ public class UserCodeProcess extends StandardClient implements ProxyObserver<Job } catch (ScriptErrorException ex) {
errors.put(jobKey, ex.getErrors());
ignoredPaths.add(jobKey);
- } catch (InvalidTransition ex) {
+ } catch (InvalidTransitionException ex) {
// must have already been done by someone else - ignore
} catch (Throwable ex) {
Logger.error("Error executing "+thisJob.getTransition().getName()+" job:");
diff --git a/src/main/java/com/c2kernel/process/auth/Authenticator.java b/src/main/java/com/c2kernel/process/auth/Authenticator.java index 8e06da0..4578744 100644 --- a/src/main/java/com/c2kernel/process/auth/Authenticator.java +++ b/src/main/java/com/c2kernel/process/auth/Authenticator.java @@ -20,8 +20,8 @@ */
package com.c2kernel.process.auth;
-import com.c2kernel.common.InvalidData;
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.ObjectNotFoundException;
/**
* This interface is used by the kernel to store an authenticated connection
@@ -55,14 +55,14 @@ public interface Authenticator { * method if required. May be null.
* @return a boolean indicating if the authentication was successful. If so,
* then the Gateway will generate an AgentProxy for the given user.
- * @throws ObjectNotFound
+ * @throws ObjectNotFoundException
* When the Agent doesn't exist
- * @throws InvalidData
+ * @throws InvalidDataException
* When authentication fails for another reason
*/
public boolean authenticate(String agentName, String password,
- String resource) throws InvalidData,
- ObjectNotFound;
+ String resource) throws InvalidDataException,
+ ObjectNotFoundException;
/**
* Authenticates a superuser connection for the server. It must be able to
@@ -71,11 +71,11 @@ public interface Authenticator { *
* @param resource
* @return
- * @throws InvalidData
- * @throws ObjectNotFound
+ * @throws InvalidDataException
+ * @throws ObjectNotFoundException
*/
- public boolean authenticate(String resource) throws InvalidData,
- ObjectNotFound;
+ public boolean authenticate(String resource) throws InvalidDataException,
+ ObjectNotFoundException;
/**
* Lookup and storage implementations that need to use user or superuser
diff --git a/src/main/java/com/c2kernel/process/module/Module.java b/src/main/java/com/c2kernel/process/module/Module.java index b18b443..a1a11c7 100644 --- a/src/main/java/com/c2kernel/process/module/Module.java +++ b/src/main/java/com/c2kernel/process/module/Module.java @@ -23,7 +23,7 @@ package com.c2kernel.process.module; import java.util.ArrayList;
import java.util.Properties;
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.ObjectNotFoundException;
import com.c2kernel.entity.imports.ImportAgent;
import com.c2kernel.entity.imports.ImportDependency;
import com.c2kernel.entity.imports.ImportDependencyMember;
@@ -127,7 +127,7 @@ public class Module extends ImportItem { rolePath.setHasJobList(thisRole.hasJobList());
Gateway.getLookupManager().createRole(rolePath);
}
- } catch (ObjectNotFound ex) {
+ } catch (ObjectNotFoundException ex) {
Logger.msg("Module.importAll() - Role '"+thisRole.name+"' not found. Creating.");
thisRole.create(systemAgent.getPath(), reset);
}
@@ -138,7 +138,7 @@ public class Module extends ImportItem { Gateway.getLookup().getAgentPath(thisAgent.name);
Logger.msg(3, "Module.importAll() - User '"+thisAgent.name+"' found.");
continue;
- } catch (ObjectNotFound ex) { }
+ } catch (ObjectNotFoundException ex) { }
Logger.msg("Module.importAll() - User '"+thisAgent.name+"' not found. Creating.");
thisAgent.create(systemAgent.getPath(), reset);
}
diff --git a/src/main/java/com/c2kernel/process/module/ModuleImport.java b/src/main/java/com/c2kernel/process/module/ModuleImport.java index 18a0289..327c55a 100644 --- a/src/main/java/com/c2kernel/process/module/ModuleImport.java +++ b/src/main/java/com/c2kernel/process/module/ModuleImport.java @@ -20,11 +20,11 @@ */
package com.c2kernel.process.module;
-import com.c2kernel.common.CannotManage;
+import com.c2kernel.common.CannotManageException;
import com.c2kernel.common.InvalidCollectionModification;
-import com.c2kernel.common.ObjectAlreadyExists;
+import com.c2kernel.common.ObjectAlreadyExistsException;
import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.ObjectNotFoundException;
import com.c2kernel.lookup.AgentPath;
import com.c2kernel.lookup.DomainPath;
import com.c2kernel.lookup.InvalidItemPathException;
@@ -40,8 +40,8 @@ public abstract class ModuleImport { public ModuleImport() {
}
- public abstract void create(AgentPath agentPath, boolean reset) throws ObjectNotFound,
- ObjectCannotBeUpdated, CannotManage, ObjectAlreadyExists, InvalidCollectionModification;
+ public abstract void create(AgentPath agentPath, boolean reset) throws ObjectNotFoundException,
+ ObjectCannotBeUpdated, CannotManageException, ObjectAlreadyExistsException, InvalidCollectionModification;
public void setID( String uuid ) throws InvalidItemPathException
{
diff --git a/src/main/java/com/c2kernel/process/module/ModuleManager.java b/src/main/java/com/c2kernel/process/module/ModuleManager.java index 24dd610..8153033 100644 --- a/src/main/java/com/c2kernel/process/module/ModuleManager.java +++ b/src/main/java/com/c2kernel/process/module/ModuleManager.java @@ -27,8 +27,8 @@ import java.util.Enumeration; import java.util.HashMap;
import java.util.Properties;
-import com.c2kernel.common.InvalidData;
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.ObjectNotFoundException;
import com.c2kernel.entity.proxy.AgentProxy;
import com.c2kernel.entity.proxy.ItemProxy;
import com.c2kernel.lookup.DomainPath;
@@ -53,7 +53,7 @@ public class ModuleManager { Schema moduleSchema = new Schema("Module", 0,
FileStringUtility.url2String(Gateway.getResource().getKernelResourceURL("boot/OD/Module.xsd")));
moduleValidator = new OutcomeValidator(moduleSchema);
- } catch (InvalidData ex) {
+ } catch (InvalidDataException ex) {
Logger.error(ex);
throw new ModuleException("Module Schema is not valid");
} catch (IOException ex) {
@@ -165,7 +165,7 @@ public class ModuleManager { ItemProxy serverEntity;
try {
serverEntity = Gateway.getProxyManager().getProxy(new DomainPath("/servers/"+Gateway.getProperties().getString("ItemServer.name")));
- } catch (ObjectNotFound e) {
+ } catch (ObjectNotFoundException e) {
throw new ModuleException("Cannot find local server name.");
}
Logger.debug(3, "Registering modules");
diff --git a/src/main/java/com/c2kernel/process/module/ModuleResource.java b/src/main/java/com/c2kernel/process/module/ModuleResource.java index 63710db..da40403 100644 --- a/src/main/java/com/c2kernel/process/module/ModuleResource.java +++ b/src/main/java/com/c2kernel/process/module/ModuleResource.java @@ -20,10 +20,10 @@ */
package com.c2kernel.process.module;
-import com.c2kernel.common.CannotManage;
-import com.c2kernel.common.ObjectAlreadyExists;
+import com.c2kernel.common.CannotManageException;
+import com.c2kernel.common.ObjectAlreadyExistsException;
import com.c2kernel.common.ObjectCannotBeUpdated;
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.ObjectNotFoundException;
import com.c2kernel.lookup.AgentPath;
import com.c2kernel.process.Bootstrap;
import com.c2kernel.utils.Logger;
@@ -41,13 +41,13 @@ public class ModuleResource extends ModuleImport { @Override
public void create(AgentPath agentPath, boolean reset)
- throws ObjectNotFound, ObjectCannotBeUpdated,
- CannotManage, ObjectAlreadyExists {
+ throws ObjectNotFoundException, ObjectCannotBeUpdated,
+ CannotManageException, ObjectAlreadyExistsException {
try {
domainPath = Bootstrap.verifyResource(ns, name, version, resourceType, itemPath, resourceLocation, reset);
} catch (Exception e) {
Logger.error(e);
- throw new CannotManage("Exception verifying module resource "+ns+"/"+name);
+ throw new CannotManageException("Exception verifying module resource "+ns+"/"+name);
}
}
diff --git a/src/main/java/com/c2kernel/process/resource/Resource.java b/src/main/java/com/c2kernel/process/resource/Resource.java index 2a6e41c..b313336 100644 --- a/src/main/java/com/c2kernel/process/resource/Resource.java +++ b/src/main/java/com/c2kernel/process/resource/Resource.java @@ -27,8 +27,8 @@ import java.util.Enumeration; import java.util.HashMap;
import java.util.Hashtable;
-import com.c2kernel.common.InvalidData;
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.ObjectNotFoundException;
import com.c2kernel.utils.FileStringUtility;
import com.c2kernel.utils.Logger;
@@ -44,7 +44,7 @@ public class Resource implements ResourceLoader { private final HashMap<String, URL> moduleBaseURLs = new HashMap<String, URL>();
private final HashMap<String, URL> allBaseURLs = new HashMap<String, URL>();
- public Resource() throws InvalidData {
+ public Resource() throws InvalidDataException {
baseURL = getURLorResURL("com/c2kernel/utils/resources/");
allBaseURLs.put(null, baseURL);
}
@@ -89,7 +89,7 @@ public class Resource implements ResourceLoader { * @see com.c2kernel.utils.ResourceLoader#addModuleBaseURL(java.lang.String, java.lang.String)
*/
@Override
- public void addModuleBaseURL(String ns, String newBaseURL) throws InvalidData {
+ public void addModuleBaseURL(String ns, String newBaseURL) throws InvalidDataException {
addModuleBaseURL(ns, getURLorResURL(newBaseURL));
}
@@ -113,7 +113,7 @@ public class Resource implements ResourceLoader { return new URL(moduleBaseURLs.get(ns), resName);
}
- static private URL getURLorResURL(String newURL) throws InvalidData {
+ static private URL getURLorResURL(String newURL) throws InvalidDataException {
URL result;
try {
result = new URL(newURL);
@@ -124,7 +124,7 @@ public class Resource implements ResourceLoader { }
if (result == null) {
Logger.error("URL "+newURL+" could not be found");
- throw new InvalidData();
+ throw new InvalidDataException();
}
return result;
}
@@ -137,7 +137,7 @@ public class Resource implements ResourceLoader { for (String ns : getAllBaseURLs().keySet()) {
try {
return getTextResource(ns, resName);
- } catch (ObjectNotFound ex) { }
+ } catch (ObjectNotFoundException ex) { }
}
Logger.warning("Text resource '"+resName+"' not found.");
return null;
@@ -152,7 +152,7 @@ public class Resource implements ResourceLoader { for (String ns : getAllBaseURLs().keySet()) {
try {
results.put(ns, getTextResource(ns, resName));
- } catch (ObjectNotFound ex) { }
+ } catch (ObjectNotFoundException ex) { }
}
return results;
}
@@ -161,7 +161,7 @@ public class Resource implements ResourceLoader { * @see com.c2kernel.utils.ResourceLoader#getTextResource(java.lang.String, java.lang.String)
*/
@Override
- public String getTextResource(String ns, String resName) throws ObjectNotFound
+ public String getTextResource(String ns, String resName) throws ObjectNotFoundException
// throws IOException
{
Logger.msg(8, "Resource::getTextResource() - Getting resource from "+ns+": " + resName);
@@ -184,7 +184,7 @@ public class Resource implements ResourceLoader { txtCache.put(ns+'/'+resName, newRes);
return newRes;
} catch (Exception e) {
- throw new ObjectNotFound(e.getMessage());
+ throw new ObjectNotFoundException(e.getMessage());
}
}
diff --git a/src/main/java/com/c2kernel/process/resource/ResourceLoader.java b/src/main/java/com/c2kernel/process/resource/ResourceLoader.java index ff5b489..d05831a 100644 --- a/src/main/java/com/c2kernel/process/resource/ResourceLoader.java +++ b/src/main/java/com/c2kernel/process/resource/ResourceLoader.java @@ -25,8 +25,8 @@ import java.net.URL; import java.util.Enumeration;
import java.util.HashMap;
-import com.c2kernel.common.InvalidData;
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.ObjectNotFoundException;
public interface ResourceLoader {
@@ -38,7 +38,7 @@ public interface ResourceLoader { public void addModuleBaseURL(String ns, URL newBaseURL);
public void addModuleBaseURL(String ns, String newBaseURL)
- throws InvalidData;
+ throws InvalidDataException;
public HashMap<String, URL> getModuleBaseURLs();
@@ -54,7 +54,7 @@ public interface ResourceLoader { public HashMap<String, String> getAllTextResources(String resName);
public String getTextResource(String ns, String resName)
- throws ObjectNotFound;
+ throws ObjectNotFoundException;
public Class<?> getClassForName(String name)
throws ClassNotFoundException;
|