airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [02/11] adding proper entity manager closing and exception handling - AIRAVATA-1285
Date Fri, 30 May 2014 19:53:57 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java
index 145241a..6148399 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java
@@ -25,7 +25,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegException;
 import org.apache.airavata.registry.api.workflow.*;
 import org.apache.airavata.registry.api.workflow.ApplicationJob.ApplicationJobStatus;
 import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State;
@@ -38,136 +38,136 @@ public interface ProvenanceRegistry extends AiravataSubRegistry{
      * Returns true if the experiment exists 
      * @param experimentId
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public boolean isExperimentExists(String experimentId) throws RegistryException;
+	public boolean isExperimentExists(String experimentId) throws RegException;
 	
-	public boolean isExperimentExists(String experimentId, boolean createIfNotPresent) throws RegistryException;
+	public boolean isExperimentExists(String experimentId, boolean createIfNotPresent) throws RegException;
 	
     /**
      * Save the username of the user who runs this experiment 
      * @param experimentId
      * @param user
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public void updateExperimentExecutionUser(String experimentId, String user) throws RegistryException;
+	public void updateExperimentExecutionUser(String experimentId, String user) throws RegException;
     
     /**
      * Retrieve the user who is runing the experiment
      * @param experimentId
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public String getExperimentExecutionUser(String experimentId) throws RegistryException;
+	public String getExperimentExecutionUser(String experimentId) throws RegException;
 
     /**
      * check whether the experiment name exists
      * @param experimentName
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public boolean isExperimentNameExist(String experimentName) throws  RegistryException;
+    public boolean isExperimentNameExist(String experimentName) throws RegException;
     /**
      * Get the name of the workflow intance
      * @param experimentId
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public String getExperimentName(String experimentId) throws RegistryException;
+	public String getExperimentName(String experimentId) throws RegException;
     
     /**
      * Save a name for this workflow execution
      * @param experimentId
      * @param experimentName
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public void updateExperimentName(String experimentId,String experimentName)throws RegistryException;
+	public void updateExperimentName(String experimentId,String experimentName)throws RegException;
     
 	/**
      * Return the metadata information saved for the experiment
      * @param experimentId
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public String getExperimentMetadata(String experimentId) throws RegistryException;
+    public String getExperimentMetadata(String experimentId) throws RegException;
     
     /**
      * Save the metadata for the experiment
      * @param experimentId
      * @param metadata
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public void updateExperimentMetadata(String experimentId, String metadata) throws RegistryException;
+    public void updateExperimentMetadata(String experimentId, String metadata) throws RegException;
     
     /**
      * Return the template name of the workflow that this intance was created from
      * @param workflowInstanceId
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public String getWorkflowExecutionTemplateName(String workflowInstanceId) throws RegistryException;
+    public String getWorkflowExecutionTemplateName(String workflowInstanceId) throws RegException;
     
     /**
      * Save the template name of the workflow that this intance was created from
      * @param workflowInstanceId
      * @param templateName
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public void setWorkflowInstanceTemplateName(String workflowInstanceId, String templateName) throws RegistryException;
+    public void setWorkflowInstanceTemplateName(String workflowInstanceId, String templateName) throws RegException;
     
-    public List<WorkflowExecution> getExperimentWorkflowInstances(String experimentId) throws RegistryException;
+    public List<WorkflowExecution> getExperimentWorkflowInstances(String experimentId) throws RegException;
     
     /*-------------------------------------- Experiment Workflow instance node data ----------------------------------------*/
 
-    public boolean isWorkflowInstanceExists(String instanceId) throws RegistryException;
+    public boolean isWorkflowInstanceExists(String instanceId) throws RegException;
     
-    public boolean isWorkflowInstanceExists(String instanceId, boolean createIfNotPresent) throws RegistryException;
+    public boolean isWorkflowInstanceExists(String instanceId, boolean createIfNotPresent) throws RegException;
     
     /**
      * Save a status for this workflow execution with the current time at the moment
      * @param instanceId
      * @param status - contains the status
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public void updateWorkflowInstanceStatus(String instanceId,State status)throws RegistryException;
+	public void updateWorkflowInstanceStatus(String instanceId,State status)throws RegException;
 
     /**
      * Save a status for this workflow execution
      * @param status - contains the status
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public void updateWorkflowInstanceStatus(WorkflowExecutionStatus status)throws RegistryException;
+	public void updateWorkflowInstanceStatus(WorkflowExecutionStatus status)throws RegException;
 
 	
     /**
      * Return the status of the execution
      * @param instanceId
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public WorkflowExecutionStatus getWorkflowInstanceStatus(String instanceId)throws RegistryException;
+	public WorkflowExecutionStatus getWorkflowInstanceStatus(String instanceId)throws RegException;
 
     /**
 	 * Save the input data of a node in the workflow instance of an experiment
 	 * @param node
      * @param data
 	 * @return true if successfully saved
-	 * @throws RegistryException
+	 * @throws org.apache.airavata.registry.api.exception.RegException
 	 */
-	public void updateWorkflowNodeInput(WorkflowInstanceNode node, String data) throws RegistryException;
+	public void updateWorkflowNodeInput(WorkflowInstanceNode node, String data) throws RegException;
 
     /**
      * Save the output data of a node in the workflow instance of an experiment
      * @param node
      * @return true if successfully saved
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public void updateWorkflowNodeOutput(WorkflowInstanceNode node, String data)throws RegistryException;
+	public void updateWorkflowNodeOutput(WorkflowInstanceNode node, String data)throws RegException;
     
     /**
      * Return a list of data passed as input for service node which regex matched nodeId, workflow template id & experiment id 
@@ -175,9 +175,9 @@ public interface ProvenanceRegistry extends AiravataSubRegistry{
      * @param workflowNameRegEx - this is the workflowName or workflow template Id of an experiment
      * @param nodeNameRegEx - nodeId
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public List<WorkflowNodeIOData> searchWorkflowInstanceNodeInput(String experimentIdRegEx, String workflowNameRegEx, String nodeNameRegEx)throws RegistryException;
+	public List<WorkflowNodeIOData> searchWorkflowInstanceNodeInput(String experimentIdRegEx, String workflowNameRegEx, String nodeNameRegEx)throws RegException;
 
 	/**
      * Return a list of data returned as output from service node which regex matched nodeId, workflow template id & experiment id 
@@ -185,13 +185,13 @@ public interface ProvenanceRegistry extends AiravataSubRegistry{
      * @param workflowNameRegEx - this is the workflowName or workflow template Id of an experiment
      * @param nodeNameRegEx - nodeId
 	 * @return
-	 * @throws RegistryException
+	 * @throws org.apache.airavata.registry.api.exception.RegException
 	 */
-	public List<WorkflowNodeIOData> searchWorkflowInstanceNodeOutput(String experimentIdRegEx, String workflowNameRegEx, String nodeNameRegEx)throws RegistryException;
+	public List<WorkflowNodeIOData> searchWorkflowInstanceNodeOutput(String experimentIdRegEx, String workflowNameRegEx, String nodeNameRegEx)throws RegException;
 	
-	public List<WorkflowNodeIOData> getWorkflowInstanceNodeInput(String workflowInstanceId, String nodeType)throws RegistryException;
+	public List<WorkflowNodeIOData> getWorkflowInstanceNodeInput(String workflowInstanceId, String nodeType)throws RegException;
 	
-	public List<WorkflowNodeIOData> getWorkflowInstanceNodeOutput(String workflowInstanceId, String nodeType)throws RegistryException;
+	public List<WorkflowNodeIOData> getWorkflowInstanceNodeOutput(String workflowInstanceId, String nodeType)throws RegException;
 
     /**
      * Saves the results of output nodes in a workflow
@@ -200,9 +200,9 @@ public interface ProvenanceRegistry extends AiravataSubRegistry{
      * @param outputNodeName
      * @param output
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public void saveWorkflowExecutionOutput(String experimentId,String outputNodeName,String output) throws RegistryException;
+	public void saveWorkflowExecutionOutput(String experimentId,String outputNodeName,String output) throws RegException;
     
     /**
      * Saves the results of output nodes in a workflow
@@ -210,9 +210,9 @@ public interface ProvenanceRegistry extends AiravataSubRegistry{
      * @param experimentId - also the workflow id
      * @param data
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public void saveWorkflowExecutionOutput(String experimentId, WorkflowIOData data) throws RegistryException;
+	public void saveWorkflowExecutionOutput(String experimentId, WorkflowIOData data) throws RegException;
 
     /**
      * Get the output results of a output node of an experiment
@@ -220,67 +220,67 @@ public interface ProvenanceRegistry extends AiravataSubRegistry{
      * @param experimentId - also the workflow id
      * @param outputNodeName
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public WorkflowIOData getWorkflowExecutionOutput(String experimentId,String outputNodeName) throws RegistryException;
+	public WorkflowIOData getWorkflowExecutionOutput(String experimentId,String outputNodeName) throws RegException;
     
     /**
      * Get the list of output node results of an experiment 
      * @deprecated
      * @param experimentId - also the workflow id
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public List<WorkflowIOData> getWorkflowExecutionOutput(String experimentId) throws RegistryException;
+	public List<WorkflowIOData> getWorkflowExecutionOutput(String experimentId) throws RegException;
 
     /**
      * Get the names of the output nodes of a workflow instance run
      * @deprecated
      * @param exeperimentId - also the workflow id
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public String[] getWorkflowExecutionOutputNames(String exeperimentId) throws RegistryException;
+	public String[] getWorkflowExecutionOutputNames(String exeperimentId) throws RegException;
 
 	/*---------------------------------------  Retrieving Experiment ------------------------------------------*/
     /**
      * Return workflow execution object fully populated with data currently avaialble for that experiment
      * @param experimentId
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public ExperimentData getExperiment(String experimentId) throws RegistryException;
+	public ExperimentData getExperiment(String experimentId) throws RegException;
 	
-	public ExperimentData getExperimentMetaInformation(String experimentId)throws RegistryException;
+	public ExperimentData getExperimentMetaInformation(String experimentId)throws RegException;
 	
-	public List<ExperimentData> getAllExperimentMetaInformation(String user)throws RegistryException;
+	public List<ExperimentData> getAllExperimentMetaInformation(String user)throws RegException;
 	
 	/**
 	 * Retrieve experiments which their names match the regular expression experimentNameRegex
 	 * @param user
 	 * @param experimentNameRegex
 	 * @return
-	 * @throws RegistryException
+	 * @throws org.apache.airavata.registry.api.exception.RegException
 	 */
-	public List<ExperimentData> searchExperiments(String user, String experimentNameRegex)throws RegistryException;
+	public List<ExperimentData> searchExperiments(String user, String experimentNameRegex)throws RegException;
     
     /**
      * Return experiment ids of experiments launched by the given user
      * @param user - a regex user id
      * @return - experiment id list
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-	public List<String> getExperimentIdByUser(String user) throws RegistryException;
+	public List<String> getExperimentIdByUser(String user) throws RegException;
 
 	/**
 	 * Return experiments launched by the given user
 	 * @param user
 	 * @return experiment object list each populated by current data of that experiment
-	 * @throws RegistryException
+	 * @throws org.apache.airavata.registry.api.exception.RegException
 	 */
-    public List<ExperimentData> getExperimentByUser(String user) throws RegistryException;
+    public List<ExperimentData> getExperimentByUser(String user) throws RegException;
     
-	public List<ExperimentData> getExperiments(HashMap<String, String> params) throws RegistryException;
+	public List<ExperimentData> getExperiments(HashMap<String, String> params) throws RegException;
     
     /**
      * Return the pageNo set of experiments launched by the given user if grouped in to pages of size pageSize
@@ -288,26 +288,26 @@ public interface ProvenanceRegistry extends AiravataSubRegistry{
      * @param pageSize
      * @param pageNo
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public List<ExperimentData> getExperimentByUser(String user, int pageSize, int pageNo) throws RegistryException;
+    public List<ExperimentData> getExperimentByUser(String user, int pageSize, int pageNo) throws RegException;
 
     /**
      * This will update the workflowStatus for given experimentID,workflowInstanceID combination.
      * @param workflowStatusNode
      * @return
      */
-    public void updateWorkflowNodeStatus(NodeExecutionStatus workflowStatusNode)throws RegistryException;
+    public void updateWorkflowNodeStatus(NodeExecutionStatus workflowStatusNode)throws RegException;
 
-    public void updateWorkflowNodeStatus(String workflowInstanceId, String nodeId, State status)throws RegistryException;
+    public void updateWorkflowNodeStatus(String workflowInstanceId, String nodeId, State status)throws RegException;
     
-    public void updateWorkflowNodeStatus(WorkflowInstanceNode workflowNode, State status)throws RegistryException;
+    public void updateWorkflowNodeStatus(WorkflowInstanceNode workflowNode, State status)throws RegException;
 
-    public NodeExecutionStatus getWorkflowNodeStatus(WorkflowInstanceNode workflowNode)throws RegistryException;
+    public NodeExecutionStatus getWorkflowNodeStatus(WorkflowInstanceNode workflowNode)throws RegException;
     
-    public Date getWorkflowNodeStartTime(WorkflowInstanceNode workflowNode)throws RegistryException;
+    public Date getWorkflowNodeStartTime(WorkflowInstanceNode workflowNode)throws RegException;
     
-    public Date getWorkflowStartTime(WorkflowExecution workflowInstance)throws RegistryException;
+    public Date getWorkflowStartTime(WorkflowExecution workflowInstance)throws RegException;
     
     /**
      * @deprecated - Will be removed from 0.9 release onwards. Use {@see #addApplicationJob #updateApplicationJob(ApplicationJob) etc.} functions instead.
@@ -315,21 +315,21 @@ public interface ProvenanceRegistry extends AiravataSubRegistry{
      * @param workflowNodeGramData
      * @return
      */
-    public void updateWorkflowNodeGramData(WorkflowNodeGramData workflowNodeGramData)throws RegistryException;
+    public void updateWorkflowNodeGramData(WorkflowNodeGramData workflowNodeGramData)throws RegException;
     
-    public WorkflowExecutionData getWorkflowInstanceData(String workflowInstanceId)throws RegistryException;
+    public WorkflowExecutionData getWorkflowInstanceData(String workflowInstanceId)throws RegException;
     
-    public boolean isWorkflowInstanceNodePresent(String workflowInstanceId, String nodeId)throws RegistryException;
+    public boolean isWorkflowInstanceNodePresent(String workflowInstanceId, String nodeId)throws RegException;
     
-    public boolean isWorkflowInstanceNodePresent(String workflowInstanceId, String nodeId, boolean createIfNotPresent)throws RegistryException;
+    public boolean isWorkflowInstanceNodePresent(String workflowInstanceId, String nodeId, boolean createIfNotPresent)throws RegException;
     
-    public NodeExecutionData getWorkflowInstanceNodeData(String workflowInstanceId, String nodeId)throws RegistryException;
+    public NodeExecutionData getWorkflowInstanceNodeData(String workflowInstanceId, String nodeId)throws RegException;
 
-    public void addWorkflowInstance(String experimentId, String workflowInstanceId, String templateName) throws RegistryException;
+    public void addWorkflowInstance(String experimentId, String workflowInstanceId, String templateName) throws RegException;
     
-    public void updateWorkflowNodeType(WorkflowInstanceNode node, WorkflowNodeType type) throws RegistryException;
+    public void updateWorkflowNodeType(WorkflowInstanceNode node, WorkflowNodeType type) throws RegException;
     
-    public void addWorkflowInstanceNode(String workflowInstance, String nodeId) throws RegistryException;
+    public void addWorkflowInstanceNode(String workflowInstance, String nodeId) throws RegException;
     
     
 	/*---------------------------------------  Errors in experiment executions ------------------------------------------*/
@@ -338,18 +338,18 @@ public interface ProvenanceRegistry extends AiravataSubRegistry{
      * Return errors defined at the experiment level 
      * @param experimentId
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public List<ExperimentExecutionError> getExperimentExecutionErrors(String experimentId) throws RegistryException;
+    public List<ExperimentExecutionError> getExperimentExecutionErrors(String experimentId) throws RegException;
     
     /**
      * Return errors defined at the workflow level 
      * @param experimentId
      * @param workflowInstanceId
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public List<WorkflowExecutionError> getWorkflowExecutionErrors(String experimentId, String workflowInstanceId) throws RegistryException;
+    public List<WorkflowExecutionError> getWorkflowExecutionErrors(String experimentId, String workflowInstanceId) throws RegException;
 
     /**
      * Return errors defined at the node level 
@@ -357,9 +357,9 @@ public interface ProvenanceRegistry extends AiravataSubRegistry{
      * @param workflowInstanceId
      * @param nodeId
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public List<NodeExecutionError> getNodeExecutionErrors(String experimentId, String workflowInstanceId, String nodeId) throws RegistryException;
+    public List<NodeExecutionError> getNodeExecutionErrors(String experimentId, String workflowInstanceId, String nodeId) throws RegException;
     
     /**
      * Return errors defined for a Application job 
@@ -368,17 +368,17 @@ public interface ProvenanceRegistry extends AiravataSubRegistry{
      * @param nodeId
      * @param jobId
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public List<ApplicationJobExecutionError> getApplicationJobErrors(String experimentId, String workflowInstanceId, String nodeId, String jobId) throws RegistryException;
+    public List<ApplicationJobExecutionError> getApplicationJobErrors(String experimentId, String workflowInstanceId, String nodeId, String jobId) throws RegException;
 
     /**
      * Return errors defined for a Application job 
      * @param jobId
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public List<ApplicationJobExecutionError> getApplicationJobErrors(String jobId) throws RegistryException;
+    public List<ApplicationJobExecutionError> getApplicationJobErrors(String jobId) throws RegException;
 
     /**
      * Return errors filtered by the parameters
@@ -388,40 +388,40 @@ public interface ProvenanceRegistry extends AiravataSubRegistry{
      * @param jobId
      * @param filterBy - what type of source types the results should contain
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public List<ExecutionError> getExecutionErrors(String experimentId, String workflowInstanceId, String nodeId, String jobId, ExecutionErrors.Source...filterBy) throws RegistryException;
+    public List<ExecutionError> getExecutionErrors(String experimentId, String workflowInstanceId, String nodeId, String jobId, ExecutionErrors.Source...filterBy) throws RegException;
     /**
      * Adds an experiment execution error 
      * @param error
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public int addExperimentError(ExperimentExecutionError error) throws RegistryException;
+    public int addExperimentError(ExperimentExecutionError error) throws RegException;
     
     /**
      * Adds an workflow execution error 
      * @param error
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public int addWorkflowExecutionError(WorkflowExecutionError error) throws RegistryException;
+    public int addWorkflowExecutionError(WorkflowExecutionError error) throws RegException;
     
     /**
      * Adds an node execution error 
      * @param error
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public int addNodeExecutionError(NodeExecutionError error) throws RegistryException;
+    public int addNodeExecutionError(NodeExecutionError error) throws RegException;
 
     /**
      * Adds an Application job execution error 
      * @param error
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public int addApplicationJobExecutionError(ApplicationJobExecutionError error) throws RegistryException;
+    public int addApplicationJobExecutionError(ApplicationJobExecutionError error) throws RegException;
     
     
 	/*---------------------------------------  Managing Data for Application Jobs ------------------------------------------*/
@@ -430,73 +430,73 @@ public interface ProvenanceRegistry extends AiravataSubRegistry{
      * Returns <code>true</code> if a Application job data is existing in the registry
      * @param jobId
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public boolean isApplicationJobExists(String jobId) throws RegistryException;
+    public boolean isApplicationJobExists(String jobId) throws RegException;
     
     /**
      * Adding data related to a new Application job submission
      * @param job - the <code>jobId</code> cannot be <code>null</code>.
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public void addApplicationJob(ApplicationJob job) throws RegistryException;
+    public void addApplicationJob(ApplicationJob job) throws RegException;
     
     /**
      * update data related to a existing Application job record in the registry
      * @param job - the <code>jobId</code> cannot be <code>null</code> and should already exist in registry
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public void updateApplicationJob(ApplicationJob job) throws RegistryException;
+    public void updateApplicationJob(ApplicationJob job) throws RegException;
     
     /**
      * Update the status of the job
      * @param jobId
      * @param status
      * @param statusUpdateTime
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public void updateApplicationJobStatus(String jobId, ApplicationJobStatus status, Date statusUpdateTime) throws RegistryException;
+    public void updateApplicationJobStatus(String jobId, ApplicationJobStatus status, Date statusUpdateTime) throws RegException;
    
     /**
      * Update the job data. GFacProvider implementation should decide the job data. Typically it'll 
      * be a serialization of the submitted job query (eg: rsl for a GRAM job) 
      * @param jobId
      * @param jobdata
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public void updateApplicationJobData(String jobId, String jobdata) throws RegistryException;
+    public void updateApplicationJobData(String jobId, String jobdata) throws RegException;
     
     /**
      * Update the time of job submission or job started executing
      * @param jobId
      * @param submitted
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public void updateApplicationJobSubmittedTime(String jobId, Date submitted) throws RegistryException;
+    public void updateApplicationJobSubmittedTime(String jobId, Date submitted) throws RegException;
     
     /**
      * Update the time of current job status is valid.
      * @param jobId
      * @param statusUpdateTime
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public void updateApplicationJobStatusUpdateTime(String jobId, Date statusUpdateTime) throws RegistryException;
+    public void updateApplicationJobStatusUpdateTime(String jobId, Date statusUpdateTime) throws RegException;
     
     /**
      * Custom data field for users
      * @param jobId
      * @param metadata
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public void updateApplicationJobMetadata(String jobId, String metadata) throws RegistryException;
+    public void updateApplicationJobMetadata(String jobId, String metadata) throws RegException;
     
     /**
      * Retrieve the Application Job for the given job id
      * @param jobId
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public ApplicationJob getApplicationJob(String jobId) throws RegistryException;
+    public ApplicationJob getApplicationJob(String jobId) throws RegException;
     
     /**
      * Retrieve a list of Application jobs executed for the given descriptors
@@ -504,9 +504,9 @@ public interface ProvenanceRegistry extends AiravataSubRegistry{
      * @param hostDescriptionId - should be <code>null</code> if user does not care what host description the job corresponds to
      * @param applicationDescriptionId - should be <code>null</code> if user does not care what application description the job corresponds to
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public List<ApplicationJob> getApplicationJobsForDescriptors(String serviceDescriptionId, String hostDescriptionId, String applicationDescriptionId) throws RegistryException;
+    public List<ApplicationJob> getApplicationJobsForDescriptors(String serviceDescriptionId, String hostDescriptionId, String applicationDescriptionId) throws RegException;
     
     /**
      * Retrieve a list of Application jobs executed for the given experiment credentials
@@ -514,15 +514,15 @@ public interface ProvenanceRegistry extends AiravataSubRegistry{
      * @param workflowExecutionId -  - should be <code>null</code> if user does not care what workflow execution the job corresponds to
      * @param nodeId  - should be <code>null</code> if user does not care what node id the job corresponds to
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public List<ApplicationJob> getApplicationJobs(String experimentId, String workflowExecutionId, String nodeId) throws RegistryException;
+    public List<ApplicationJob> getApplicationJobs(String experimentId, String workflowExecutionId, String nodeId) throws RegException;
     
     /**
      * Retrieve the list all the status updates for an application job.
      * @param jobId - Application job id
      * @return
-     * @throws RegistryException
+     * @throws org.apache.airavata.registry.api.exception.RegException
      */
-    public List<ApplicationJobStatusData> getApplicationJobStatusHistory(String jobId) throws RegistryException;
+    public List<ApplicationJobStatusData> getApplicationJobStatusHistory(String jobId) throws RegException;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/PublishedWorkflowRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/PublishedWorkflowRegistry.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/PublishedWorkflowRegistry.java
index 9069441..153ccdd 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/PublishedWorkflowRegistry.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/PublishedWorkflowRegistry.java
@@ -24,7 +24,7 @@ package org.apache.airavata.registry.api;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegException;
 import org.apache.airavata.registry.api.exception.gateway.PublishedWorkflowAlreadyExistsException;
 import org.apache.airavata.registry.api.exception.gateway.PublishedWorkflowDoesNotExistsException;
 import org.apache.airavata.registry.api.exception.worker.UserWorkflowDoesNotExistsException;
@@ -32,14 +32,14 @@ import org.apache.airavata.registry.api.exception.worker.UserWorkflowDoesNotExis
 
 public interface PublishedWorkflowRegistry extends AiravataSubRegistry {
 	
-	public boolean isPublishedWorkflowExists(String workflowName) throws RegistryException;
-	public void publishWorkflow(String workflowName, String publishWorkflowName) throws PublishedWorkflowAlreadyExistsException, UserWorkflowDoesNotExistsException, RegistryException;
-	public void publishWorkflow(String workflowName) throws PublishedWorkflowAlreadyExistsException, UserWorkflowDoesNotExistsException, RegistryException;
+	public boolean isPublishedWorkflowExists(String workflowName) throws RegException;
+	public void publishWorkflow(String workflowName, String publishWorkflowName) throws PublishedWorkflowAlreadyExistsException, UserWorkflowDoesNotExistsException, RegException;
+	public void publishWorkflow(String workflowName) throws PublishedWorkflowAlreadyExistsException, UserWorkflowDoesNotExistsException, RegException;
 	
-	public String getPublishedWorkflowGraphXML(String workflowName) throws PublishedWorkflowDoesNotExistsException, RegistryException;
-	public List<String> getPublishedWorkflowNames() throws RegistryException;
-	public Map<String,String> getPublishedWorkflows() throws RegistryException;
-	public ResourceMetadata getPublishedWorkflowMetadata(String workflowName) throws RegistryException;
+	public String getPublishedWorkflowGraphXML(String workflowName) throws PublishedWorkflowDoesNotExistsException, RegException;
+	public List<String> getPublishedWorkflowNames() throws RegException;
+	public Map<String,String> getPublishedWorkflows() throws RegException;
+	public ResourceMetadata getPublishedWorkflowMetadata(String workflowName) throws RegException;
 	
-	public void removePublishedWorkflow(String workflowName)throws PublishedWorkflowDoesNotExistsException, RegistryException;
+	public void removePublishedWorkflow(String workflowName)throws PublishedWorkflowDoesNotExistsException, RegException;
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/UserRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/UserRegistry.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/UserRegistry.java
index 9baf7ea..1747458 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/UserRegistry.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/UserRegistry.java
@@ -23,7 +23,7 @@ package org.apache.airavata.registry.api;
 
 import java.util.List;
 
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegException;
 
 public interface UserRegistry extends AiravataSubRegistry{
 
@@ -31,9 +31,9 @@ public interface UserRegistry extends AiravataSubRegistry{
 	/**
 	 * Retrieve all the users in the registry
 	 * @return a list of airavata users from the registry
-	 * @throws RegistryException
+	 * @throws org.apache.airavata.registry.api.exception.RegException
 	 */
 	
-	public List<AiravataUser> getUsers() throws RegistryException;
+	public List<AiravataUser> getUsers() throws RegException;
     
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/UserWorkflowRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/UserWorkflowRegistry.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/UserWorkflowRegistry.java
index d7f0595..6274125 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/UserWorkflowRegistry.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/UserWorkflowRegistry.java
@@ -23,21 +23,21 @@ package org.apache.airavata.registry.api;
 
 import java.util.Map;
 
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegException;
 import org.apache.airavata.registry.api.exception.worker.UserWorkflowAlreadyExistsException;
 import org.apache.airavata.registry.api.exception.worker.UserWorkflowDoesNotExistsException;
 
 
 public interface UserWorkflowRegistry extends AiravataSubRegistry {
 	
-	public boolean isWorkflowExists(String workflowName) throws RegistryException;
-	public void addWorkflow(String workflowName, String workflowGraphXml) throws UserWorkflowAlreadyExistsException, RegistryException;
-	public void updateWorkflow(String workflowName, String workflowGraphXml) throws UserWorkflowDoesNotExistsException, RegistryException;
+	public boolean isWorkflowExists(String workflowName) throws RegException;
+	public void addWorkflow(String workflowName, String workflowGraphXml) throws UserWorkflowAlreadyExistsException, RegException;
+	public void updateWorkflow(String workflowName, String workflowGraphXml) throws UserWorkflowDoesNotExistsException, RegException;
 	
-	public String getWorkflowGraphXML(String workflowName) throws UserWorkflowDoesNotExistsException, RegistryException;
-	public Map<String,String> getWorkflows() throws RegistryException;
+	public String getWorkflowGraphXML(String workflowName) throws UserWorkflowDoesNotExistsException, RegException;
+	public Map<String,String> getWorkflows() throws RegException;
 	
-	public ResourceMetadata getWorkflowMetadata(String workflowName) throws RegistryException;	
+	public ResourceMetadata getWorkflowMetadata(String workflowName) throws RegException;
 	
-	public void removeWorkflow(String workflowName) throws UserWorkflowDoesNotExistsException, RegistryException;
+	public void removeWorkflow(String workflowName) throws UserWorkflowDoesNotExistsException, RegException;
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/WorkspaceProject.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/WorkspaceProject.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/WorkspaceProject.java
index 68a0fc3..f804dfe 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/WorkspaceProject.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/WorkspaceProject.java
@@ -24,7 +24,7 @@ package org.apache.airavata.registry.api;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegException;
 
 import javax.xml.bind.annotation.*;
 
@@ -65,15 +65,15 @@ public class WorkspaceProject{
 		this.projectsRegistry = projectsRegistry;
 	}
 	
-	public void createExperiment(AiravataExperiment experiment) throws RegistryException{
+	public void createExperiment(AiravataExperiment experiment) throws RegException {
 		getProjectsRegistry().addExperiment(getProjectName(), experiment);
 	}
 	
-	public List<AiravataExperiment> getExperiments() throws RegistryException{
+	public List<AiravataExperiment> getExperiments() throws RegException {
 		return getProjectsRegistry().getExperiments(getProjectName());
 	}
 	
-	public List<AiravataExperiment> getExperiments(Date from, Date to) throws RegistryException{
+	public List<AiravataExperiment> getExperiments(Date from, Date to) throws RegException {
 		return getProjectsRegistry().getExperiments(getProjectName(),from, to);
 	}
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/AiravataRegUninitializedException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/AiravataRegUninitializedException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/AiravataRegUninitializedException.java
new file mode 100644
index 0000000..e6e44a9
--- /dev/null
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/AiravataRegUninitializedException.java
@@ -0,0 +1,32 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.api.exception;
+
+public class AiravataRegUninitializedException extends RegException {
+
+	public AiravataRegUninitializedException(String message, Throwable e) {
+		super(message, e);
+	}
+
+	private static final long serialVersionUID = -6873054164386608256L;
+
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/AiravataRegistryUninitializedException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/AiravataRegistryUninitializedException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/AiravataRegistryUninitializedException.java
deleted file mode 100644
index f211832..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/AiravataRegistryUninitializedException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.registry.api.exception;
-
-public class AiravataRegistryUninitializedException extends RegistryException {
-
-	public AiravataRegistryUninitializedException(String message, Throwable e) {
-		super(message, e);
-	}
-
-	private static final long serialVersionUID = -6873054164386608256L;
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/DeploymentDescriptionRetrieveException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/DeploymentDescriptionRetrieveException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/DeploymentDescriptionRetrieveException.java
index 3630bd8..3787a12 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/DeploymentDescriptionRetrieveException.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/DeploymentDescriptionRetrieveException.java
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.registry.api.exception;
 
-public class DeploymentDescriptionRetrieveException extends RegistryException {
+public class DeploymentDescriptionRetrieveException extends RegException {
     private final static String ERROR_MESSAGE = "Error occured while attempting to retrieve existing deployment descriptions";
     /**
 	 * 

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/GatewayNotRegisteredException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/GatewayNotRegisteredException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/GatewayNotRegisteredException.java
index 6aa7da0..e0750b0 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/GatewayNotRegisteredException.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/GatewayNotRegisteredException.java
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.registry.api.exception;
 
-public class GatewayNotRegisteredException extends RegistryException {
+public class GatewayNotRegisteredException extends RegException {
 
 	private static final long serialVersionUID = -139586125325993500L;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/HostDescriptionRetrieveException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/HostDescriptionRetrieveException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/HostDescriptionRetrieveException.java
index 9e21063..f03fd03 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/HostDescriptionRetrieveException.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/HostDescriptionRetrieveException.java
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.registry.api.exception;
 
-public class HostDescriptionRetrieveException extends RegistryException {
+public class HostDescriptionRetrieveException extends RegException {
     private final static String ERROR_MESSAGE = "Error occured while attempting to retrieve existing hosts";
 
     private static final long serialVersionUID = -2849422320139467602L;

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAPIVersionIncompatibleException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAPIVersionIncompatibleException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAPIVersionIncompatibleException.java
new file mode 100644
index 0000000..3eac400
--- /dev/null
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAPIVersionIncompatibleException.java
@@ -0,0 +1,39 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.api.exception;
+
+public class RegAPIVersionIncompatibleException extends RegException {
+
+    private static final long serialVersionUID = -2679914107485739141L;
+
+    public RegAPIVersionIncompatibleException() {
+        this("Incompatible versions with Airavata registry and Airavata API");
+    }
+
+    public RegAPIVersionIncompatibleException(String message) {
+        this(message,null);
+    }
+
+    public RegAPIVersionIncompatibleException(String message, Exception e){
+        super(message, e);
+    }
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorInstantiateException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorInstantiateException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorInstantiateException.java
new file mode 100644
index 0000000..2214734
--- /dev/null
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorInstantiateException.java
@@ -0,0 +1,32 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.api.exception;
+
+public class RegAccessorInstantiateException extends RegException {
+
+	private static final long serialVersionUID = -2679914107485739140L;
+	
+	public RegAccessorInstantiateException(String className, Exception e){
+		super("There was an exception instantiating the Registry accessor class '"+className+"'!!!", e);
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorInvalidException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorInvalidException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorInvalidException.java
new file mode 100644
index 0000000..0c85b42
--- /dev/null
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorInvalidException.java
@@ -0,0 +1,32 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.api.exception;
+
+public class RegAccessorInvalidException extends RegException {
+
+	private static final long serialVersionUID = -2679914107485739140L;
+	
+	public RegAccessorInvalidException(String className){
+		super("Registry accessor '"+className+"' is not valid!!!");
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorNotFoundException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorNotFoundException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorNotFoundException.java
new file mode 100644
index 0000000..daad74b
--- /dev/null
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorNotFoundException.java
@@ -0,0 +1,32 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.api.exception;
+
+public class RegAccessorNotFoundException extends RegException {
+
+	private static final long serialVersionUID = -2679914107485739140L;
+	
+	public RegAccessorNotFoundException(String className, Exception e){
+		super("Registry accessor class '"+className+"'  was not found in classpath!!!", e);
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorUndefinedException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorUndefinedException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorUndefinedException.java
new file mode 100644
index 0000000..90ef70d
--- /dev/null
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegAccessorUndefinedException.java
@@ -0,0 +1,40 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.api.exception;
+
+public class RegAccessorUndefinedException extends RegException {
+
+	private static final long serialVersionUID = -2679914107485739140L;
+
+	public RegAccessorUndefinedException() {
+		this("A registry accessor was not defined in the registry settings");
+	}
+	
+	public RegAccessorUndefinedException(String message) {
+		this(message,null);
+	}
+	
+	public RegAccessorUndefinedException(String message, Exception e){
+		super(message, e);
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegException.java
new file mode 100644
index 0000000..c71abdc
--- /dev/null
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegException.java
@@ -0,0 +1,39 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.api.exception;
+
+public class RegException extends Exception {
+	
+    private static final long serialVersionUID = -2849422320139467602L;
+
+    public RegException(Throwable e) {
+        super(e);
+    }
+    
+    public RegException(String message) {
+        super(message, null);
+    }
+    
+    public RegException(String message, Throwable e) {
+        super(message, e);
+    }
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAPIVersionIncompatibleException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAPIVersionIncompatibleException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAPIVersionIncompatibleException.java
deleted file mode 100644
index 76b4ac2..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAPIVersionIncompatibleException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.registry.api.exception;
-
-import org.apache.airavata.registry.api.exception.RegistryException;
-
-public class RegistryAPIVersionIncompatibleException extends RegistryException {
-
-    private static final long serialVersionUID = -2679914107485739141L;
-
-    public RegistryAPIVersionIncompatibleException() {
-        this("Incompatible versions with Airavata registry and Airavata API");
-    }
-
-    public RegistryAPIVersionIncompatibleException(String message) {
-        this(message,null);
-    }
-
-    public RegistryAPIVersionIncompatibleException(String message, Exception e){
-        super(message, e);
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorInstantiateException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorInstantiateException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorInstantiateException.java
deleted file mode 100644
index 5c20f36..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorInstantiateException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.registry.api.exception;
-
-public class RegistryAccessorInstantiateException extends RegistryException {
-
-	private static final long serialVersionUID = -2679914107485739140L;
-	
-	public RegistryAccessorInstantiateException(String className, Exception e){
-		super("There was an exception instantiating the Registry accessor class '"+className+"'!!!", e);
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorInvalidException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorInvalidException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorInvalidException.java
deleted file mode 100644
index c5952df..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorInvalidException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.registry.api.exception;
-
-public class RegistryAccessorInvalidException extends RegistryException {
-
-	private static final long serialVersionUID = -2679914107485739140L;
-	
-	public RegistryAccessorInvalidException(String className){
-		super("Registry accessor '"+className+"' is not valid!!!");
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorNotFoundException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorNotFoundException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorNotFoundException.java
deleted file mode 100644
index 69344f4..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorNotFoundException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.registry.api.exception;
-
-public class RegistryAccessorNotFoundException extends RegistryException {
-
-	private static final long serialVersionUID = -2679914107485739140L;
-	
-	public RegistryAccessorNotFoundException(String className, Exception e){
-		super("Registry accessor class '"+className+"'  was not found in classpath!!!", e);
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorUndefinedException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorUndefinedException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorUndefinedException.java
deleted file mode 100644
index 1c8e566..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryAccessorUndefinedException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.registry.api.exception;
-
-public class RegistryAccessorUndefinedException extends RegistryException {
-
-	private static final long serialVersionUID = -2679914107485739140L;
-
-	public RegistryAccessorUndefinedException() {
-		this("A registry accessor was not defined in the registry settings");
-	}
-	
-	public RegistryAccessorUndefinedException(String message) {
-		this(message,null);
-	}
-	
-	public RegistryAccessorUndefinedException(String message, Exception e){
-		super(message, e);
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryException.java
deleted file mode 100644
index 1bac4ae..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/RegistryException.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.registry.api.exception;
-
-public class RegistryException extends Exception {
-	
-    private static final long serialVersionUID = -2849422320139467602L;
-
-    public RegistryException(Throwable e) {
-        super(e);
-    }
-    
-    public RegistryException(String message) {
-        super(message, null);
-    }
-    
-    public RegistryException(String message, Throwable e) {
-        super(message, e);
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/ServiceDescriptionRetrieveException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/ServiceDescriptionRetrieveException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/ServiceDescriptionRetrieveException.java
index 32a0c61..d05e60a 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/ServiceDescriptionRetrieveException.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/ServiceDescriptionRetrieveException.java
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.registry.api.exception;
 
-public class ServiceDescriptionRetrieveException extends RegistryException {
+public class ServiceDescriptionRetrieveException extends RegException {
     private final static String ERROR_MESSAGE = "Error occured while attempting to retrieve existing service descriptions";
     /**
 	 * 

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnimplementedRegOperationException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnimplementedRegOperationException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnimplementedRegOperationException.java
new file mode 100644
index 0000000..e6a71f9
--- /dev/null
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnimplementedRegOperationException.java
@@ -0,0 +1,32 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.api.exception;
+
+public class UnimplementedRegOperationException extends RegException {
+
+	private static final long serialVersionUID = 8565882892195989548L;
+
+	public UnimplementedRegOperationException() {
+		super("This operation is not implemented!!!");
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnimplementedRegistryOperationException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnimplementedRegistryOperationException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnimplementedRegistryOperationException.java
deleted file mode 100644
index 5f6be73..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnimplementedRegistryOperationException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.registry.api.exception;
-
-public class UnimplementedRegistryOperationException extends RegistryException {
-
-	private static final long serialVersionUID = 8565882892195989548L;
-
-	public UnimplementedRegistryOperationException() {
-		super("This operation is not implemented!!!");
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnknownRegConnectionDataException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnknownRegConnectionDataException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnknownRegConnectionDataException.java
new file mode 100644
index 0000000..a71e085
--- /dev/null
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnknownRegConnectionDataException.java
@@ -0,0 +1,36 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.api.exception;
+
+public class UnknownRegConnectionDataException extends RegException {
+
+	private static final long serialVersionUID = -6483101227925383562L;
+
+	public UnknownRegConnectionDataException(String message) {
+		super(message);
+	}
+	
+	public UnknownRegConnectionDataException(String message, Throwable e) {
+		super(message, e);
+	}
+
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnknownRegistryConnectionDataException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnknownRegistryConnectionDataException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnknownRegistryConnectionDataException.java
deleted file mode 100644
index f732127..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/UnknownRegistryConnectionDataException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.registry.api.exception;
-
-public class UnknownRegistryConnectionDataException extends RegistryException {
-
-	private static final long serialVersionUID = -6483101227925383562L;
-
-	public UnknownRegistryConnectionDataException(String message) {
-		super(message);
-	}
-	
-	public UnknownRegistryConnectionDataException(String message, Throwable e) {
-		super(message, e);
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/DescriptorAlreadyExistsException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/DescriptorAlreadyExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/DescriptorAlreadyExistsException.java
index b98d13c..268c1fd 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/DescriptorAlreadyExistsException.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/DescriptorAlreadyExistsException.java
@@ -21,9 +21,9 @@
 
 package org.apache.airavata.registry.api.exception.gateway;
 
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegException;
 
-public class DescriptorAlreadyExistsException extends RegistryException {
+public class DescriptorAlreadyExistsException 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/gateway/DescriptorDoesNotExistsException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/DescriptorDoesNotExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/DescriptorDoesNotExistsException.java
index 15ee860..dc77a3b 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/DescriptorDoesNotExistsException.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/DescriptorDoesNotExistsException.java
@@ -21,9 +21,9 @@
 
 package org.apache.airavata.registry.api.exception.gateway;
 
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegException;
 
-public class DescriptorDoesNotExistsException extends RegistryException {
+public class DescriptorDoesNotExistsException 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/gateway/InsufficientDataException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/InsufficientDataException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/InsufficientDataException.java
index 652ee01..e495e42 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/InsufficientDataException.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/InsufficientDataException.java
@@ -21,9 +21,9 @@
 
 package org.apache.airavata.registry.api.exception.gateway;
 
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegException;
 
-public class InsufficientDataException extends RegistryException {
+public class InsufficientDataException extends RegException {
 
     private static final long serialVersionUID = 7706410845538952164L;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/bf5f8c3c/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/MalformedDescriptorException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/MalformedDescriptorException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/MalformedDescriptorException.java
index 8ed3324..232ae9e 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/MalformedDescriptorException.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/MalformedDescriptorException.java
@@ -21,9 +21,9 @@
 
 package org.apache.airavata.registry.api.exception.gateway;
 
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegException;
 
-public class MalformedDescriptorException extends RegistryException {
+public class MalformedDescriptorException 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/gateway/PublishedWorkflowAlreadyExistsException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/PublishedWorkflowAlreadyExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/PublishedWorkflowAlreadyExistsException.java
index 9deb677..a0c935d 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/PublishedWorkflowAlreadyExistsException.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/PublishedWorkflowAlreadyExistsException.java
@@ -21,9 +21,9 @@
 
 package org.apache.airavata.registry.api.exception.gateway;
 
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegException;
 
-public class PublishedWorkflowAlreadyExistsException extends RegistryException {
+public class PublishedWorkflowAlreadyExistsException 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/gateway/PublishedWorkflowDoesNotExistsException.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/PublishedWorkflowDoesNotExistsException.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/PublishedWorkflowDoesNotExistsException.java
index 2c49164..2f32209 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/PublishedWorkflowDoesNotExistsException.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/gateway/PublishedWorkflowDoesNotExistsException.java
@@ -21,9 +21,9 @@
 
 package org.apache.airavata.registry.api.exception.gateway;
 
-import org.apache.airavata.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.exception.RegException;
 
-public class PublishedWorkflowDoesNotExistsException extends RegistryException {
+public class PublishedWorkflowDoesNotExistsException extends RegException {
 
 	private static final long serialVersionUID = -8006347245307495767L;
 


Mime
View raw message