airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1234085 [1/2] - in /incubator/airavata/trunk/modules: commons/common-registry-api/src/main/java/org/apache/airavata/common/registry/api/exception/ commons/registry-api/src/main/java/org/apache/airavata/registry/api/ commons/registry-api/sr...
Date Fri, 20 Jan 2012 19:25:21 GMT
Author: samindaw
Date: Fri Jan 20 19:25:19 2012
New Revision: 1234085

URL: http://svn.apache.org/viewvc?rev=1234085&view=rev
Log:
Updating airavataregistry api

Added:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/clients/XBayaClientConfiguration.java
Modified:
    incubator/airavata/trunk/modules/commons/common-registry-api/src/main/java/org/apache/airavata/common/registry/api/exception/RegistryException.java
    incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry.java
    incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/Axis2Registry.java
    incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/DataRegistry.java
    incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java
    incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
    incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
    incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/OutputRegister.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/clients/XBayaClient.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/GFacURLs.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowTemplates.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java
    incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/XBayaClientTest.java
    incubator/airavata/trunk/modules/xbaya-gui/src/test/resources/xbaya.properties

Modified: incubator/airavata/trunk/modules/commons/common-registry-api/src/main/java/org/apache/airavata/common/registry/api/exception/RegistryException.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/common-registry-api/src/main/java/org/apache/airavata/common/registry/api/exception/RegistryException.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/common-registry-api/src/main/java/org/apache/airavata/common/registry/api/exception/RegistryException.java (original)
+++ incubator/airavata/trunk/modules/commons/common-registry-api/src/main/java/org/apache/airavata/common/registry/api/exception/RegistryException.java Fri Jan 20 19:25:19 2012
@@ -31,7 +31,7 @@ public class RegistryException extends E
         super(ERROR_MESSAGE, e);
     }
     
-    protected RegistryException(String message, Exception e) {
+    public RegistryException(String message, Exception e) {
         super(message, e);
     }
 }

Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry.java Fri Jan 20 19:25:19 2012
@@ -82,7 +82,7 @@ public interface AiravataRegistry extend
      * @param host
      * @return identifier
      */
-    public String saveHostDescription(HostDescription host);
+    public String saveHostDescription(HostDescription host)throws RegistryException;
 
     /**
      * Save a service description with the specific name.
@@ -91,7 +91,7 @@ public interface AiravataRegistry extend
      * @param host
      * @return identifier
      */
-    public String saveServiceDescription(ServiceDescription service);
+    public String saveServiceDescription(ServiceDescription service)throws RegistryException;
 
     /**
      * Save a deployment description according to the service and host
@@ -101,7 +101,7 @@ public interface AiravataRegistry extend
      * @param app
      * @return identifier
      */
-    public String saveDeploymentDescription(String serviceId, String hostId, ApplicationDeploymentDescription app);
+    public String saveDeploymentDescription(String serviceId, String hostId, ApplicationDeploymentDescription app)throws RegistryException;
 
     /**
      * Deploy a service on a host
@@ -110,7 +110,7 @@ public interface AiravataRegistry extend
      * @param hostName
      * @return true if service can be deploy on the host, otherwise false
      */
-    public boolean deployServiceOnHost(String serviceName, String hostName);
+    public boolean deployServiceOnHost(String serviceName, String hostName)throws RegistryException;
 
     /**
      * Search host description with name
@@ -184,26 +184,27 @@ public interface AiravataRegistry extend
      * @param gfacURL
      * @return
      */
-    public boolean saveGFacDescriptor(String gfacURL);
+    public boolean saveGFacDescriptor(String gfacURL)throws RegistryException;
 
     /**
      * This method can be used to unset the gfacURL from repository resource
      * 
      * @param gfacURL
      * @return
+     * @throws RegistryException 
      */
-    public boolean deleteGFacDescriptor(String gfacURL);
+    public boolean deleteGFacDescriptor(String gfacURL) throws RegistryException;
 
-    public List<String> getGFacDescriptorList();
+    public List<String> getGFacDescriptorList() throws RegistryException;
 
     public boolean saveWorkflow(QName ResourceID, String workflowName, String resourceDesc, String workflowAsaString,
-            String owner, boolean isMakePublic);
+            String owner, boolean isMakePublic) throws RegistryException;
 
-    public Map<QName, Node> getWorkflows(String userName);
+    public Map<QName, Node> getWorkflows(String userName) throws RegistryException;
 
-    public Node getWorkflow(QName templateID, String userName);
+    public Node getWorkflow(QName templateID, String userName) throws RegistryException;
 
-    public boolean deleteWorkflow(QName resourceID, String userName);
+    public boolean deleteWorkflow(QName resourceID, String userName) throws RegistryException;
 
     public void deleteServiceDescription(String serviceId) throws RegistryException;
 
@@ -212,27 +213,30 @@ public interface AiravataRegistry extend
 
     public void deleteHostDescription(String hostId) throws RegistryException;
 
-    public boolean saveWorkflowInput(WorkflowIOData workflowInputData) ;
+    public boolean saveWorkflowExecutionServiceInput(WorkflowIOData workflowInputData) throws RegistryException;
 
-    public boolean saveWorkflowOutput(WorkflowIOData workflowOutputData);
+    public boolean saveWorkflowExecutionServiceOutput(WorkflowIOData workflowOutputData)throws RegistryException;
     
-    public List<WorkflowIOData> searchWorkflowInput(String experimentIdRegEx, String workflowNameRegEx, String nodeNameRegEx);
+    public List<WorkflowIOData> searchWorkflowExecutionServiceInput(String experimentIdRegEx, String workflowNameRegEx, String nodeNameRegEx)throws RegistryException;
 
-    public List<WorkflowIOData> searchWorkflowOutput(String experimentIdRegEx, String workflowNameRegEx, String nodeNameRegEx);
+    public List<WorkflowIOData> searchWorkflowExecutionServiceOutput(String experimentIdRegEx, String workflowNameRegEx, String nodeNameRegEx)throws RegistryException;
 
-    public boolean saveWorkflowStatus(String experimentId,String status);
+    public boolean saveWorkflowExecutionStatus(String experimentId,String status)throws RegistryException;
 
-    public String getWorkflowStatus(String experimentId);
+    public String getWorkflowExecutionStatus(String experimentId)throws RegistryException;
 
-    public Map<String,String> getWorkflowStatusWithRegex(String regex) throws RegistryException;
+    public Map<String,String> getWorkflowExecutionStatusWithRegex(String regex) throws RegistryException;
 
-    public boolean saveWorkflowOutputData(String experimentId,String outputNodeName,String output) throws RegistryException;
+    public boolean saveWorkflowExecutionOutput(String experimentId,String outputNodeName,String output) throws RegistryException;
 
-    public String getWorkflowOutputData(String experimentId,String outputNodeName) throws RegistryException;
+    public String getWorkflowExecutionOutput(String experimentId,String outputNodeName) throws RegistryException;
 
-    public Map<String,String> getWorkflowOutputDataWithRegix(String experimentIdRegex,String outputName)throws  RegistryException;
+    public Map<String,String> getWorkflowExecutionOutputWithRegex(String experimentIdRegex,String outputName)throws  RegistryException;
 
-    public String[] getWorkflowOutputNames(String exeperimentId) throws RegistryException;
+    public String[] getWorkflowExecutionOutputNames(String exeperimentId) throws RegistryException;
+
+    public Map<String,String[]> getWorkflowExecutionOutputNamesWithRegex(String experiementId) throws  RegistryException;
+    
+    public boolean saveWorkflowExecutionUser(String experimentId, String user) throws RegistryException;
 
-    public Map<String,String[]> getWorkflowOutputNamesWithRegex(String experiementId) throws  RegistryException;
 }

Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/Axis2Registry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/Axis2Registry.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/Axis2Registry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/Axis2Registry.java Fri Jan 20 19:25:19 2012
@@ -33,13 +33,14 @@ public interface Axis2Registry extends A
      * @return WSDL
      * @throws RegistryException 
      */
-    public String getWSDL(String serviceId) throws RegistryException;
+    public String getWSDL(String serviceId) throws Exception;
     
     /**
      * Load WSDL for Axis2
      * 
      * @param serviceId
      * @return WSDL
+     * @throws Exception 
      */
-    public String getWSDL(ServiceDescription service);
+    public String getWSDL(ServiceDescription service) throws Exception;
 }

Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/DataRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/DataRegistry.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/DataRegistry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/DataRegistry.java Fri Jan 20 19:25:19 2012
@@ -23,6 +23,7 @@ package org.apache.airavata.registry.api
 
 import java.util.List;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.ActualParameter;
 
 public interface DataRegistry {
@@ -33,15 +34,17 @@ public interface DataRegistry {
      * @param workflowId
      * @param parameters
      * @return
+     * @throws RegistryException 
      */
-    public String saveOutput(String workflowId, List<ActualParameter> parameters);
+    public String saveOutput(String workflowId, List<ActualParameter> parameters) throws RegistryException;
 
     /**
      * Load output from workflow execution.
      * 
      * @param workflowId
      * @return List of parameters
+     * @throws RegistryException 
      */
-    public List<ActualParameter> loadOutput(String workflowId);
+    public List<ActualParameter> loadOutput(String workflowId) throws RegistryException;
 
 }

Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java Fri Jan 20 19:25:19 2012
@@ -247,7 +247,7 @@ public class AiravataJCRRegistry extends
         return result;
     }
 
-    public String saveHostDescription(HostDescription host) {
+    public String saveHostDescription(HostDescription host) throws RegistryException{
         Session session = null;
         String result = null;
         try {
@@ -261,15 +261,14 @@ public class AiravataJCRRegistry extends
             triggerObservers(this);
         } catch (Exception e) {
             System.out.println(e);
-            e.printStackTrace();
-            // TODO propagate
+            throw new RegistryException("Error while saving host description!!!", e);
         } finally {
             closeSession(session);
         }
         return result;
     }
 
-    public String saveServiceDescription(ServiceDescription service) {
+    public String saveServiceDescription(ServiceDescription service) throws RegistryException{
         Session session = null;
         String result = null;
         try {
@@ -283,15 +282,14 @@ public class AiravataJCRRegistry extends
             triggerObservers(this);
         } catch (Exception e) {
             System.out.println(e);
-            e.printStackTrace();
-            // TODO propagate
+            throw new RegistryException("Error while saving service description!!!", e);
         } finally {
             closeSession(session);
         }
         return result;
     }
 
-    public String saveDeploymentDescription(String serviceId, String hostId, ApplicationDeploymentDescription app) {
+    public String saveDeploymentDescription(String serviceId, String hostId, ApplicationDeploymentDescription app) throws RegistryException {
         Session session = null;
         String result = null;
         try {
@@ -307,15 +305,14 @@ public class AiravataJCRRegistry extends
             triggerObservers(this);
         } catch (Exception e) {
             System.out.println(e);
-            e.printStackTrace();
-            // TODO propagate
+            throw new RegistryException("Error while saving deployment description!!!", e);
         } finally {
             closeSession(session);
         }
         return result;
     }
 
-    public boolean deployServiceOnHost(String serviceId, String hostId) {
+    public boolean deployServiceOnHost(String serviceId, String hostId)throws RegistryException {
         Session session = null;
         try {
             session = getSession();
@@ -347,12 +344,10 @@ public class AiravataJCRRegistry extends
             return true;
         } catch (Exception e) {
             System.out.println(e);
-            e.printStackTrace();
-            // TODO propagate
+            throw new RegistryException("Error while saving service on host!!!", e);
         } finally {
             closeSession(session);
         }
-        return false;
     }
 
     public List<ServiceDescription> searchServiceDescription(String nameRegEx) throws RegistryException {
@@ -569,7 +564,7 @@ public class AiravataJCRRegistry extends
     // return saveWSDL(service, WebServiceUtil.generateWSDL(service));
     // }
 
-    public String getWSDL(String serviceName) throws RegistryException {
+    public String getWSDL(String serviceName) throws Exception {
         ServiceDescription serviceDescription = getServiceDescription(serviceName);
         if (serviceDescription != null) {
             return getWSDL(serviceDescription);
@@ -578,7 +573,7 @@ public class AiravataJCRRegistry extends
                 + serviceName));
     }
 
-    public String getWSDL(ServiceDescription service) {
+    public String getWSDL(ServiceDescription service) throws Exception{
         try {
             
             ServiceType type = service.getType().addNewService();
@@ -599,7 +594,7 @@ public class AiravataJCRRegistry extends
         }
     }
 
-    public boolean saveGFacDescriptor(String gfacURL) {
+    public boolean saveGFacDescriptor(String gfacURL) throws RegistryException{
         java.util.Date today = Calendar.getInstance(TimeZone.getTimeZone("GMT")).getTime();
         Timestamp timestamp = new Timestamp(today.getTime());
         Session session = null;
@@ -619,16 +614,14 @@ public class AiravataJCRRegistry extends
             triggerObservers(this);
         } catch (Exception e) {
             System.out.println(e);
-            e.printStackTrace();
-            return false;
-            // TODO propagate
+            throw new RegistryException("Error while saving GFac Descriptor to the registry!!!", e);
         } finally {
             closeSession(session);
         }
         return true;
     }
 
-    public boolean deleteGFacDescriptor(String gfacURL) {
+    public boolean deleteGFacDescriptor(String gfacURL) throws RegistryException{
         Session session = null;
         try {
             URI uri = new URI(gfacURL);
@@ -643,16 +636,14 @@ public class AiravataJCRRegistry extends
             }
         } catch (Exception e) {
             System.out.println(e);
-            e.printStackTrace();
-            return false;
-            // TODO propagate
+            throw new RegistryException("Error while deleting GFac Descriptions from registry!!!",e); 
         } finally {
             closeSession(session);
         }
         return true;
     }
 
-    public List<String> getGFacDescriptorList() {
+    public List<String> getGFacDescriptorList() throws RegistryException{
         Session session = null;
         List<String> urlList = new ArrayList<String>();
         java.util.Date today = Calendar.getInstance(TimeZone.getTimeZone("GMT")).getTime();
@@ -672,12 +663,12 @@ public class AiravataJCRRegistry extends
                 }
             }
         } catch (RepositoryException e) {
-            e.printStackTrace();
+            throw new RegistryException("Error while retrieving GFac Descriptor list!!!", e);
         }
         return urlList;
     }
 
-    public String saveOutput(String workflowId, List<ActualParameter> parameters) {
+    public String saveOutput(String workflowId, List<ActualParameter> parameters) throws RegistryException{
         Session session = null;
         String result = null;
         try {
@@ -694,15 +685,14 @@ public class AiravataJCRRegistry extends
             triggerObservers(this);
         } catch (Exception e) {
             System.out.println(e);
-            e.printStackTrace();
-            // TODO propagate
+            throw new RegistryException("Error while saving workflow output to the registry!!!", e);
         } finally {
             closeSession(session);
         }
         return result;
     }
 
-    public List<ActualParameter> loadOutput(String workflowId) {
+    public List<ActualParameter> loadOutput(String workflowId) throws RegistryException{
         Session session = null;
         ArrayList<ActualParameter> result = new ArrayList<ActualParameter>();
         try {
@@ -717,15 +707,14 @@ public class AiravataJCRRegistry extends
             }
         } catch (Exception e) {
             System.out.println(e);
-            e.printStackTrace();
-            // TODO propagate
+            throw new RegistryException("Error while loading workflow output from registry!!!", e);
         } finally {
             closeSession(session);
         }
         return result;
     }
 
-    public Map<QName, Node> getWorkflows(String userName) {
+    public Map<QName, Node> getWorkflows(String userName) throws RegistryException{
         Session session = null;
         Map<QName, Node> workflowList = new HashMap<QName, Node>();
         try {
@@ -744,12 +733,12 @@ public class AiravataJCRRegistry extends
             }
 
         } catch (Exception e) {
-            e.printStackTrace();
+            throw new RegistryException("Error while retrieving workflows from registry!!!",e);
         }
         return workflowList;
     }
 
-    public Node getWorkflow(QName templateID, String userName) {
+    public Node getWorkflow(QName templateID, String userName) throws RegistryException{
         Session session = null;
         Node result = null;
         try {
@@ -757,13 +746,13 @@ public class AiravataJCRRegistry extends
             Node workflowListNode = getOrAddNode(getOrAddNode(session.getRootNode(), WORKFLOWS), userName);
             result = getOrAddNode(workflowListNode, templateID.getLocalPart());
         } catch (Exception e) {
-            e.printStackTrace();
+            throw new RegistryException("Error while retrieving workflow from registry!!!", e);
         }
         return result;
     }
 
     public boolean saveWorkflow(QName ResourceID, String workflowName, String resourceDesc, String workflowAsaString,
-            String owner, boolean isMakePublic) {
+            String owner, boolean isMakePublic) throws RegistryException{
         Session session = null;
         try {
             session = getSession();
@@ -784,14 +773,14 @@ public class AiravataJCRRegistry extends
             session.save();
             triggerObservers(this);
         } catch (Exception e) {
-            e.printStackTrace();
+            throw new RegistryException("Error while saving workflow to the registry!!!", e);
         } finally {
             closeSession(session);
             return true;
         }
     }
 
-    public boolean deleteWorkflow(QName resourceID, String userName) {
+    public boolean deleteWorkflow(QName resourceID, String userName) throws RegistryException{
         Session session = null;
         try {
             session = getSession();
@@ -803,23 +792,23 @@ public class AiravataJCRRegistry extends
                 triggerObservers(this);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            throw new RegistryException("Error while deleting workflow from registry!!!", e);
         } finally {
             closeSession(session);
         }
         return false;
     }
 
-    public boolean saveWorkflowInput(WorkflowIOData workflowInputData) {
+    public boolean saveWorkflowExecutionServiceInput(WorkflowIOData workflowInputData) throws RegistryException{
         return saveWorkflowIO(workflowInputData, INPUT);
     }
 
-    public boolean saveWorkflowOutput(WorkflowIOData workflowOutputData) {
+    public boolean saveWorkflowExecutionServiceOutput(WorkflowIOData workflowOutputData) throws RegistryException{
         return saveWorkflowIO(workflowOutputData, OUTPUT);
     }
 
 
-    private boolean saveWorkflowIO(WorkflowIOData workflowOutputData, String type) {
+    private boolean saveWorkflowIO(WorkflowIOData workflowOutputData, String type) throws RegistryException{
         Session session = null;
         boolean isSaved = true;
         try {
@@ -831,25 +820,25 @@ public class AiravataJCRRegistry extends
             session.save();
         } catch (Exception e) {
             isSaved = false;
-            e.printStackTrace();
+            throw new RegistryException("Error while saving workflow execution service data!!!", e);
         } finally {
             closeSession(session);
         }
         return isSaved;
     }
 
-    public List<WorkflowIOData> searchWorkflowInput(String experimentIdRegEx, String workflowNameRegEx,
-            String nodeNameRegEx) {
+    public List<WorkflowIOData> searchWorkflowExecutionServiceInput(String experimentIdRegEx, String workflowNameRegEx,
+            String nodeNameRegEx) throws RegistryException{
         return searchWorkflowIO(experimentIdRegEx, workflowNameRegEx, nodeNameRegEx, INPUT);
     }
 
-    public List<WorkflowIOData> searchWorkflowOutput(String experimentIdRegEx, String workflowNameRegEx,
-            String nodeNameRegEx) {
+    public List<WorkflowIOData> searchWorkflowExecutionServiceOutput(String experimentIdRegEx, String workflowNameRegEx,
+            String nodeNameRegEx) throws RegistryException{
         return searchWorkflowIO(experimentIdRegEx, workflowNameRegEx, nodeNameRegEx, OUTPUT);
     }
 
     private List<WorkflowIOData> searchWorkflowIO(String experimentIdRegEx, String workflowNameRegEx,
-            String nodeNameRegEx, String type) {
+            String nodeNameRegEx, String type) throws RegistryException{
         List<WorkflowIOData> workflowIODataList = new ArrayList<WorkflowIOData>();
         Session session = null;
         try {
@@ -886,14 +875,14 @@ public class AiravataJCRRegistry extends
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            throw new RegistryException("Error while retrieving workflow execution service data!!!",e);
         } finally {
             closeSession(session);
         }
         return workflowIODataList;
     }
 
-    public boolean saveWorkflowStatus(String experimentId,String status){
+    public boolean saveWorkflowExecutionStatus(String experimentId,String status)throws RegistryException{
         Session session = null;
         boolean isSaved = true;
         try {
@@ -910,7 +899,7 @@ public class AiravataJCRRegistry extends
         return isSaved;
     }
 
-    public String getWorkflowStatus(String experimentId){
+    public String getWorkflowExecutionStatus(String experimentId)throws RegistryException{
        Session session = null;
         String property = null;
         try {
@@ -932,7 +921,7 @@ public class AiravataJCRRegistry extends
 		                experimentId),experimentId);
 	}
     
-	public boolean saveWorkflowOutputData(String experimentId,String outputNodeName,String output) throws RegistryException{
+	public boolean saveWorkflowExecutionOutput(String experimentId,String outputNodeName,String output) throws RegistryException{
 		Session session=null;
 		try {
 			session = getSession();
@@ -949,7 +938,7 @@ public class AiravataJCRRegistry extends
 	    return true;
 	}
 
-    public String getWorkflowOutputData(String experimentId,String outputNodeName) throws RegistryException{
+    public String getWorkflowExecutionOutput(String experimentId,String outputNodeName) throws RegistryException{
 		Session session=null;
 		try {
 			session = getSession();
@@ -968,7 +957,7 @@ public class AiravataJCRRegistry extends
 		}
     }
 
-    public String[] getWorkflowOutputNames(String experimentId) throws RegistryException{
+    public String[] getWorkflowExecutionOutputNames(String experimentId) throws RegistryException{
     	Session session=null;
     	List<String> outputNames=new ArrayList<String>();
 		try {
@@ -1011,14 +1000,14 @@ public class AiravataJCRRegistry extends
         }
         return matchList;
     }
-    public Map<String, String> getWorkflowStatusWithRegex(String regex) throws RegistryException {
+    public Map<String, String> getWorkflowExecutionStatusWithRegex(String regex) throws RegistryException {
         Session session=null;
         Map<String,String> workflowStatusMap = new HashMap<String, String>();
         try {
             session = getSession();
             List<String> matchingExperimentIds = getMatchingExperimentIds(regex, session);
             for(String experimentId:matchingExperimentIds){
-                String workflowStatus = getWorkflowStatus(experimentId);
+                String workflowStatus = getWorkflowExecutionStatus(experimentId);
                 workflowStatusMap.put(experimentId,workflowStatus);
             }
 		} catch (RepositoryException e) {
@@ -1030,14 +1019,14 @@ public class AiravataJCRRegistry extends
         return workflowStatusMap;
     }
 
-    public Map<String, String> getWorkflowOutputDataWithRegix(String regex, String outputName) throws RegistryException {
+    public Map<String, String> getWorkflowExecutionOutputWithRegex(String regex, String outputName) throws RegistryException {
         Session session=null;
         Map<String,String> workflowStatusMap = new HashMap<String, String>();
         try {
             session = getSession();
             List<String> matchingExperimentIds = getMatchingExperimentIds(regex, session);
             for(String experimentId:matchingExperimentIds){
-                String workflowOutputData = getWorkflowOutputData(experimentId,outputName);
+                String workflowOutputData = getWorkflowExecutionOutput(experimentId,outputName);
                 workflowStatusMap.put(experimentId,workflowOutputData);
             }
 		} catch (RepositoryException e) {
@@ -1049,14 +1038,14 @@ public class AiravataJCRRegistry extends
         return workflowStatusMap;
     }
 
-    public Map<String, String[]> getWorkflowOutputNamesWithRegex(String regex) throws RegistryException {
+    public Map<String, String[]> getWorkflowExecutionOutputNamesWithRegex(String regex) throws RegistryException {
         Session session = null;
       Map<String,String[]> workflowStatusMap = new HashMap<String, String[]>();
         try {
             session = getSession();
             List<String> matchingExperimentIds = getMatchingExperimentIds(regex, session);
             for(String experimentId:matchingExperimentIds){
-                String[] workflowOutputData = getWorkflowOutputNames(experimentId);
+                String[] workflowOutputData = getWorkflowExecutionOutputNames(experimentId);
                 workflowStatusMap.put(experimentId,workflowOutputData);
             }
 		} catch (RepositoryException e) {
@@ -1067,4 +1056,9 @@ public class AiravataJCRRegistry extends
         }
         return workflowStatusMap;
     }
+
+	public boolean saveWorkflowExecutionUser(String experimentId, String user)
+			throws RegistryException {
+		return false;
+	}
 }

Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/GFacService.java Fri Jan 20 19:25:19 2012
@@ -35,6 +35,7 @@ import javax.jcr.Repository;
 import javax.jcr.RepositoryFactory;
 import javax.jcr.SimpleCredentials;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.registry.api.impl.AiravataJCRRegistry;
 import org.apache.airavata.services.gfac.axis2.dispatchers.GFacURIBasedDispatcher;
@@ -145,13 +146,17 @@ public class GFacService implements Serv
     public void shutDown(ConfigurationContext configctx, AxisService service) {
         AiravataRegistry registry = (AiravataJCRRegistry) configctx.getProperty(CONFIGURATION_CONTEXT_REGISTRY);
         String gfacURL = (String) configctx.getProperty(GFAC_URL);
-        registry.deleteGFacDescriptor(gfacURL);
-        thread.interrupt();
         try {
-            thread.join();
-        } catch (InterruptedException e) {
-            log.info("GFacURL update thread is interrupted");
-        }
+			registry.deleteGFacDescriptor(gfacURL);
+			thread.interrupt();
+			try {
+			    thread.join();
+			} catch (InterruptedException e) {
+			    log.info("GFacURL update thread is interrupted");
+			}
+		} catch (RegistryException e) {
+			log.error("Error while shutting down!!!", e);
+		}
     }
 
     class GFacThread extends Thread {
@@ -172,7 +177,9 @@ public class GFacService implements Serv
                 }
             } catch (InterruptedException e) {
                 log.info("GFacURL update thread is interrupted");
-            }
+            } catch (RegistryException e) {
+				log.error("Error saving GFac descriptor",e);			
+			}
         }
     }
 }

Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/java/org/apache/airavata/services/gfac/axis2/reciever/GFacMessageReciever.java Fri Jan 20 19:25:19 2012
@@ -493,6 +493,10 @@ public class GFacMessageReciever impleme
 		} catch (RegistryException e) {
 			//TODO this scenario occur if the service is not present in the registry.
 			//someone should handle this 
+		} catch (Exception e) {
+			//TODO this scenario occur if something something something.
+			//someone should handle this 
+			e.printStackTrace();
 		}
         XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(WSDL));
         StAXOMBuilder builder = new StAXOMBuilder(reader);

Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/OutputRegister.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/OutputRegister.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/OutputRegister.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/extension/post/OutputRegister.java Fri Jan 20 19:25:19 2012
@@ -25,6 +25,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.commons.gfac.type.ActualParameter;
 import org.apache.airavata.core.gfac.context.invocation.InvocationContext;
 import org.apache.airavata.core.gfac.context.message.MessageContext;
@@ -64,7 +65,11 @@ public class OutputRegister extends Post
             }
 
             if (registry != null && DataRegistry.class.isAssignableFrom(registry.getClass())) {
-                ((DataRegistry) registry).saveOutput(workflowId, outputs);
+                try {
+					((DataRegistry) registry).saveOutput(workflowId, outputs);
+				} catch (RegistryException e) {
+					log.error(e.getLocalizedMessage(), e);
+				}
             } else {
                 log.debug("Registry does not support for Data Catalog, CLass: " + registry.getClass());
             }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java Fri Jan 20 19:25:19 2012
@@ -793,7 +793,7 @@ public class XBayaConfiguration extends 
         this.registryPassphrase = registryPassphrase;
     }
 
-    public String getRegigstryUserName() {
+    public String getRegistryUserName() {
         return regigstryUserName;
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionDialog.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ApplicationDescriptionDialog.java Fri Jan 20 19:25:19 2012
@@ -535,17 +535,21 @@ public class ApplicationDescriptionDialo
     }
 
     public void saveApplicationDescription() {
-        getRegistry().saveDeploymentDescription(getServiceName(), getHostName(), getShellApplicationDescription());
-        if (!isNewDescritor() && (!getServiceName().equals(getOriginalService()) || !getHostName().equals(getOriginalHost()))) {
-			try {
-				getRegistry().deleteDeploymentDescription(getOriginalService(),
-						getOriginalHost(),getOriginalDeploymentDescription().getType()
-						.getApplicationName().getStringValue());
-			} catch (RegistryException e) {
-				engine.getErrorWindow().error(e);
+        try {
+			getRegistry().saveDeploymentDescription(getServiceName(), getHostName(), getShellApplicationDescription());
+			if (!isNewDescritor() && (!getServiceName().equals(getOriginalService()) || !getHostName().equals(getOriginalHost()))) {
+				try {
+					getRegistry().deleteDeploymentDescription(getOriginalService(),
+							getOriginalHost(),getOriginalDeploymentDescription().getType()
+							.getApplicationName().getStringValue());
+				} catch (RegistryException e) {
+					engine.getErrorWindow().error(e);
+				}
 			}
-		}
-		setApplicationDescCreated(true);
+			setApplicationDescCreated(true);
+		} catch (RegistryException e) {
+			engine.getErrorWindow().error(e);
+		}
     }
 
     public boolean isApplicationDescCreated() {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/HostDescriptionDialog.java Fri Jan 20 19:25:19 2012
@@ -80,6 +80,8 @@ public class HostDescriptionDialog exten
     
     private HostDescription originalHostDescription;
     
+    private XBayaEngine engine;
+    
     public HostDescriptionDialog(XBayaEngine engine) {
     	this(engine,true,null);
     }
@@ -89,6 +91,7 @@ public class HostDescriptionDialog exten
      */
     public HostDescriptionDialog(XBayaEngine engine, boolean newHost, HostDescription originalHostDescription) {
         setNewHost(newHost);
+        setEngine(engine);
         setOriginalHostDescription(originalHostDescription);
         addWindowListener(new WindowAdapter() {
             @Override
@@ -363,8 +366,12 @@ public class HostDescriptionDialog exten
 
     public void saveHostDescription() {
         HostDescription desc = getHostDescription();
-		getRegistry().saveHostDescription(desc);
-        setHostCreated(true);
+		try {
+			getRegistry().saveHostDescription(desc);
+			setHostCreated(true);
+		} catch (RegistryException e) {
+			getEngine().getErrorWindow().error(e);
+		}
     }
 
     public AiravataRegistry getRegistry() {
@@ -402,4 +409,12 @@ public class HostDescriptionDialog exten
 	public void setOriginalHostDescription(HostDescription originalHostDescription) {
 		this.originalHostDescription = originalHostDescription;
 	}
+
+	public XBayaEngine getEngine() {
+		return engine;
+	}
+
+	public void setEngine(XBayaEngine engine) {
+		this.engine = engine;
+	}
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/ServiceDescriptionDialog.java Fri Jan 20 19:25:19 2012
@@ -43,6 +43,7 @@ import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
@@ -450,8 +451,13 @@ public class ServiceDescriptionDialog ex
         getServiceDescriptionType().setInputParametersArray(inputParameters.toArray(new InputParameterType[] {}));
         getServiceDescriptionType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[] {}));
 
-        getRegistry().saveServiceDescription(getServiceDescription());
-        setServiceCreated(true);
+        try {
+			getRegistry().saveServiceDescription(getServiceDescription());
+	        setServiceCreated(true);
+		} catch (RegistryException e) {
+			e.printStackTrace();
+			setError(e.getMessage());
+		}
     }
 
     public void close() {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/clients/XBayaClient.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/clients/XBayaClient.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/clients/XBayaClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/clients/XBayaClient.java Fri Jan 20 19:25:19 2012
@@ -20,34 +20,44 @@
 */
 package org.apache.airavata.xbaya.clients;
 
-import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.component.ws.WSComponentPort;
-import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.impl.NodeImpl;
-import org.apache.airavata.xbaya.graph.system.InputNode;
-import org.apache.airavata.xbaya.interpretor.NameValue;
-import org.apache.airavata.xbaya.interpretor.WorkflowInterpretorStub;
-import org.apache.airavata.xbaya.wf.Workflow;
-import org.apache.axis2.AxisFault;
-import xsul5.MLogger;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
 import java.rmi.RemoteException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
 
+import javax.jcr.RepositoryException;
+
+import org.apache.airavata.common.registry.api.exception.RegistryException;
+import org.apache.airavata.registry.api.AiravataRegistry;
+import org.apache.airavata.registry.api.impl.AiravataJCRRegistry;
+import org.apache.airavata.xbaya.component.ComponentException;
+import org.apache.airavata.xbaya.component.ws.WSComponentPort;
+import org.apache.airavata.xbaya.graph.GraphException;
+import org.apache.airavata.xbaya.graph.impl.NodeImpl;
+import org.apache.airavata.xbaya.graph.system.InputNode;
+import org.apache.airavata.xbaya.interpretor.NameValue;
+import org.apache.airavata.xbaya.interpretor.WorkflowInterpretorStub;
+import org.apache.airavata.xbaya.wf.Workflow;
+import org.apache.axis2.AxisFault;
+
+import xsul5.MLogger;
+
 
 public class XBayaClient {
     private static final MLogger log = MLogger.getLogger();
 
     public static final String GFAC = "gfac";
+    public static final String JCR = "jcr";
     public static final String PROXYSERVER = "proxyserver";
     public static final String MSGBOX = "msgbox";
     public static final String BROKER = "broker";
@@ -55,15 +65,24 @@ public class XBayaClient {
     public static final String DEFAULT_MYPROXY_SERVER = "myproxy.url";
     public static final String DEFAULT_MESSAGE_BOX_URL = "messagebox.url";
     public static final String DEFAULT_BROKER_URL = "messagebroker.url";
+    public static final String DEFAULT_JCR_URL = "jcr.url";
+    public static final String JCR_USERNAME = "jcr.username";
+    public static final String JCR_PASSWORD= "jcr.password";
     public static final String MYPROXYUSERNAME = "myproxy.username";
     public static final String MYPROXYPASS = "myproxy.password";
     public static final String WORKFLOWSERVICEURL = "xbaya.service.url";
+    private XBayaClientConfiguration clientConfiguration;
     private static String workflow = "";
 
-    private NameValue[] configurations = new NameValue[7];
+    private AiravataRegistry registry;
 
-    public XBayaClient(NameValue[] configuration) {
+	private NameValue[] configurations=new NameValue[10];
+    
+//    private NameValue[] configurations = new NameValue[7];
+
+    public XBayaClient(NameValue[] configuration) throws MalformedURLException {
         configurations = configuration;
+        updateClientConfiguration(configurations);
     }
 
     public XBayaClient(String fileName) throws IOException {
@@ -74,11 +93,11 @@ public class XBayaClient {
         configurations[0] = new NameValue();
         configurations[0].setName(GFAC);
         configurations[0].setValue(properties.getProperty(DEFAULT_GFAC_URL));
-
+        
         configurations[1] = new NameValue();
         configurations[1].setName(PROXYSERVER);
         configurations[1].setValue(properties.getProperty(DEFAULT_MYPROXY_SERVER));
-
+        
         configurations[2] = new NameValue();
         configurations[2].setName(MSGBOX);
         configurations[2].setValue(properties.getProperty(DEFAULT_MESSAGE_BOX_URL));
@@ -98,9 +117,59 @@ public class XBayaClient {
         configurations[6] = new NameValue();
         configurations[6].setName(WORKFLOWSERVICEURL);
         configurations[6].setValue(properties.getProperty(WORKFLOWSERVICEURL));
+        
+        configurations[7] = new NameValue();
+        configurations[7].setName(JCR);
+        configurations[7].setValue(properties.getProperty(DEFAULT_JCR_URL));
+        
+        configurations[8] = new NameValue();
+        configurations[8].setName(JCR_USERNAME);
+        configurations[9].setValue(properties.getProperty(JCR_USERNAME));
+        
+        configurations[10] = new NameValue();
+        configurations[10].setName(JCR_PASSWORD);
+        configurations[10].setValue(properties.getProperty(JCR_PASSWORD));
+        
+        updateClientConfiguration(configurations);
 
     }
 
+    private void updateClientConfiguration(NameValue[] configurations) throws MalformedURLException {
+		XBayaClientConfiguration clientConfiguration = getClientConfiguration();
+    	for (NameValue configuration : configurations) {
+			if (configuration.getName().equals(GFAC)){
+    			clientConfiguration.setJcrURL(new URL(configuration.getValue()));
+    		}
+    		if (configuration.getName().equals(PROXYSERVER)){
+    			clientConfiguration.setMyproxyHost(configuration.getValue());
+    		}
+    		if (configuration.getName().equals(MSGBOX)){
+    			clientConfiguration.setMessageboxURL(new URL(configuration.getValue()));
+    		}
+    		if (configuration.getName().equals(BROKER)){
+    			clientConfiguration.setMessagebrokerURL(new URL(configuration.getValue()));
+    		}
+    		if (configuration.getName().equals(MYPROXYUSERNAME)){
+    			clientConfiguration.setMyproxyUsername(configuration.getValue());
+    		}
+    		if (configuration.getName().equals(MYPROXYPASS)){
+    			clientConfiguration.setMyproxyPassword(configuration.getValue());
+    		}
+    		if (configuration.getName().equals(WORKFLOWSERVICEURL)){
+    			clientConfiguration.setXbayaServiceURL(new URL(configuration.getValue()));
+    		}
+    		if (configuration.getName().equals(JCR)){
+    			clientConfiguration.setJcrURL(new URL(configuration.getValue()));
+    		}
+    		if (configuration.getName().equals(JCR_USERNAME)){
+    			clientConfiguration.setJcrUsername(configuration.getValue());
+    		}
+    		if (configuration.getName().equals(JCR_PASSWORD)){
+    			clientConfiguration.setJcrPassword(configuration.getValue());
+    		}
+    	}
+
+	}
     public void loadWorkflowFromaFile(String workflowFile)throws URISyntaxException,IOException {
 
         URL url = XBayaClient.class.getClassLoader().getResource(workflowFile);
@@ -172,8 +241,8 @@ public class XBayaClient {
     public String runWorkflow(String topic){
 		String worflowoutput= null;
 		try {
-			WorkflowInterpretorStub stub = new WorkflowInterpretorStub(configurations[4].getValue());
-		    worflowoutput = stub.launchWorkflow(workflow, topic, configurations[5].getValue(), configurations[6].getValue(), null,
+			WorkflowInterpretorStub stub = new WorkflowInterpretorStub(getClientConfiguration().getXbayaServiceURL().toString());
+		    worflowoutput = stub.launchWorkflow(workflow, topic, getClientConfiguration().getMyproxyPassword(),getClientConfiguration().getMyproxyUsername(), null,
 					configurations);
 		    log.info("Workflow output : " + worflowoutput);
 		} catch (AxisFault e) {
@@ -186,18 +255,19 @@ public class XBayaClient {
 		return worflowoutput;
 	}
 
-        public String runWorkflow(String topic, NameValue[] inputs){
+    public String runWorkflow(String topic, NameValue[] inputs, String user){
 		String worflowoutput= null;
 		try {
-			WorkflowInterpretorStub stub = new WorkflowInterpretorStub(configurations[6].getValue());
-		    worflowoutput = stub.launchWorkflow(workflow, topic, configurations[5].getValue(), configurations[4].getValue(), inputs,
+			WorkflowInterpretorStub stub = new WorkflowInterpretorStub(getClientConfiguration().getXbayaServiceURL().toString());
+		    worflowoutput = stub.launchWorkflow(workflow, topic, getClientConfiguration().getMyproxyPassword(),getClientConfiguration().getMyproxyUsername(), inputs,
 					configurations);
+		    getRegistry().saveWorkflowExecutionUser(topic, user);
 		    log.info("Workflow output : " + worflowoutput);
 		} catch (AxisFault e) {
 			log.fine(e.getMessage(), e);
 		} catch (RemoteException e) {
 			log.fine(e.getMessage(), e);
-		} catch (IOException e) {
+		} catch (RegistryException e) {
 			log.fine(e.getMessage(), e);
 		}
 		return worflowoutput;
@@ -210,5 +280,29 @@ public class XBayaClient {
     public static void setWorkflow(String workflow) {
         XBayaClient.workflow = workflow;
     }
+
+	public AiravataRegistry getRegistry() {
+		if (registry==null){
+			try {
+				HashMap<String, String> map = new HashMap<String, String>();
+		        URI uri = getClientConfiguration().getJcrURL().toURI();
+				map.put("org.apache.jackrabbit.repository.uri", uri.toString());
+				registry=new AiravataJCRRegistry(uri, "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", getClientConfiguration().getJcrUsername(), getClientConfiguration().getJcrPassword(), map);
+			} catch (RepositoryException e) {
+				e.printStackTrace();
+			} catch (URISyntaxException e) {
+				e.printStackTrace();
+			}
+		}
+		return registry;
+	}
+
+	public XBayaClientConfiguration getClientConfiguration() {
+		if (clientConfiguration==null){
+			clientConfiguration=new XBayaClientConfiguration();
+		}
+		return clientConfiguration;
+	}
+
 }
 

Added: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/clients/XBayaClientConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/clients/XBayaClientConfiguration.java?rev=1234085&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/clients/XBayaClientConfiguration.java (added)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/clients/XBayaClientConfiguration.java Fri Jan 20 19:25:19 2012
@@ -0,0 +1,113 @@
+/*
+ *
+ * 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.xbaya.clients;
+
+import java.net.URL;
+
+public class XBayaClientConfiguration {
+	private URL gfacURL;
+	private URL xregistryURL;
+	private String myproxyHost="myproxy.teragrid.org";
+	private URL messageboxURL;
+	private URL messagebrokerURL;
+	private String myproxyUsername="ogce";
+	private String myproxyPassword="testpassword";
+	private URL xbayaServiceURL;
+	private URL jcrURL;
+	private String jcrUsername="admin";
+	private String jcrPassword="admin";
+	private String echoMessage="Hello World";
+	
+	public URL getGfacURL() {
+		return gfacURL;
+	}
+	public void setGfacURL(URL gfacURL) {
+		this.gfacURL = gfacURL;
+	}
+	public URL getXregistryURL() {
+		return xregistryURL;
+	}
+	public void setXregistryURL(URL xregistryURL) {
+		this.xregistryURL = xregistryURL;
+	}
+	public String getMyproxyHost() {
+		return myproxyHost;
+	}
+	public void setMyproxyHost(String myproxyHost) {
+		this.myproxyHost = myproxyHost;
+	}
+	public URL getMessageboxURL() {
+		return messageboxURL;
+	}
+	public void setMessageboxURL(URL messageboxURL) {
+		this.messageboxURL = messageboxURL;
+	}
+	public URL getMessagebrokerURL() {
+		return messagebrokerURL;
+	}
+	public void setMessagebrokerURL(URL messagebrokerURL) {
+		this.messagebrokerURL = messagebrokerURL;
+	}
+	public String getMyproxyUsername() {
+		return myproxyUsername;
+	}
+	public void setMyproxyUsername(String myproxyUsername) {
+		this.myproxyUsername = myproxyUsername;
+	}
+	public String getMyproxyPassword() {
+		return myproxyPassword;
+	}
+	public void setMyproxyPassword(String myproxyPassword) {
+		this.myproxyPassword = myproxyPassword;
+	}
+	public URL getXbayaServiceURL() {
+		return xbayaServiceURL;
+	}
+	public void setXbayaServiceURL(URL xbayaServiceURL) {
+		this.xbayaServiceURL = xbayaServiceURL;
+	}
+	public URL getJcrURL() {
+		return jcrURL;
+	}
+	public void setJcrURL(URL jcrURL) {
+		this.jcrURL = jcrURL;
+	}
+	public String getJcrUsername() {
+		return jcrUsername;
+	}
+	public void setJcrUsername(String jcrUsername) {
+		this.jcrUsername = jcrUsername;
+	}
+	public String getJcrPassword() {
+		return jcrPassword;
+	}
+	public void setJcrPassword(String jcrPassword) {
+		this.jcrPassword = jcrPassword;
+	}
+	public String getEchoMessage() {
+		return echoMessage;
+	}
+	public void setEchoMessage(String echoMessage) {
+		this.echoMessage = echoMessage;
+	}
+	
+}

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java Fri Jan 20 19:25:19 2012
@@ -85,7 +85,9 @@ public class JCRComponentRegistry extend
             }
         } catch (RegistryException e) {
             log.error(e.getMessage(), e);
-        }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+		}
 
         return tree;
     }
@@ -98,21 +100,17 @@ public class JCRComponentRegistry extend
         return NAME;
     }
 
-    public List<String> getGFacURLList() {
-        return this.registry.getGFacDescriptorList();
-    }
-
     public UserManager getUserManager() {
         return registry.getUserManager();
     }
 
-    public String saveDeploymentDescription(String service, String host, ApplicationDeploymentDescription app) {
-        // deploy the service on host
-        registry.deployServiceOnHost(service, host);
-
-        // save deployment description
-        return registry.saveDeploymentDescription(service, host, app);
-    }
+//    public String saveDeploymentDescription(String service, String host, ApplicationDeploymentDescription app) {
+//        // deploy the service on host
+//        registry.deployServiceOnHost(service, host);
+//
+//        // save deployment description
+//        return registry.saveDeploymentDescription(service, host, app);
+//    }
 
     public AiravataRegistry getRegistry() {
         return registry;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java Fri Jan 20 19:25:19 2012
@@ -24,15 +24,14 @@ package org.apache.airavata.xbaya.experi
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 
-import javax.jcr.RepositoryException;
 import javax.swing.AbstractAction;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.XBayaRuntimeException;
 import org.apache.airavata.xbaya.component.gui.JCRRegistryWindow;
-import org.apache.airavata.xbaya.ode.ODEDeploymentDescriptor;
 import org.apache.airavata.xbaya.registry.RegistryAccesser;
 
 public class ExperimentMenu {
@@ -104,7 +103,7 @@ public class ExperimentMenu {
                 try {
                     ExperimentMenu.this.registryAccesser.deleteOGCEWorkflow(ExperimentMenu.this.engine.getWorkflow()
                             .getQname());
-                } catch (RepositoryException e1) {
+                } catch (RegistryException e1) {
                     throw new XBayaRuntimeException(e1);
                 }
             }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java Fri Jan 20 19:25:19 2012
@@ -39,15 +39,16 @@ import javax.swing.border.EtchedBorder;
 import javax.swing.border.TitledBorder;
 import javax.xml.namespace.QName;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.graph.gui.GraphCanvas;
 import org.apache.airavata.xbaya.gui.ErrorMessages;
 import org.apache.airavata.xbaya.gui.GridPanel;
 import org.apache.airavata.xbaya.gui.XBayaDialog;
 import org.apache.airavata.xbaya.gui.XbayaEnhancedList;
+import org.apache.airavata.xbaya.registry.RegistryAccesser;
 import org.apache.airavata.xbaya.util.XBayaUtil;
 import org.apache.airavata.xbaya.wf.Workflow;
-import org.apache.airavata.xbaya.registry.RegistryAccesser;
 
 public class RegistryLoaderWindow {
 
@@ -131,7 +132,7 @@ public class RegistryLoaderWindow {
                 } catch (Error e) {
                     RegistryLoaderWindow.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
                     hide();
-                } catch (RepositoryException e) {
+                } catch (RegistryException e) {
                     RegistryLoaderWindow.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
                     hide();
                 }
@@ -170,7 +171,7 @@ public class RegistryLoaderWindow {
         for (RegistrySearchResult i : this.list.getSelectedValues()) {
             try {
                 registryAccesser.deleteOGCEWorkflow(i.getResourceId());
-            } catch (RepositoryException e) {
+            } catch (RegistryException e) {
                 e.printStackTrace();
             }
         }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java Fri Jan 20 19:25:19 2012
@@ -338,7 +338,7 @@ public class WorkflowInterpreterLaunchWi
                         inputNameVals[i].setValue(value);
                     }
 
-                    String myProxyUsername = engine.getConfiguration().getRegigstryUserName();
+                    String myProxyUsername = engine.getConfiguration().getRegistryUserName();
                     String myProxyPass = engine.getConfiguration().getRegistryPassphrase();
 
                     stub.launchWorkflow(workflow.toXMLText(), topicString, myProxyPass, myProxyUsername, inputNameVals,

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java Fri Jan 20 19:25:19 2012
@@ -21,6 +21,7 @@
 
 package org.apache.airavata.xbaya.graph.dynamic.gui;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.xbaya.XBayaEngine;
@@ -97,7 +98,12 @@ public class DynamicWorkflowRunnerWindow
      */
     public void show() {
         this.workflow = this.engine.getWorkflow();
-        List<String> urlList = this.engine.getConfiguration().getJcrComponentRegistry().getGFacURLList();
+        List<String> urlList=null;
+		try {
+			urlList = this.engine.getConfiguration().getJcrComponentRegistry().getRegistry().getGFacDescriptorList();
+		} catch (RegistryException e) {
+			engine.getErrorWindow().error(e);
+		}
         // When run xbaya continously urls can be repeating, so first remove everything and then add
         this.gfacUrlListField.removeAllItems();
         for (String gfacUrl : urlList) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Fri Jan 20 19:25:19 2012
@@ -21,6 +21,25 @@
 
 package org.apache.airavata.xbaya.interpretor;
 
+import java.awt.Color;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.xml.namespace.QName;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+
 import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.Pair;
 import org.apache.airavata.common.utils.WSDLUtil;
@@ -36,7 +55,15 @@ import org.apache.airavata.xbaya.compone
 import org.apache.airavata.xbaya.component.amazon.TerminateInstanceComponent;
 import org.apache.airavata.xbaya.component.dynamic.DynamicComponent;
 import org.apache.airavata.xbaya.component.dynamic.DynamicInvoker;
-import org.apache.airavata.xbaya.component.system.*;
+import org.apache.airavata.xbaya.component.system.ConstantComponent;
+import org.apache.airavata.xbaya.component.system.EndForEachComponent;
+import org.apache.airavata.xbaya.component.system.EndifComponent;
+import org.apache.airavata.xbaya.component.system.ForEachComponent;
+import org.apache.airavata.xbaya.component.system.IfComponent;
+import org.apache.airavata.xbaya.component.system.InputComponent;
+import org.apache.airavata.xbaya.component.system.MemoComponent;
+import org.apache.airavata.xbaya.component.system.OutputComponent;
+import org.apache.airavata.xbaya.component.system.S3InputComponent;
 import org.apache.airavata.xbaya.component.ws.WSComponent;
 import org.apache.airavata.xbaya.component.ws.WSComponentPort;
 import org.apache.airavata.xbaya.concurrent.PredicatedTaskRunner;
@@ -51,7 +78,13 @@ import org.apache.airavata.xbaya.graph.i
 import org.apache.airavata.xbaya.graph.impl.NodeImpl;
 import org.apache.airavata.xbaya.graph.subworkflow.SubWorkflowNode;
 import org.apache.airavata.xbaya.graph.subworkflow.SubWorkflowNodeGUI;
-import org.apache.airavata.xbaya.graph.system.*;
+import org.apache.airavata.xbaya.graph.system.ConstantNode;
+import org.apache.airavata.xbaya.graph.system.EndForEachNode;
+import org.apache.airavata.xbaya.graph.system.EndifNode;
+import org.apache.airavata.xbaya.graph.system.ForEachNode;
+import org.apache.airavata.xbaya.graph.system.IfNode;
+import org.apache.airavata.xbaya.graph.system.InputNode;
+import org.apache.airavata.xbaya.graph.system.OutputNode;
 import org.apache.airavata.xbaya.graph.ws.WSNode;
 import org.apache.airavata.xbaya.graph.ws.WSPort;
 import org.apache.airavata.xbaya.gui.Cancelable;
@@ -78,25 +111,13 @@ import org.apache.airavata.xbaya.wf.Work
 import org.ietf.jgss.GSSCredential;
 import org.xmlpull.infoset.XmlElement;
 import org.xmlpull.infoset.impl.XmlElementWithViewsImpl;
+
 import xsul.lead.LeadContextHeader;
 import xsul.lead.LeadResourceMapping;
 import xsul5.XmlConstants;
 import xsul5.wsdl.WsdlPort;
 import xsul5.wsdl.WsdlService;
 
-import javax.xml.namespace.QName;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-import java.awt.*;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.*;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
 public class WorkflowInterpreter {
 
 	private static final int GUI_MODE = 1;
@@ -252,8 +273,11 @@ public class WorkflowInterpreter {
 
 			this.getWorkflow().setExecutionState(XBayaExecutionState.RUNNING);
             if(actOnProvenance){
-                this.configuration.getJcrComponentRegistry().getRegistry().saveWorkflowStatus(this.topic, WORKFLOW_STARTED);
-//                System.out.println(this.configuration.getJcrComponentRegistry().getRegistry().getWorkflowStatus(this.topic));
+                try {
+					this.configuration.getJcrComponentRegistry().getRegistry().saveWorkflowExecutionStatus(this.topic, WORKFLOW_STARTED);
+				} catch (RegistryException e) {
+					throw new XBayaException(e);
+				}
             }
 			ArrayList<Node> inputNodes = this.getInputNodesDynamically();
 			Object[] values = new Object[inputNodes.size()];
@@ -339,7 +363,15 @@ public class WorkflowInterpreter {
 
             if (getFailedNodeCountDynamically() == 0) {
                 if (actOnProvenance) {
-                    this.configuration.getJcrComponentRegistry().getRegistry().saveWorkflowStatus(this.topic, WORKFLOW_FINISHED);
+                    try {
+						try {
+							this.configuration.getJcrComponentRegistry().getRegistry().saveWorkflowExecutionStatus(this.topic, WORKFLOW_FINISHED);
+						} catch (Exception e) {
+							throw new XBayaException(e);
+						}
+					} catch (Exception e) {
+						throw new XBayaException(e);
+					}
 //                    System.out.println(this.configuration.getJcrComponentRegistry().getRegistry().getWorkflowStatus(this.topic));
                 }
             }
@@ -524,7 +556,7 @@ public class WorkflowInterpreter {
 					((OutputNode) node).setDescription(val.toString());
                      if(actOnProvenance){
                         try {
-                            this.configuration.getJcrComponentRegistry().getRegistry().saveWorkflowOutputData(this.topic,node.getName(),val.toString());
+                            this.configuration.getJcrComponentRegistry().getRegistry().saveWorkflowExecutionOutput(this.topic,node.getName(),val.toString());
                         } catch (RegistryException e) {
                             e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
                         }
@@ -571,7 +603,7 @@ public class WorkflowInterpreter {
 				if (node.getGUI().getBodyColor() != NodeState.FINISHED.color) {
                     if(actOnProvenance){
                         try {
-                            this.configuration.getJcrComponentRegistry().getRegistry().saveWorkflowOutputData(this.topic,node.getName(),val.toString());
+                            this.configuration.getJcrComponentRegistry().getRegistry().saveWorkflowExecutionOutput(this.topic,node.getName(),val.toString());
                         } catch (RegistryException e) {
                             e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
                         }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java Fri Jan 20 19:25:19 2012
@@ -24,6 +24,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.registry.api.workflow.WorkflowIOData;
@@ -172,9 +173,13 @@ public final class ProvenanceWrite imple
 
 			}
             if (inputs!=null) {
-				this.registry.saveWorkflowInput(new WorkflowIOData(
-						xsul5.XmlConstants.BUILDER.serializeToString(inputs),
-						experimentId, node.getID(), this.workflowName));
+				try {
+					this.registry.saveWorkflowExecutionServiceInput(new WorkflowIOData(
+							xsul5.XmlConstants.BUILDER.serializeToString(inputs),
+							experimentId, node.getID(), this.workflowName));
+				} catch (RegistryException e) {
+					throw new XBayaException(e);
+				}
 				// deal with the outputs
 			}
 			XmlElement outputs = elem.newElement("outputs");
@@ -200,7 +205,11 @@ public final class ProvenanceWrite imple
 					outputParamElement.addChild("null");
 				}
 			}
-            this.registry.saveWorkflowOutput(new WorkflowIOData(xsul5.XmlConstants.BUILDER.serializeToString(outputs), experimentId, node.getID(),this.workflowName));
+            try {
+				this.registry.saveWorkflowExecutionServiceOutput(new WorkflowIOData(xsul5.XmlConstants.BUILDER.serializeToString(outputs), experimentId, node.getID(),this.workflowName));
+            } catch (RegistryException e) {
+				throw new XBayaException(e);
+			}
 		}
 	}
 }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java Fri Jan 20 19:25:19 2012
@@ -29,6 +29,7 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.xml.namespace.QName;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.registry.api.AiravataRegistry;
@@ -77,9 +78,9 @@ public class RegistryAccesser {
      * @return
      * @throws RepositoryException
      */
-    public Map<QName, Node> getOGCEWorkflowTemplateList() throws RepositoryException {
+    public Map<QName, Node> getOGCEWorkflowTemplateList() throws RegistryException {
         AiravataRegistry registry = connectToRegistry();
-        return registry.getWorkflows(this.engine.getConfiguration().getRegigstryUserName());
+        return registry.getWorkflows(this.engine.getConfiguration().getRegistryUserName());
     }
 
     /**
@@ -94,7 +95,7 @@ public class RegistryAccesser {
     public Workflow getOGCEWorkflow(QName workflowTemplateId) throws RepositoryException, GraphException,
             ComponentException, Exception {
         AiravataRegistry registry = connectToRegistry();
-        Node node = registry.getWorkflow(workflowTemplateId, this.engine.getConfiguration().getRegigstryUserName());
+        Node node = registry.getWorkflow(workflowTemplateId, this.engine.getConfiguration().getRegistryUserName());
         XmlElement xwf = XMLUtil.stringToXmlElement(node.getProperty("workflow").getString());
         Workflow workflow = new Workflow(xwf);
         return workflow;
@@ -154,7 +155,7 @@ public class RegistryAccesser {
                 // client.removeResource(workflowQName);
                 // }
                 String workflowAsString = XMLUtil.xmlElementToString(workflow.toXML());
-                String owner = this.engine.getConfiguration().getRegigstryUserName();
+                String owner = this.engine.getConfiguration().getRegistryUserName();
 
                 AiravataRegistry registry = this.connectToRegistry();
                 boolean result = registry.saveWorkflow(workflowQName, workflow.getName(), workflow.getDescription(), workflowAsString,
@@ -173,10 +174,10 @@ public class RegistryAccesser {
      * @param workflowTemplateId
      * @throws RepositoryException
      */
-    public void deleteOGCEWorkflow(QName workflowTemplateId) throws RepositoryException {
+    public void deleteOGCEWorkflow(QName workflowTemplateId) throws RegistryException {
         if (XBayaUtil.acquireJCRRegistry(this.engine)) {
             AiravataRegistry registry = connectToRegistry();
-            registry.deleteWorkflow(workflowTemplateId, this.engine.getConfiguration().getRegigstryUserName());
+            registry.deleteWorkflow(workflowTemplateId, this.engine.getConfiguration().getRegistryUserName());
         }
     }
 
@@ -185,9 +186,9 @@ public class RegistryAccesser {
      * @param qname
      * @return
      */
-    public Workflow getWorkflow(QName qname) {
+    public Workflow getWorkflow(QName qname) throws RegistryException {
         AiravataRegistry registry = connectToRegistry();
-        Node node = registry.getWorkflow(qname, this.engine.getConfiguration().getRegigstryUserName());
+        Node node = registry.getWorkflow(qname, this.engine.getConfiguration().getRegistryUserName());
         Workflow workflow = null;
         try {
             XmlElement xwf = XMLUtil.stringToXmlElement(node.getProperty("workflow").getString());
@@ -206,8 +207,9 @@ public class RegistryAccesser {
      * 
      * @param name
      * @return
+     * @throws RegistryException 
      */
-    public Workflow getWorkflow(String name) {
+    public Workflow getWorkflow(String name) throws RegistryException {
         return getWorkflow(new QName(XBayaConstants.LEAD_NS, name));
     }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/GFacURLs.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/GFacURLs.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/GFacURLs.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/GFacURLs.java Fri Jan 20 19:25:19 2012
@@ -26,6 +26,7 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.AiravataRegistry;
 
 public class GFacURLs {
@@ -45,15 +46,19 @@ public class GFacURLs {
 
     public List<GFacURL> getURLS() {
         List<GFacURL> urls = new ArrayList<GFacURL>();
-        List<String> gfacDescriptorList = getRegistry().getGFacDescriptorList();
-        for (String urlString : gfacDescriptorList) {
-            try {
-                urls.add(new GFacURL(getRegistry(), new URL(urlString)));
-            } catch (MalformedURLException e) {
-                // practically speaking this exception should not be possible. just in case,
-                e.printStackTrace();
-            }
-        }
+        try {
+			List<String> gfacDescriptorList = getRegistry().getGFacDescriptorList();
+			for (String urlString : gfacDescriptorList) {
+			    try {
+			        urls.add(new GFacURL(getRegistry(), new URL(urlString)));
+			    } catch (MalformedURLException e) {
+			        // practically speaking this exception should not be possible. just in case,
+			        e.printStackTrace();
+			    }
+			}
+		} catch (RegistryException e) {
+			e.printStackTrace();
+		}
         return urls;
     }
 }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowExperiments.java Fri Jan 20 19:25:19 2012
@@ -30,6 +30,7 @@ import java.util.Map;
 
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.registry.api.workflow.WorkflowIOData;
 import org.apache.airavata.schemas.gfac.Parameter;
@@ -48,10 +49,14 @@ public class XBayaWorkflowExperiments {
 	
 	public List<XBayaWorkflowExperiment> getAllExperiments(){
 		Map<String, XBayaWorkflowExperiment> experiments=new HashMap<String,XBayaWorkflowExperiment>();
-    	List<WorkflowIOData> workflowInput = getRegistry().searchWorkflowInput(null, null, null);
-    	List<WorkflowIOData> workflowOutput = getRegistry().searchWorkflowOutput(null, null, null);
-    	createChildren(experiments, workflowInput, true);
-    	createChildren(experiments, workflowOutput, false);
+    	try {
+			List<WorkflowIOData> workflowInput = getRegistry().searchWorkflowExecutionServiceInput(null, null, null);
+			List<WorkflowIOData> workflowOutput = getRegistry().searchWorkflowExecutionServiceOutput(null, null, null);
+			createChildren(experiments, workflowInput, true);
+			createChildren(experiments, workflowOutput, false);
+		} catch (RegistryException e) {
+			e.printStackTrace();
+		}
     	return Arrays.asList(experiments.values().toArray(new XBayaWorkflowExperiment[]{}));
 	}
 	private void createChildren(

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowTemplates.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowTemplates.java?rev=1234085&r1=1234084&r2=1234085&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowTemplates.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/model/XBayaWorkflowTemplates.java Fri Jan 20 19:25:19 2012
@@ -28,6 +28,7 @@ import java.util.Map;
 import javax.jcr.Node;
 import javax.xml.namespace.QName;
 
+import org.apache.airavata.common.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.AiravataRegistry;
 
 public class XBayaWorkflowTemplates {
@@ -47,10 +48,14 @@ public class XBayaWorkflowTemplates {
 
     public List<XBayaWorkflowTemplate> getWorkflows() {
         List<XBayaWorkflowTemplate> workflows = new ArrayList<XBayaWorkflowTemplate>();
-        Map<QName, Node> workflowMap = registry.getWorkflows(registry.getUsername());
-        for (Node xBayaWorkflowNode : workflowMap.values()) {
-            workflows.add(new XBayaWorkflowTemplate(xBayaWorkflowNode));
-        }
+        try {
+			Map<QName, Node> workflowMap = registry.getWorkflows(registry.getUsername());
+			for (Node xBayaWorkflowNode : workflowMap.values()) {
+			    workflows.add(new XBayaWorkflowTemplate(xBayaWorkflowNode));
+			}
+		} catch (RegistryException e) {
+			e.printStackTrace();
+		}
         return workflows;
     }
 }



Mime
View raw message