Repository: airavata Updated Branches: refs/heads/master 0fadb0806 -> bf5f8c3c5
http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobAlreadyExistsException.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobAlreadyExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobAlreadyExistsException.java index 7c87443..7662200 100644 --- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobAlreadyExistsException.java +++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobAlreadyExistsException.java @@ -21,9 +21,9 @@ package org.apache.airavata.registry.api.exception.worker; -import org.apache.airavata.registry.api.exception.RegistryException; +import org.apache.airavata.registry.api.exception.RegException; -public class ApplicationJobAlreadyExistsException extends RegistryException { +public class ApplicationJobAlreadyExistsException extends RegException { private static final long serialVersionUID = -8006347245307495767L; http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobDoesNotExistsException.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobDoesNotExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobDoesNotExistsException.java index 455afd0..349d119 100644 --- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobDoesNotExistsException.java +++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobDoesNotExistsException.java @@ -21,9 +21,9 @@ package org.apache.airavata.registry.api.exception.worker; -import org.apache.airavata.registry.api.exception.RegistryException; +import org.apache.airavata.registry.api.exception.RegException; -public class ApplicationJobDoesNotExistsException extends RegistryException { +public class ApplicationJobDoesNotExistsException extends RegException { private static final long serialVersionUID = -8006347245307495767L; http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ExperimentAlreadyExistsException.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ExperimentAlreadyExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ExperimentAlreadyExistsException.java index 6d8e8b1..0be0e74 100644 --- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ExperimentAlreadyExistsException.java +++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ExperimentAlreadyExistsException.java @@ -21,9 +21,9 @@ package org.apache.airavata.registry.api.exception.worker; -import org.apache.airavata.registry.api.exception.RegistryException; +import org.apache.airavata.registry.api.exception.RegException; -public class ExperimentAlreadyExistsException extends RegistryException { +public class ExperimentAlreadyExistsException extends RegException { private static final long serialVersionUID = -8006347245307495767L; http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ExperimentDoesNotExistsException.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ExperimentDoesNotExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ExperimentDoesNotExistsException.java index 77d2316..09d2d05 100644 --- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ExperimentDoesNotExistsException.java +++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ExperimentDoesNotExistsException.java @@ -21,9 +21,9 @@ package org.apache.airavata.registry.api.exception.worker; -import org.apache.airavata.registry.api.exception.RegistryException; +import org.apache.airavata.registry.api.exception.RegException; -public class ExperimentDoesNotExistsException extends RegistryException { +public class ExperimentDoesNotExistsException extends RegException { private static final long serialVersionUID = -8006347245307495767L; http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidApplicationJobIDException.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidApplicationJobIDException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidApplicationJobIDException.java index 3278c75..d3b7749 100644 --- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidApplicationJobIDException.java +++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidApplicationJobIDException.java @@ -21,9 +21,9 @@ package org.apache.airavata.registry.api.exception.worker; -import org.apache.airavata.registry.api.exception.RegistryException; +import org.apache.airavata.registry.api.exception.RegException; -public class InvalidApplicationJobIDException extends RegistryException { +public class InvalidApplicationJobIDException extends RegException { private static final long serialVersionUID = -8006347245307495767L; http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowAlreadyExistsException.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowAlreadyExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowAlreadyExistsException.java index a8f13df..8c62521 100644 --- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowAlreadyExistsException.java +++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowAlreadyExistsException.java @@ -21,9 +21,9 @@ package org.apache.airavata.registry.api.exception.worker; -import org.apache.airavata.registry.api.exception.RegistryException; +import org.apache.airavata.registry.api.exception.RegException; -public class UserWorkflowAlreadyExistsException extends RegistryException { +public class UserWorkflowAlreadyExistsException extends RegException { private static final long serialVersionUID = -8006347245307495767L; http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowDoesNotExistsException.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowDoesNotExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowDoesNotExistsException.java index f1f47a6..9b9d6b4 100644 --- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowDoesNotExistsException.java +++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/UserWorkflowDoesNotExistsException.java @@ -21,9 +21,9 @@ package org.apache.airavata.registry.api.exception.worker; -import org.apache.airavata.registry.api.exception.RegistryException; +import org.apache.airavata.registry.api.exception.RegException; -public class UserWorkflowDoesNotExistsException extends RegistryException { +public class UserWorkflowDoesNotExistsException extends RegException { private static final long serialVersionUID = -8006347245307495767L; http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceAlreadyExistsException.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceAlreadyExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceAlreadyExistsException.java index 4e7d911..585f6ba 100644 --- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceAlreadyExistsException.java +++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceAlreadyExistsException.java @@ -21,9 +21,9 @@ package org.apache.airavata.registry.api.exception.worker; -import org.apache.airavata.registry.api.exception.RegistryException; +import org.apache.airavata.registry.api.exception.RegException; -public class WorkflowInstanceAlreadyExistsException extends RegistryException { +public class WorkflowInstanceAlreadyExistsException extends RegException { private static final long serialVersionUID = -8006347245307495767L; http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceDoesNotExistsException.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceDoesNotExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceDoesNotExistsException.java index d0814e8..9a2f18e 100644 --- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceDoesNotExistsException.java +++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceDoesNotExistsException.java @@ -21,9 +21,9 @@ package org.apache.airavata.registry.api.exception.worker; -import org.apache.airavata.registry.api.exception.RegistryException; +import org.apache.airavata.registry.api.exception.RegException; -public class WorkflowInstanceDoesNotExistsException extends RegistryException { +public class WorkflowInstanceDoesNotExistsException extends RegException { private static final long serialVersionUID = -8006347245307495767L; http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeAlreadyExistsException.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeAlreadyExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeAlreadyExistsException.java index 077117e..4cf0c5d 100644 --- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeAlreadyExistsException.java +++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeAlreadyExistsException.java @@ -21,9 +21,9 @@ package org.apache.airavata.registry.api.exception.worker; -import org.apache.airavata.registry.api.exception.RegistryException; +import org.apache.airavata.registry.api.exception.RegException; -public class WorkflowInstanceNodeAlreadyExistsException extends RegistryException { +public class WorkflowInstanceNodeAlreadyExistsException extends RegException { private static final long serialVersionUID = -8006347245307495767L; http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeDoesNotExistsException.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeDoesNotExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeDoesNotExistsException.java index 8362e99..4dc9eea 100644 --- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeDoesNotExistsException.java +++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkflowInstanceNodeDoesNotExistsException.java @@ -21,9 +21,9 @@ package org.apache.airavata.registry.api.exception.worker; -import org.apache.airavata.registry.api.exception.RegistryException; +import org.apache.airavata.registry.api.exception.RegException; -public class WorkflowInstanceNodeDoesNotExistsException extends RegistryException { +public class WorkflowInstanceNodeDoesNotExistsException extends RegException { private static final long serialVersionUID = -8006347245307495767L; http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectAlreadyExistsException.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectAlreadyExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectAlreadyExistsException.java index 37a5efb..869fe92 100644 --- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectAlreadyExistsException.java +++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectAlreadyExistsException.java @@ -21,9 +21,9 @@ package org.apache.airavata.registry.api.exception.worker; -import org.apache.airavata.registry.api.exception.RegistryException; +import org.apache.airavata.registry.api.exception.RegException; -public class WorkspaceProjectAlreadyExistsException extends RegistryException { +public class WorkspaceProjectAlreadyExistsException extends RegException { private static final long serialVersionUID = -8006347245307495767L; http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectDoesNotExistsException.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectDoesNotExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectDoesNotExistsException.java index 4257d09..c36f719 100644 --- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectDoesNotExistsException.java +++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/WorkspaceProjectDoesNotExistsException.java @@ -21,9 +21,9 @@ package org.apache.airavata.registry.api.exception.worker; -import org.apache.airavata.registry.api.exception.RegistryException; +import org.apache.airavata.registry.api.exception.RegException; -public class WorkspaceProjectDoesNotExistsException extends RegistryException { +public class WorkspaceProjectDoesNotExistsException extends RegException { private static final long serialVersionUID = -8006347245307495767L; http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java index 8911df6..6968d04 100644 --- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java +++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistryUtils.java @@ -32,11 +32,8 @@ import org.apache.airavata.registry.api.AiravataRegistry2; import org.apache.airavata.registry.api.AiravataRegistryFactory; import org.apache.airavata.registry.api.AiravataUser; import org.apache.airavata.registry.api.Gateway; -import org.apache.airavata.registry.api.exception.RegistryAccessorInstantiateException; -import org.apache.airavata.registry.api.exception.RegistryAccessorInvalidException; -import org.apache.airavata.registry.api.exception.RegistryAccessorNotFoundException; -import org.apache.airavata.registry.api.exception.RegistryAccessorUndefinedException; -import org.apache.airavata.registry.api.exception.RegistryException; +import org.apache.airavata.registry.api.exception.*; +import org.apache.airavata.registry.api.exception.RegException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +41,7 @@ public class RegistryUtils { private static final Logger log = LoggerFactory.getLogger(RegistryUtils.class); - public static String validateAxisService(String urlString)throws RegistryException { + public static String validateAxisService(String urlString)throws RegException { if(!urlString.endsWith("?wsdl")){ urlString = urlString + "?wsdl"; } @@ -54,24 +51,24 @@ public class RegistryUtils { conn.connect(); } catch (MalformedURLException e) { // the URL is not in a valid form - throw new RegistryException("Given Axis2 Service URL : " + urlString + " is Invalid",e); + throw new RegException("Given Axis2 Service URL : " + urlString + " is Invalid",e); } catch (IOException e) { // the connection couldn't be established - throw new RegistryException("Given Axis2 Service URL : " + urlString + " is Invalid",e); + throw new RegException("Given Axis2 Service URL : " + urlString + " is Invalid",e); } return urlString; } - public static String validateURL(String urlString)throws RegistryException{ + public static String validateURL(String urlString)throws RegException { try { URL url = new URL(urlString); URLConnection conn = url.openConnection(); conn.connect(); } catch (MalformedURLException e) { // the URL is not in a valid form - throw new RegistryException("Given URL: " + urlString + " is Invalid",e); + throw new RegException("Given URL: " + urlString + " is Invalid",e); } catch (IOException e) { // the connection couldn't be established - throw new RegistryException("Given URL: " + urlString + " is Invalid",e); + throw new RegException("Given URL: " + urlString + " is Invalid",e); } return urlString; } @@ -109,17 +106,17 @@ public class RegistryUtils { new AiravataUser(username)); } catch (AiravataConfigurationException e) { log.error("Error initializing AiravataRegistry2"); - } catch (RegistryAccessorNotFoundException e) { + } catch (RegAccessorNotFoundException e) { log.error("Error initializing AiravataRegistry2"); - } catch (RegistryAccessorInstantiateException e) { + } catch (RegAccessorInstantiateException e) { log.error("Error initializing AiravataRegistry2"); - } catch (RegistryAccessorInvalidException e) { + } catch (RegAccessorInvalidException e) { log.error("Error initializing AiravataRegistry2"); - } catch (RegistryAccessorUndefinedException e) { + } catch (RegAccessorUndefinedException e) { log.error("Error initializing AiravataRegistry2"); } catch (ApplicationSettingsException e) { log.error("Error initializing AiravataRegistry2",e); - } catch (RegistryException e) { + } catch (RegException e) { log.error("Error initializing AiravataRegistry2",e); } return registry;
