airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1382653 [3/3] - in /incubator/airavata/trunk/modules: airavata-client/src/main/java/org/apache/airavata/client/ commons/registry-api/src/main/java/org/apache/airavata/registry/api/ gfac-core/src/main/java/org/apache/airavata/core/gfac/cont...
Date Mon, 10 Sep 2012 06:32:10 GMT
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistrySearchResult.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistrySearchResult.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistrySearchResult.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/RegistrySearchResult.java
Mon Sep 10 06:32:08 2012
@@ -21,11 +21,9 @@
 
 package org.apache.airavata.xbaya.ui.experiment;
 
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
 import javax.xml.namespace.QName;
 
-import org.apache.airavata.xbaya.XBayaConstants;
+import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.xbaya.ui.widgets.TableRenderable;
 
 public class RegistrySearchResult implements TableRenderable {
@@ -40,34 +38,27 @@ public class RegistrySearchResult implem
 
     private String description;
 
-    private Node data;
-
     /**
      * Constructs a RegistrySearchResult.
      * 
      * @param node
      */
 
-    public RegistrySearchResult(Node node) {
-        try {
-            String property = node.getProperty("Type").getString();
-            if (property.equals(XBayaConstants.REGISTRY_TYPE_HOST_DESC)) {
-                // todo
-            } else if (property.equals(XBayaConstants.REGISTRY_TYPE_APPLICATION_DESC)) {
-                // todo
-            } else if (property.equals(XBayaConstants.REGISTRY_TYPE_SERVICE_DESC)) {
-                // todo
-            } else if (property.equals(XBayaConstants.REGISTRY_TYPE_WORKFLOW)) {
-                // this.qname = new ;
-                this.resourceID = new QName(node.getProperty("NamespaceURI").getString(),
node.getProperty("LocalPart")
-                        .getString(), node.getProperty("Prefix").getString());
-                this.description = node.getProperty("Description").getString();
-                this.resourceName = node.getName();
-            }
-
-        } catch (RepositoryException e) {
-            e.printStackTrace();
-        }
+    public RegistrySearchResult(Workflow workflow) {
+        //Never user so far during the project lifetime, thus assumption will never need
+//            String property = node.getProperty("Type").getString();
+//            if (property.equals(XBayaConstants.REGISTRY_TYPE_HOST_DESC)) {
+//                // todo
+//            } else if (property.equals(XBayaConstants.REGISTRY_TYPE_APPLICATION_DESC))
{
+//                // todo
+//            } else if (property.equals(XBayaConstants.REGISTRY_TYPE_SERVICE_DESC)) {
+//                // todo
+//            } else if (property.equals(XBayaConstants.REGISTRY_TYPE_WORKFLOW)) {
+		    // this.qname = new ;
+		    this.resourceID = workflow.getQname();
+		    this.description = workflow.getDescription();
+		    this.resourceName = workflow.getName();
+//            }
     }
 
     /**
@@ -107,15 +98,6 @@ public class RegistrySearchResult implem
     }
 
     /**
-     * Returns the data.
-     * 
-     * @return The data
-     */
-    public Node getData() {
-        return this.data;
-    }
-
-    /**
      * @see org.apache.airavata.xbaya.ui.widgets.TableRenderable#getColumnCount()
      */
     @Override

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/experiment/WorkflowInterpreterLaunchWindow.java
Mon Sep 10 06:32:08 2012
@@ -161,7 +161,7 @@ public class WorkflowInterpreterLaunchWi
             this.workflowInterpreterTextField.setText(XBayaConstants.DEFAULT_WORKFLOW_INTERPRETER_URL);
         }
 
-        org.apache.airavata.registry.api.AiravataRegistry registryURL = config.getJcrComponentRegistry().getRegistry();
+        org.apache.airavata.registry.api.AiravataRegistry2 registryURL = config.getJcrComponentRegistry().getRegistry();
         if (null != registryURL) {
             this.RegistryTextField.setText(config.getRegistryURL());
         } else {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
Mon Sep 10 06:32:08 2012
@@ -341,7 +341,7 @@ public class XBayaUtil {
 		return parameters;
 	}
 
-//    public static AiravataRegistry getRegistry(URL url) throws IOException, RepositoryException,
URISyntaxException {
+//    public static AiravataRegistry2 getRegistry(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)),

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexForEachWorkflowTest.java
Mon Sep 10 06:32:08 2012
@@ -20,9 +20,13 @@
 */
 package org.apache.airavata.xbaya.interpreter;
 
-import org.apache.airavata.registry.api.AiravataRegistry;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.UUID;
+
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
-import org.apache.airavata.workflow.model.graph.system.InputNode;
 import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.interpreter.utils.WorkflowTestUtils;
@@ -38,11 +42,6 @@ import org.junit.runners.model.Framework
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.UUID;
-
 public class ComplexForEachWorkflowTest {
     final Logger logger = LoggerFactory.getLogger(ForEachWorkflowTest.class);
 
@@ -60,7 +59,7 @@ public class ComplexForEachWorkflowTest 
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
 //        ((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
         XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-        AiravataRegistry registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
 		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,null,true);
 		workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
         SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ComplexMathWorkflowTest.java
Mon Sep 10 06:32:08 2012
@@ -21,7 +21,12 @@
 
 package org.apache.airavata.xbaya.interpreter;
 
-import org.apache.airavata.registry.api.AiravataRegistry;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.UUID;
+
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.xbaya.XBayaConfiguration;
@@ -30,8 +35,6 @@ import org.apache.airavata.xbaya.interpr
 import org.apache.airavata.xbaya.interpretor.StandaloneNotificationSender;
 import org.apache.airavata.xbaya.interpretor.WorkflowInterpreter;
 import org.apache.airavata.xbaya.interpretor.WorkflowInterpreterConfiguration;
-import org.apache.airavata.xbaya.ui.dialogs.graph.dynamic.DynamicWorkflowRunnerWindow;
-import org.apache.airavata.xbaya.ui.utils.MyProxyChecker;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.MethodRule;
@@ -40,11 +43,6 @@ import org.junit.runners.model.Framework
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.UUID;
-
 public class ComplexMathWorkflowTest {
     final Logger logger = LoggerFactory.getLogger(ComplexMathWorkflowTest.class);
 
@@ -61,7 +59,7 @@ public class ComplexMathWorkflowTest {
         URL systemResource = this.getClass().getClassLoader().getSystemResource("ComplexMath.xwf");
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
         XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-        AiravataRegistry registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
 		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,null,true);
 		workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
         SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/CrossProductWorkflowTest.java
Mon Sep 10 06:32:08 2012
@@ -21,7 +21,12 @@
 
 package org.apache.airavata.xbaya.interpreter;
 
-import org.apache.airavata.registry.api.AiravataRegistry;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.UUID;
+
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.xbaya.XBayaConfiguration;
@@ -38,11 +43,6 @@ import org.junit.runners.model.Framework
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.UUID;
-
 public class CrossProductWorkflowTest {
     final Logger logger = LoggerFactory.getLogger(CrossProductWorkflowTest.class);
 
@@ -59,7 +59,7 @@ public class CrossProductWorkflowTest {
         URL systemResource = this.getClass().getClassLoader().getSystemResource("LevenshteinDistance.xwf");
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
         XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-        AiravataRegistry registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
 		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,null,true);
 		workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/ForEachWorkflowTest.java
Mon Sep 10 06:32:08 2012
@@ -20,7 +20,12 @@
 */
 package org.apache.airavata.xbaya.interpreter;
 
-import org.apache.airavata.registry.api.AiravataRegistry;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.UUID;
+
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.graph.system.InputNode;
 import org.apache.airavata.workflow.model.wf.Workflow;
@@ -38,11 +43,6 @@ import org.junit.runners.model.Framework
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.UUID;
-
 public class ForEachWorkflowTest {
     final Logger logger = LoggerFactory.getLogger(ForEachWorkflowTest.class);
 
@@ -60,7 +60,7 @@ public class ForEachWorkflowTest {
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
         ((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
         XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-        AiravataRegistry registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
 		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,null,true);
 		workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
 		SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleForEachWorkflowTest.java
Mon Sep 10 06:32:08 2012
@@ -20,9 +20,13 @@
 */
 package org.apache.airavata.xbaya.interpreter;
 
-import org.apache.airavata.registry.api.AiravataRegistry;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.UUID;
+
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
-import org.apache.airavata.workflow.model.graph.system.InputNode;
 import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.interpreter.utils.WorkflowTestUtils;
@@ -38,11 +42,6 @@ import org.junit.runners.model.Framework
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.UUID;
-
 public class SimpleForEachWorkflowTest {
     final Logger logger = LoggerFactory.getLogger(ForEachWorkflowTest.class);
 
@@ -59,7 +58,7 @@ public class SimpleForEachWorkflowTest {
         URL systemResource = this.getClass().getClassLoader().getSystemResource("SimpleForEach.xwf");
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
         XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-        AiravataRegistry registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
 		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,null,true);
 		workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/SimpleMathWorkflowTest.java
Mon Sep 10 06:32:08 2012
@@ -21,7 +21,12 @@
 
 package org.apache.airavata.xbaya.interpreter;
 
-import org.apache.airavata.registry.api.AiravataRegistry;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.UUID;
+
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.wf.Workflow;
 import org.apache.airavata.xbaya.XBayaConfiguration;
@@ -38,11 +43,6 @@ import org.junit.runners.model.Framework
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.UUID;
-
 public class SimpleMathWorkflowTest {
     final Logger logger = LoggerFactory.getLogger(SimpleMathWorkflowTest.class);
 
@@ -59,7 +59,7 @@ public class SimpleMathWorkflowTest {
         URL systemResource = this.getClass().getClassLoader().getSystemResource("SimpleMath.xwf");
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
         XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-        AiravataRegistry registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
 		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,null,true);
 		workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
         SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java?rev=1382653&r1=1382652&r2=1382653&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/WorkflowTest.java
Mon Sep 10 06:32:08 2012
@@ -21,7 +21,12 @@
 
 package org.apache.airavata.xbaya.interpreter;
 
-import org.apache.airavata.registry.api.AiravataRegistry;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.UUID;
+
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.graph.system.InputNode;
 import org.apache.airavata.workflow.model.wf.Workflow;
@@ -39,11 +44,6 @@ import org.junit.runners.model.Framework
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.UUID;
-
 public class WorkflowTest{
     final Logger logger = LoggerFactory.getLogger(WorkflowTest.class);
 
@@ -61,7 +61,7 @@ public class WorkflowTest{
         Workflow workflow = new Workflow(WorkflowTestUtils.readWorkflow(systemResource));
         ((InputNode) workflow.getGraph().getNode("input")).setDefaultValue("1");
         XBayaConfiguration conf = WorkflowTestUtils.getConfiguration();
-        AiravataRegistry registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
+        AiravataRegistry2 registry = conf.getJcrComponentRegistry()==null? null:conf.getJcrComponentRegistry().getRegistry();
 		WorkflowInterpreterConfiguration workflowInterpreterConfiguration = new WorkflowInterpreterConfiguration(workflow,
UUID.randomUUID().toString(),conf.getMessageBoxURL(), conf.getBrokerURL(), registry, conf,
null,null,null,true);
 		workflowInterpreterConfiguration.setNotifier(new StandaloneNotificationSender(workflowInterpreterConfiguration.getTopic(),workflowInterpreterConfiguration.getWorkflow()));
         SSWorkflowInterpreterInteractorImpl ssWorkflowInterpreterInteractorImpl = new SSWorkflowInterpreterInteractorImpl();



Mime
View raw message