airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [1/3] airavata git commit: registry refactoring and fixing usages
Date Fri, 05 Jun 2015 19:08:14 GMT
Repository: airavata
Updated Branches:
  refs/heads/master bad2c1c0a -> 8ebff8604


http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/util/XBayaUtil.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/util/XBayaUtil.java
b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/util/XBayaUtil.java
index 994684b..7aaac5d 100644
--- a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/util/XBayaUtil.java
+++ b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/util/XBayaUtil.java
@@ -199,12 +199,12 @@ public class XBayaUtil {
 		return parameters;
 	}*/
 
-//    public static AiravataRegistry2 getRegistry(URL url) throws IOException, RepositoryException,
URISyntaxException {
+//    public static AiravataRegistry2 getExperimentCatalog(URL url) throws IOException, RepositoryException,
URISyntaxException {
 //        Properties properties = new Properties();
 //        properties.load(url.openStream());
 //        JCRComponentRegistry jcrComponentRegistry = new JCRComponentRegistry(new URI((String)
properties.get(JCR_URL)),
 //                (String) properties.get(JCR_USER),(String) properties.get(JCR_PASS));
-//        return jcrComponentRegistry.getRegistry();
+//        return jcrComponentRegistry.getExperimentCatalog();
 //    }
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
b/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
index a096071..4829ebd 100644
--- a/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
+++ b/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
@@ -59,7 +59,7 @@
 //        Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 ////        ((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
 //        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getExperimentCatalog();
 ////		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,null,null,true);
 //        WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
 //                UUID.randomUUID().toString(), conf.getMessageBoxURL(), conf.getBrokerURL(),
conf.getAiravataAPI(), conf,null,null,true);

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
b/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
index dd7d184..6431f02 100644
--- a/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
+++ b/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
@@ -59,7 +59,7 @@
 //        URL systemResource = this.getClass().getClassLoader().getSystemResource("ComplexMath.xwf");
 //        Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 //        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getExperimentCatalog();
 ////		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,true);
 //		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
 //                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(),
conf.getAiravataAPI(), conf, null,null,true);

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
b/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
index 6971e8a..72173f2 100644
--- a/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
+++ b/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
@@ -59,7 +59,7 @@
 //        URL systemResource = this.getClass().getClassLoader().getSystemResource("LevenshteinDistance.xwf");
 //        Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 //        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getExperimentCatalog();
 ////		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,true);
 //		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
 //                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(),
conf.getAiravataAPI(), conf, null,null,true);

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
b/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
index 85fcc22..aef535e 100644
--- a/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
+++ b/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
@@ -60,7 +60,7 @@
 //        Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 //        ((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
 //        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getExperimentCatalog();
 ////		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,true);
 //		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
 //                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(),
conf.getAiravataAPI(), conf, null,null,true);

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
b/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
index dbe8cae..d48a6fe 100644
--- a/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
+++ b/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
@@ -58,7 +58,7 @@
 //        URL systemResource = this.getClass().getClassLoader().getSystemResource("SimpleForEach.xwf");
 //        Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 //        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getExperimentCatalog();
 ////		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,true);
 //		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
 //                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(),
conf.getAiravataAPI(), conf, null,null,true);

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
b/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
index fcfc44f..835a61f 100644
--- a/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
+++ b/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
@@ -59,7 +59,7 @@
 //        URL systemResource = this.getClass().getClassLoader().getSystemResource("SimpleMath.xwf");
 //        Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 //        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getExperimentCatalog();
 ////		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,true);
 //		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
 //                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(),
conf.getAiravataAPI(), conf, null,null,true);

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
b/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
index 7b016cd..d4ffcf7 100644
--- a/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
+++ b/modules/workflow-model/workflow-engine/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
@@ -61,7 +61,7 @@
 //        Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 //        ((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
 //        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getExperimentCatalog();
 ////		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,true);
 //		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
 //                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(),
conf.getAiravataAPI(), conf, null,null,true);

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow/workflow-core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/pom.xml b/modules/workflow/workflow-core/pom.xml
index 80fa76d..2aad114 100644
--- a/modules/workflow/workflow-core/pom.xml
+++ b/modules/workflow/workflow-core/pom.xml
@@ -39,12 +39,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>app-catalog-data</artifactId>
+            <artifactId>airavata-registry-data</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>app-catalog-cpi</artifactId>
+            <artifactId>airavata-registry-cpi</artifactId>
             <version>${project.version}</version>
         </dependency>
         <!-- Messaging dependency -->

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/SimpleWorkflowInterpreter.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/SimpleWorkflowInterpreter.java
b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/SimpleWorkflowInterpreter.java
index a2befd5..71b6e14 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/SimpleWorkflowInterpreter.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/SimpleWorkflowInterpreter.java
@@ -21,8 +21,6 @@
 
 package org.apache.airavata.workflow.core;
 
-import org.airavata.appcatalog.cpi.AppCatalogException;
-import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory;
 import org.apache.airavata.common.exception.AiravataException;
 import org.apache.airavata.common.utils.AiravataUtils;
 import org.apache.airavata.messaging.core.MessageContext;
@@ -43,10 +41,7 @@ import org.apache.airavata.model.workspace.experiment.WorkflowNodeDetails;
 import org.apache.airavata.model.workspace.experiment.WorkflowNodeState;
 import org.apache.airavata.model.workspace.experiment.WorkflowNodeStatus;
 import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory;
-import org.apache.airavata.registry.cpi.ChildDataType;
-import org.apache.airavata.registry.cpi.Registry;
-import org.apache.airavata.registry.cpi.RegistryException;
-import org.apache.airavata.registry.cpi.RegistryModelType;
+import org.apache.airavata.registry.cpi.*;
 import org.apache.airavata.workflow.core.dag.edge.Edge;
 import org.apache.airavata.workflow.core.dag.nodes.ApplicationNode;
 import org.apache.airavata.workflow.core.dag.nodes.NodeState;
@@ -167,7 +162,7 @@ class SimpleWorkflowInterpreter{
         for (WorkflowOutputNode completeWorkflowOutput : completeWorkflowOutputs) {
             outputDataObjects.add(completeWorkflowOutput.getOutputObject());
         }
-        AppCatalogFactory.getAppCatalog().getWorkflowCatalog()
+        RegistryFactory.getAppCatalog().getWorkflowCatalog()
                 .updateWorkflowOutputs(experiment.getApplicationId(), outputDataObjects);
     }
 
@@ -184,8 +179,7 @@ class SimpleWorkflowInterpreter{
     private TaskDetails getProcess(WorkflowNodeDetails wfNodeDetails) throws RegistryException
{
         // create workflow taskDetails from workflowNodeDetails
         TaskDetails taskDetails = ExperimentModelUtil.cloneTaskFromWorkflowNodeDetails(getExperiment(),
wfNodeDetails);
-        taskDetails.setTaskID(getRegistry()
-                .add(ChildDataType.TASK_DETAIL, taskDetails, wfNodeDetails.getNodeInstanceId()).toString());
+        taskDetails.setTaskID(getRegistry().getExperimentCatalog().add(ExpCatChildDataType.TASK_DETAIL,
taskDetails, wfNodeDetails.getNodeInstanceId()).toString());
         return taskDetails;
     }
 
@@ -204,8 +198,7 @@ class SimpleWorkflowInterpreter{
         }
         wfNodeDetails.setExecutionUnit(executionUnit);
         wfNodeDetails.setExecutionUnitData(executionData);
-        wfNodeDetails.setNodeInstanceId((String) getRegistry()
-                .add(ChildDataType.WORKFLOW_NODE_DETAIL, wfNodeDetails, getExperiment().getExperimentID()));
+        wfNodeDetails.setNodeInstanceId((String) getRegistry().getExperimentCatalog().add(ExpCatChildDataType.WORKFLOW_NODE_DETAIL,
wfNodeDetails, getExperiment().getExperimentID()));
         return wfNodeDetails;
     }
 
@@ -252,7 +245,7 @@ class SimpleWorkflowInterpreter{
 
     private Registry getRegistry() throws RegistryException {
         if (registry==null){
-            registry = RegistryFactory.getDefaultRegistry();
+            registry = RegistryFactory.getRegistry();
         }
         return registry;
     }
@@ -264,7 +257,7 @@ class SimpleWorkflowInterpreter{
     private void updateWorkflowNodeStatus(WorkflowNodeDetails wfNodeDetails, WorkflowNodeState
state) throws RegistryException{
         WorkflowNodeStatus status = ExperimentModelUtil.createWorkflowNodeStatus(state);
         wfNodeDetails.setWorkflowNodeStatus(status);
-        getRegistry().update(RegistryModelType.WORKFLOW_NODE_STATUS, status, wfNodeDetails.getNodeInstanceId());
+        getRegistry().getExperimentCatalog().update(ExperimentCatalogModelType.WORKFLOW_NODE_STATUS,
status, wfNodeDetails.getNodeInstanceId());
     }
 
     /**
@@ -307,7 +300,7 @@ class SimpleWorkflowInterpreter{
     }
 
     private void setExperiment(String experimentId) throws RegistryException {
-        experiment = (Experiment) getRegistry().get(RegistryModelType.EXPERIMENT, experimentId);
+        experiment = (Experiment) getRegistry().getExperimentCatalog().get(ExperimentCatalogModelType.EXPERIMENT,
experimentId);
         log.debug("Retrieve Experiment for experiment id : " + experimentId);
     }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/AiravataWorkflowParser.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/AiravataWorkflowParser.java
b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/AiravataWorkflowParser.java
index a41040c..f9964dd 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/AiravataWorkflowParser.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/AiravataWorkflowParser.java
@@ -21,16 +21,11 @@
 
 package org.apache.airavata.workflow.core.parser;
 
-import org.airavata.appcatalog.cpi.AppCatalogException;
-import org.airavata.appcatalog.cpi.WorkflowCatalog;
-import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory;
 import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
 import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
 import org.apache.airavata.model.workspace.experiment.Experiment;
 import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory;
-import org.apache.airavata.registry.cpi.Registry;
-import org.apache.airavata.registry.cpi.RegistryException;
-import org.apache.airavata.registry.cpi.RegistryModelType;
+import org.apache.airavata.registry.cpi.*;
 import org.apache.airavata.workflow.core.WorkflowParser;
 import org.apache.airavata.workflow.core.dag.edge.DirectedEdge;
 import org.apache.airavata.workflow.core.dag.edge.Edge;
@@ -261,8 +256,8 @@ public class AiravataWorkflowParser implements WorkflowParser {
     }
 
     private Experiment getExperiment(String experimentId) throws RegistryException {
-        Registry registry = RegistryFactory.getDefaultRegistry();
-        return (Experiment)registry.get(RegistryModelType.EXPERIMENT, experimentId);
+        Registry registry = RegistryFactory.getRegistry();
+        return (Experiment)registry.getExperimentCatalog().get(ExperimentCatalogModelType.EXPERIMENT,
experimentId);
     }
 
     private Workflow getWorkflowFromExperiment(Experiment experiment) throws RegistryException,
AppCatalogException, GraphException, ComponentException {
@@ -271,7 +266,7 @@ public class AiravataWorkflowParser implements WorkflowParser {
     }
 
     private WorkflowCatalog getWorkflowCatalog() throws AppCatalogException {
-        return AppCatalogFactory.getAppCatalog().getWorkflowCatalog();
+        return RegistryFactory.getAppCatalog().getWorkflowCatalog();
     }
 
     private ArrayList<Node> getInputNodes(Workflow wf) {

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/GUIWorkflowInterpreterInteractorImpl.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/GUIWorkflowInterpreterInteractorImpl.java
b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/GUIWorkflowInterpreterInteractorImpl.java
index 3c3288e..792364f 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/GUIWorkflowInterpreterInteractorImpl.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/GUIWorkflowInterpreterInteractorImpl.java
@@ -142,7 +142,7 @@
 //		switch (messageType) {
 //		case INPUT_WORKFLOWINTERPRETER_FOR_WORKFLOW:
 //			Workflow subWorkflow= (Workflow) data;
-//            WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(subWorkflow,config.getTopic(),config.getMessageBoxURL(),
config.getMessageBrokerURL(), config.getRegistry(), config.getConfiguration(), config.getGUI(),
this.engine.getMonitor());
+//            WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(subWorkflow,config.getTopic(),config.getMessageBoxURL(),
config.getMessageBrokerURL(), config.getExperimentCatalog(), config.getConfiguration(), config.getGUI(),
this.engine.getMonitor());
 //            workflowInterpreterConfiguration.setActOnProvenance(config.isActOnProvenance());
 //            workflowInterpreterConfiguration.setSubWorkflow(true);
 //            if (config.isTestMode()){

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/SSWorkflowInterpreterInteractorImpl.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/SSWorkflowInterpreterInteractorImpl.java
b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/SSWorkflowInterpreterInteractorImpl.java
index 207c2d0..3db4b57 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/SSWorkflowInterpreterInteractorImpl.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/SSWorkflowInterpreterInteractorImpl.java
@@ -63,7 +63,7 @@
 //		switch (messageType) {
 //		case INPUT_WORKFLOWINTERPRETER_FOR_WORKFLOW:
 //			Workflow subWorkflow= (Workflow) data;
-//            WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(subWorkflow,config.getTopic(),config.getMessageBoxURL(),
config.getMessageBrokerURL(), config.getRegistry(), config.getConfiguration(), config.getGUI(),
config.getMonitor());
+//            WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(subWorkflow,config.getTopic(),config.getMessageBoxURL(),
config.getMessageBrokerURL(), config.getExperimentCatalog(), config.getConfiguration(), config.getGUI(),
config.getMonitor());
 //            if (config.isTestMode()){
 //        		workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
 //            }

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
index 7d8f6cc..1074169 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
@@ -290,7 +290,7 @@
 //                        throw new WorkflowException(e);
 //                    }
 //
-//					// System.out.println(this.config.getConfiguration().getJcrComponentRegistry().getRegistry().getWorkflowStatus(this.topic));
+//					// System.out.println(this.config.getConfiguration().getJcrComponentRegistry().getExperimentCatalog().getWorkflowStatus(this.topic));
 //				}
 //			} else {
 //				if (this.config.isActOnProvenance()) {

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java
b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java
index 4023c37..4aea9e2 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreterConfiguration.java
@@ -98,7 +98,7 @@
 //	public void setMessageBrokerURL(URI messageBrokerURL) {
 //		this.messageBrokerURL = messageBrokerURL;
 //	}
-//	public AiravataAPI getRegistry() {
+//	public AiravataAPI getExperimentCatalog() {
 //		return registry;
 //	}
 //	public void setRegistry(AiravataAPI registry) {

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
index e8b7bb8..235ed98 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
@@ -318,7 +318,7 @@ public class XBayaMenuItem implements XBayaExecutionModeListener {
 //                    	serviceDescriptionDialog.open();
 ////                        ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(
 ////                                engine.getConfiguration().getJcrComponentRegistry()
-////                                        .getRegistry());
+////                                        .getExperimentCatalog());
 ////                        serviceDescriptionDialog.open();
 //                    	if (serviceDescriptionDialog.isServiceCreated()){
 ////                    		engine.reloadRegistry();

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java
b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java
index 2461da8..d620171 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/monitor/MonitorEventHandler.java
@@ -123,9 +123,9 @@ public class MonitorEventHandler implements ChangeListener {
 //        try {
 //            if (this.getClass().getClassLoader().getResource("airavata-server.properties")
!= null) {
 //                this.workflowNodeStatusUpdater =
-//                        new WorkflowNodeStatusUpdater(XBayaUtil.getRegistry(this.getClass().getClassLoader().getResource("airavata-server.properties")));
+//                        new WorkflowNodeStatusUpdater(XBayaUtil.getExperimentCatalog(this.getClass().getClassLoader().getResource("airavata-server.properties")));
 //                this.workflowStatusUpdater =
-//                        new WorkflowStatusUpdater(XBayaUtil.getRegistry(this.getClass().getClassLoader().getResource("airavata-server.properties")));
+//                        new WorkflowStatusUpdater(XBayaUtil.getExperimentCatalog(this.getClass().getClassLoader().getResource("airavata-server.properties")));
 //            }
 //        } catch (IOException e) {
 //            e.printStackTrace();  //To change body of catch statement use File | Settings
| File Templates.

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
index abb0b86..c67a4c3 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
@@ -150,12 +150,12 @@ public class XBayaUtil {
 	
 
 	
-//    public static AiravataRegistry2 getRegistry(URL url) throws IOException, RepositoryException,
URISyntaxException {
+//    public static AiravataRegistry2 getExperimentCatalog(URL url) throws IOException, RepositoryException,
URISyntaxException {
 //        Properties properties = new Properties();
 //        properties.load(url.openStream());
 //        JCRComponentRegistry jcrComponentRegistry = new JCRComponentRegistry(new URI((String)
properties.get(JCR_URL)),
 //                (String) properties.get(JCR_USER),(String) properties.get(JCR_PASS));
-//        return jcrComponentRegistry.getRegistry();
+//        return jcrComponentRegistry.getExperimentCatalog();
 //    }
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
b/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
index a096071..4829ebd 100644
--- a/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
+++ b/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
@@ -59,7 +59,7 @@
 //        Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 ////        ((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
 //        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getExperimentCatalog();
 ////		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,null,null,true);
 //        WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
 //                UUID.randomUUID().toString(), conf.getMessageBoxURL(), conf.getBrokerURL(),
conf.getAiravataAPI(), conf,null,null,true);

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
b/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
index dd7d184..6431f02 100644
--- a/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
+++ b/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
@@ -59,7 +59,7 @@
 //        URL systemResource = this.getClass().getClassLoader().getSystemResource("ComplexMath.xwf");
 //        Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 //        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getExperimentCatalog();
 ////		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,true);
 //		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
 //                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(),
conf.getAiravataAPI(), conf, null,null,true);

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
b/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
index 6971e8a..72173f2 100644
--- a/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
+++ b/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
@@ -59,7 +59,7 @@
 //        URL systemResource = this.getClass().getClassLoader().getSystemResource("LevenshteinDistance.xwf");
 //        Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 //        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getExperimentCatalog();
 ////		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,true);
 //		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
 //                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(),
conf.getAiravataAPI(), conf, null,null,true);

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
b/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
index 85fcc22..aef535e 100644
--- a/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
+++ b/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
@@ -60,7 +60,7 @@
 //        Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 //        ((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
 //        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getExperimentCatalog();
 ////		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,true);
 //		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
 //                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(),
conf.getAiravataAPI(), conf, null,null,true);

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
b/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
index dbe8cae..d48a6fe 100644
--- a/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
+++ b/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
@@ -58,7 +58,7 @@
 //        URL systemResource = this.getClass().getClassLoader().getSystemResource("SimpleForEach.xwf");
 //        Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 //        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getExperimentCatalog();
 ////		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,true);
 //		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
 //                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(),
conf.getAiravataAPI(), conf, null,null,true);

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
b/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
index fcfc44f..835a61f 100644
--- a/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
+++ b/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
@@ -59,7 +59,7 @@
 //        URL systemResource = this.getClass().getClassLoader().getSystemResource("SimpleMath.xwf");
 //        Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 //        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getExperimentCatalog();
 ////		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,true);
 //		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
 //                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(),
conf.getAiravataAPI(), conf, null,null,true);

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
b/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
index 7b016cd..d4ffcf7 100644
--- a/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
+++ b/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
@@ -61,7 +61,7 @@
 //        Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 //        ((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
 //        XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+////        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getExperimentCatalog();
 ////		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,true);
 //		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
 //                UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(),
conf.getAiravataAPI(), conf, null,null,true);

http://git-wip-us.apache.org/repos/asf/airavata/blob/8ebff860/samples/java-client/experiment/src/main/java/org/apache/airavata/api/samples/ExperimentSample.java
----------------------------------------------------------------------
diff --git a/samples/java-client/experiment/src/main/java/org/apache/airavata/api/samples/ExperimentSample.java
b/samples/java-client/experiment/src/main/java/org/apache/airavata/api/samples/ExperimentSample.java
index 83dd1a7..436754f 100644
--- a/samples/java-client/experiment/src/main/java/org/apache/airavata/api/samples/ExperimentSample.java
+++ b/samples/java-client/experiment/src/main/java/org/apache/airavata/api/samples/ExperimentSample.java
@@ -64,7 +64,7 @@ public class ExperimentSample {
     }
 	public static void main(String[] args) throws Exception {
 	AiravataAPI airavataAPI = getAiravataAPI();
-	DocumentCreatorNew documentCreatorNew = new DocumentCreatorNew(AppCatalogFactory.getAppCatalog());
+	DocumentCreatorNew documentCreatorNew = new DocumentCreatorNew(RegistryFactory.getAppCatalog());
         documentCreatorNew.createLocalHostDocs();
         String user = "admin";
 


Mime
View raw message