airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1411675 [2/2] - in /airavata/trunk/modules: airavata-client/src/main/java/org/apache/airavata/client/ workflow-model/ workflow-model/workflow-model-component-node/ workflow-model/workflow-model-component-node/src/ workflow-model/workflow-m...
Date Tue, 20 Nov 2012 14:18:54 GMT
Added: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/web/WebComponentReference.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/web/WebComponentReference.java?rev=1411675&view=auto
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/web/WebComponentReference.java
(added)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/web/WebComponentReference.java
Tue Nov 20 14:18:47 2012
@@ -0,0 +1,60 @@
+/*
+ *
+ * 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.workflow.model.component.web;
+
+import java.util.List;
+
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.component.ComponentReference;
+import org.apache.airavata.workflow.model.component.ws.WSComponent;
+
+public class WebComponentReference extends ComponentReference {
+
+    private List<WSComponent> components;
+
+    /**
+     * Constructs a WebComponentNode.
+     * 
+     * @param name
+     * @param components
+     */
+    public WebComponentReference(String name, List<WSComponent> components) {
+        super(name);
+        this.components = components;
+    }
+
+    /**
+     * @see org.apache.airavata.workflow.model.component.ComponentReference#getComponent()
+     */
+    @Override
+    public Component getComponent() {
+        return this.components.get(0);
+    }
+
+    /**
+     * @see org.apache.airavata.workflow.model.component.ComponentReference#getComponents()
+     */
+    @Override
+    public List<? extends Component> getComponents() {
+        return this.components;
+    }
+}
\ No newline at end of file

Propchange: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/web/WebComponentReference.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/web/WebComponentRegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/web/WebComponentRegistry.java?rev=1411675&view=auto
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/web/WebComponentRegistry.java
(added)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/web/WebComponentRegistry.java
Tue Nov 20 14:18:47 2012
@@ -0,0 +1,191 @@
+/*
+ *
+ * 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.workflow.model.component.web;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.text.MutableAttributeSet;
+import javax.swing.text.html.HTML;
+import javax.swing.text.html.HTML.Tag;
+import javax.swing.text.html.HTMLEditorKit;
+import javax.swing.text.html.parser.ParserDelegator;
+
+import org.apache.airavata.common.utils.IOUtil;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.component.ComponentReference;
+import org.apache.airavata.workflow.model.component.ComponentRegistry;
+import org.apache.airavata.workflow.model.component.ComponentRegistryException;
+import org.apache.airavata.workflow.model.component.ws.WSComponent;
+import org.apache.airavata.workflow.model.component.ws.WSComponentFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class WebComponentRegistry extends ComponentRegistry {
+
+    private static final Logger logger = LoggerFactory.getLogger(WebComponentRegistry.class);
+
+    private URL url;
+
+    private List<ComponentReference> tree;
+
+    private Map<String, List<WSComponent>> componentsMap;
+
+    /**
+     * Creates a WebComponentRegistryClient
+     * 
+     * @param urlString
+     * @throws MalformedURLException
+     * @throws IOException
+     */
+    public WebComponentRegistry(String urlString) throws MalformedURLException, IOException
{
+        this(new URL(urlString));
+    }
+
+    /**
+     * Creates a WebComponentRegistryClient
+     * 
+     * @param url
+     *            The URL of the web page.
+     */
+    public WebComponentRegistry(URL url) {
+        this.url = url;
+        this.componentsMap = new HashMap<String, List<WSComponent>>();
+    }
+
+    /**
+     * @see org.apache.airavata.workflow.model.component.registry.ComponentRegistry#getName()
+     */
+    @Override
+    public String getName() {
+        return this.url.toString();
+    }
+
+    /**
+     * @see org.apache.airavata.workflow.model.component.registry.ComponentRegistry#getComponentReferenceList()
+     */
+    @Override
+    public List<ComponentReference> getComponentReferenceList() throws ComponentRegistryException
{
+        tree = new ArrayList<ComponentReference>();
+        parse();
+        return this.tree;
+    }
+
+    /**
+     * Returns a list of component of a specified name.
+     * 
+     * @param name
+     *            The name of the component. The name here is a relative URL specified in
<a href="name"> tag, and is
+     *            same as the name of a corresponding ComponentTree.
+     * @return The list of components of the specified name
+     */
+    public List<WSComponent> getComponents(String name) {
+        // This method is only used from a test.
+        List<WSComponent> components = this.componentsMap.get(name);
+        return components;
+    }
+
+    private void parse() throws ComponentRegistryException {
+        try {
+
+            HttpURLConnection connection = (HttpURLConnection) this.url.openConnection();
+            connection.setInstanceFollowRedirects(false);
+            connection.connect();
+
+            int count = 0;
+            // TODO checking 3 is not enough
+            while (String.valueOf(connection.getResponseCode()).startsWith("3")) {
+                String location = connection.getHeaderField("Location");
+                logger.info("Redirecting to " + location);
+                connection.disconnect();
+                this.url = new URL(location);
+                connection = (HttpURLConnection) this.url.openConnection();
+                connection.setInstanceFollowRedirects(false);
+                connection.connect();
+
+                count++;
+                if (count > 10) {
+                    throw new ComponentRegistryException("Too many redirect");
+                }
+            }
+
+            InputStream inputStream = connection.getInputStream();
+            InputStreamReader reader = new InputStreamReader(inputStream);
+            HtmlRegistryParserCallback callback = new HtmlRegistryParserCallback();
+            ParserDelegator parser = new ParserDelegator();
+            parser.parse(reader, callback, false);
+        } catch (IOException e) {
+            throw new ComponentRegistryException(e);
+        }
+    }
+
+    private void addComponents(String name) {
+        try {
+            URL wsdlUrl = new URL(this.url, name);
+            logger.info("WSDL URL: " + wsdlUrl);
+            String wsdlString = IOUtil.readToString(wsdlUrl.openStream());
+            logger.info("WSDL: " + wsdlString);
+            List<WSComponent> components = WSComponentFactory.createComponents(wsdlString);
+            addComponents(name, components);
+        } catch (MalformedURLException e) {
+            // Ignore
+            logger.error(e.getMessage(), e);
+        } catch (IOException e) {
+            // Ignore
+            logger.error(e.getMessage(), e);
+        } catch (ComponentException e) {
+            // Malformed WSDL.
+            logger.error(e.getMessage(), e);
+        } catch (RuntimeException e) {
+            logger.error(e.getMessage(), e);
+        }
+    }
+
+    private void addComponents(String name, List<WSComponent> components) {
+        this.componentsMap.put(name, components);
+        WebComponentReference componentReference = new WebComponentReference(name, components);
+        this.tree.add(componentReference);
+    }
+
+    private class HtmlRegistryParserCallback extends HTMLEditorKit.ParserCallback {
+
+        /**
+         * @see javax.swing.text.html.HTMLEditorKit.ParserCallback#handleStartTag(javax.swing.text.html.HTML.Tag,
+         *      javax.swing.text.MutableAttributeSet, int)
+         */
+        @Override
+        public void handleStartTag(Tag tag, MutableAttributeSet attrSet, int pos) {
+            if (tag == HTML.Tag.A) {
+                String name = (String) attrSet.getAttribute(HTML.Attribute.HREF);
+                addComponents(name);
+            }
+        }
+    }
+}
\ No newline at end of file

Propchange: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/web/WebComponentRegistry.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentReference.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentReference.java?rev=1411675&view=auto
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentReference.java
(added)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentReference.java
Tue Nov 20 14:18:47 2012
@@ -0,0 +1,63 @@
+/*
+ *
+ * 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.workflow.model.component.ws;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.component.ComponentReference;
+
+public class WSComponentReference extends ComponentReference {
+
+    private Component component;
+
+    private List<Component> components;
+
+    /**
+     * Constructs a SystemComponentNode.
+     * 
+     * @param name
+     * @param component
+     */
+    public WSComponentReference(String name, Component component) {
+        super(name);
+        this.component = component;
+        this.components = Collections.singletonList(component);
+    }
+
+    /**
+     * @see org.apache.airavata.workflow.model.component.ComponentReference#getComponent()
+     */
+    @Override
+    public Component getComponent() {
+        return this.component;
+    }
+
+    /**
+     * @see org.apache.airavata.workflow.model.component.ComponentReference#getComponents()
+     */
+    @Override
+    public List<? extends Component> getComponents() {
+        return this.components;
+    }
+}
\ No newline at end of file

Propchange: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentReference.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentRegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentRegistry.java?rev=1411675&view=auto
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentRegistry.java
(added)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentRegistry.java
Tue Nov 20 14:18:47 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.workflow.model.component.ws;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.airavata.common.utils.WSDLUtil;
+import org.apache.airavata.workflow.model.component.Component;
+import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.component.ComponentReference;
+import org.apache.airavata.workflow.model.component.ComponentRegistry;
+import org.apache.airavata.workflow.model.component.ComponentRegistryException;
+import org.apache.airavata.workflow.model.component.system.SubWorkflowComponent;
+import org.apache.airavata.workflow.model.component.url.URLComponentReference;
+
+import xsul.wsdl.WsdlDefinitions;
+import xsul.wsdl.WsdlException;
+import xsul.wsdl.WsdlResolver;
+
+public class WSComponentRegistry extends ComponentRegistry {
+
+    private static final String NAME = "Web Service Components";
+
+    private Map<String, Component> componentMap;
+
+    private ComponentReference treeLeaf;
+
+    /**
+     * Create a WSComponentRegistry
+     */
+    public WSComponentRegistry() {
+
+        try {
+            URI url = new URI("http://129.79.49.210:8080/axis2/services/AmazonEC2Webservice?wsdl");
+            WsdlResolver wsdlResolver = WsdlResolver.getInstance();
+            WsdlDefinitions definitions = wsdlResolver.loadWsdl(url);
+            List<WSComponent> components = WSComponentFactory.createComponents(WSDLUtil
+                    .wsdlDefinitions3ToWsdlDefintions5(definitions));
+
+            this.componentMap = new LinkedHashMap<String, Component>();
+
+            for (Component component : components) {
+                this.componentMap.put(component.getName(), component);
+            }
+
+            String urlString = url.toString();
+            String name = urlString.substring(urlString.lastIndexOf('/') + 1);
+            treeLeaf = new URLComponentReference(name, components);
+
+        } catch (ComponentException e) {
+            e.printStackTrace();
+        } catch (WsdlException e) {
+            e.printStackTrace();
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * @see org.apache.airavata.workflow.model.component.registry.ComponentRegistry#getName()
+     */
+    @Override
+    public String getName() {
+        return NAME;
+    }
+
+    /**
+     * Returns a ComponentTree.
+     * 
+     * @return The ComponentTree
+     */
+    @Override
+    public List<ComponentReference> getComponentReferenceList() throws ComponentRegistryException
{
+        List<ComponentReference> tree = new ArrayList<ComponentReference>();
+    	tree.add(this.treeLeaf);
+        return tree;
+    }
+
+    /**
+     * @param name2
+     * @param workflowComponent
+     */
+    public void addComponent(String name2, SubWorkflowComponent workflowComponent) {
+
+        this.componentMap.put(name2, workflowComponent);
+    }
+
+}
\ No newline at end of file

Propchange: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/component/ws/WSComponentRegistry.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/subworkflow/SubWorkflowNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/subworkflow/SubWorkflowNode.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/subworkflow/SubWorkflowNode.java
(original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/subworkflow/SubWorkflowNode.java
Tue Nov 20 14:18:47 2012
@@ -23,7 +23,7 @@ package org.apache.airavata.workflow.mod
 
 import java.util.List;
 
-import org.apache.airavata.workflow.model.component.SubWorkflowComponent;
+import org.apache.airavata.workflow.model.component.system.SubWorkflowComponent;
 import org.apache.airavata.workflow.model.graph.DataPort;
 import org.apache.airavata.workflow.model.graph.Edge;
 import org.apache.airavata.workflow.model.graph.Graph;

Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ExitNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ExitNode.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ExitNode.java
(original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/ExitNode.java
Tue Nov 20 14:18:47 2012
@@ -23,7 +23,7 @@ package org.apache.airavata.workflow.mod
 
 import java.util.List;
 
-import org.apache.airavata.workflow.model.component.ExitComponent;
+import org.apache.airavata.workflow.model.component.system.ExitComponent;
 import org.apache.airavata.workflow.model.graph.ControlEdge;
 import org.apache.airavata.workflow.model.graph.Edge;
 import org.apache.airavata.workflow.model.graph.Graph;

Modified: airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/StreamSourceNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/StreamSourceNode.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/StreamSourceNode.java
(original)
+++ airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/StreamSourceNode.java
Tue Nov 20 14:18:47 2012
@@ -25,7 +25,7 @@ import java.awt.Point;
 import java.util.ArrayList;
 
 import org.apache.airavata.workflow.model.component.Component;
-import org.apache.airavata.workflow.model.component.StreamSourceComponent;
+import org.apache.airavata.workflow.model.component.system.StreamSourceComponent;
 import org.apache.airavata.workflow.model.graph.Graph;
 import org.apache.airavata.workflow.model.graph.GraphException;
 import org.apache.airavata.workflow.model.graph.GraphSchema;

Modified: airavata/trunk/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/xbaya-gui/pom.xml Tue Nov 20 14:18:47 2012
@@ -306,6 +306,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-workflow-model-component</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-message-monitor</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaEngine.java
Tue Nov 20 14:18:47 2012
@@ -26,9 +26,9 @@ import java.util.List;
 
 import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.workflow.model.component.ComponentRegistryException;
-import org.apache.airavata.workflow.model.component.registry.AmazonComponentRegistry;
-import org.apache.airavata.workflow.model.component.registry.LocalComponentRegistry;
-import org.apache.airavata.workflow.model.component.registry.SystemComponentRegistry;
+import org.apache.airavata.workflow.model.component.amazon.AmazonComponentRegistry;
+import org.apache.airavata.workflow.model.component.local.LocalComponentRegistry;
+import org.apache.airavata.workflow.model.component.system.SystemComponentRegistry;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;
 import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
 import org.apache.airavata.ws.monitor.Monitor;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentController.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentController.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentController.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentController.java
Tue Nov 20 14:18:47 2012
@@ -24,8 +24,8 @@ package org.apache.airavata.xbaya.compon
 import java.util.List;
 
 import org.apache.airavata.workflow.model.component.ComponentReference;
+import org.apache.airavata.workflow.model.component.ComponentRegistry;
 import org.apache.airavata.workflow.model.component.ComponentRegistryException;
-import org.apache.airavata.workflow.model.component.registry.ComponentRegistry;
 import org.apache.airavata.xbaya.ui.widgets.component.ComponentTreeNode;
 
 public class ComponentController {

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
Tue Nov 20 14:18:47 2012
@@ -27,8 +27,8 @@ import java.util.Observable;
 import java.util.Observer;
 
 import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.workflow.model.component.ComponentRegistry;
 import org.apache.airavata.workflow.model.component.ComponentRegistryException;
-import org.apache.airavata.workflow.model.component.registry.ComponentRegistry;
 import org.apache.airavata.workflow.model.component.registry.JCRComponentRegistry;
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.XBayaEngine;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
Tue Nov 20 14:18:47 2012
@@ -49,7 +49,6 @@ import org.apache.airavata.common.utils.
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.registry.api.workflow.WorkflowInstanceStatus.ExecutionStatus;
 import org.apache.airavata.workflow.model.component.Component;
-import org.apache.airavata.workflow.model.component.SubWorkflowComponent;
 import org.apache.airavata.workflow.model.component.amazon.InstanceComponent;
 import org.apache.airavata.workflow.model.component.amazon.TerminateInstanceComponent;
 import org.apache.airavata.workflow.model.component.dynamic.DynamicComponent;
@@ -65,6 +64,7 @@ import org.apache.airavata.workflow.mode
 import org.apache.airavata.workflow.model.component.system.MemoComponent;
 import org.apache.airavata.workflow.model.component.system.OutputComponent;
 import org.apache.airavata.workflow.model.component.system.S3InputComponent;
+import org.apache.airavata.workflow.model.component.system.SubWorkflowComponent;
 import org.apache.airavata.workflow.model.component.ws.WSComponent;
 import org.apache.airavata.workflow.model.component.ws.WSComponentPort;
 import org.apache.airavata.workflow.model.exceptions.WorkflowException;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/MetadataTestCase.java
Tue Nov 20 14:18:47 2012
@@ -34,7 +34,7 @@ import org.apache.airavata.common.utils.
 import org.apache.airavata.workflow.model.component.Component;
 import org.apache.airavata.workflow.model.component.ComponentException;
 import org.apache.airavata.workflow.model.component.ComponentRegistryException;
-import org.apache.airavata.workflow.model.component.registry.LocalComponentRegistry;
+import org.apache.airavata.workflow.model.component.local.LocalComponentRegistry;
 import org.apache.airavata.workflow.model.component.system.InputComponent;
 import org.apache.airavata.workflow.model.component.system.OutputComponent;
 import org.apache.airavata.workflow.model.component.ws.WSComponentPort;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WebComponentRegistryClientTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WebComponentRegistryClientTestCase.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WebComponentRegistryClientTestCase.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WebComponentRegistryClientTestCase.java
Tue Nov 20 14:18:47 2012
@@ -29,9 +29,9 @@ import org.apache.airavata.common.utils.
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.workflow.model.component.Component;
 import org.apache.airavata.workflow.model.component.ComponentException;
-import org.apache.airavata.workflow.model.component.registry.WebComponentRegistry;
 import org.apache.airavata.workflow.model.component.system.InputComponent;
 import org.apache.airavata.workflow.model.component.system.OutputComponent;
+import org.apache.airavata.workflow.model.component.web.WebComponentRegistry;
 import org.apache.airavata.workflow.model.graph.Graph;
 import org.apache.airavata.workflow.model.graph.GraphException;
 import org.apache.airavata.workflow.model.graph.Node;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java
Tue Nov 20 14:18:47 2012
@@ -35,7 +35,7 @@ import org.apache.airavata.common.utils.
 import org.apache.airavata.workflow.model.component.Component;
 import org.apache.airavata.workflow.model.component.ComponentException;
 import org.apache.airavata.workflow.model.component.ComponentRegistryException;
-import org.apache.airavata.workflow.model.component.registry.LocalComponentRegistry;
+import org.apache.airavata.workflow.model.component.local.LocalComponentRegistry;
 import org.apache.airavata.workflow.model.component.system.OutputComponent;
 import org.apache.airavata.workflow.model.gpel.DSCUtil;
 import org.apache.airavata.workflow.model.graph.GraphException;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/util/WorkflowCreator.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/util/WorkflowCreator.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/util/WorkflowCreator.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/util/WorkflowCreator.java
Tue Nov 20 14:18:47 2012
@@ -26,7 +26,7 @@ import java.awt.Point;
 import org.apache.airavata.workflow.model.component.Component;
 import org.apache.airavata.workflow.model.component.ComponentException;
 import org.apache.airavata.workflow.model.component.ComponentRegistryException;
-import org.apache.airavata.workflow.model.component.registry.LocalComponentRegistry;
+import org.apache.airavata.workflow.model.component.local.LocalComponentRegistry;
 import org.apache.airavata.workflow.model.component.system.ConstantComponent;
 import org.apache.airavata.workflow.model.component.system.DoWhileComponent;
 import org.apache.airavata.workflow.model.component.system.EndDoWhileComponent;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/component/URLRegistryWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/component/URLRegistryWindow.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/component/URLRegistryWindow.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/component/URLRegistryWindow.java
Tue Nov 20 14:18:47 2012
@@ -29,7 +29,7 @@ import javax.swing.AbstractAction;
 import javax.swing.JButton;
 import javax.swing.JPanel;
 
-import org.apache.airavata.workflow.model.component.registry.URLComponentRegistry;
+import org.apache.airavata.workflow.model.component.url.URLComponentRegistry;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.component.registry.ComponentRegistryLoader;
 import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/component/WebResigtryWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/component/WebResigtryWindow.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/component/WebResigtryWindow.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/component/WebResigtryWindow.java
Tue Nov 20 14:18:47 2012
@@ -29,7 +29,7 @@ import javax.swing.AbstractAction;
 import javax.swing.JButton;
 import javax.swing.JPanel;
 
-import org.apache.airavata.workflow.model.component.registry.WebComponentRegistry;
+import org.apache.airavata.workflow.model.component.web.WebComponentRegistry;
 import org.apache.airavata.xbaya.XBayaConstants;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.component.registry.ComponentRegistryLoader;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicNodeWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicNodeWindow.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicNodeWindow.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/graph/dynamic/DynamicNodeWindow.java
Tue Nov 20 14:18:47 2012
@@ -36,7 +36,7 @@ import javax.swing.JFileChooser;
 import javax.swing.JPanel;
 import javax.xml.namespace.QName;
 
-import org.apache.airavata.workflow.model.component.registry.URLComponentRegistry;
+import org.apache.airavata.workflow.model.component.url.URLComponentRegistry;
 import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
 import org.apache.airavata.workflow.model.graph.DataPort;
 import org.apache.airavata.workflow.model.graph.Graph;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java
Tue Nov 20 14:18:47 2012
@@ -53,10 +53,10 @@ import javax.swing.tree.TreeSelectionMod
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.workflow.model.component.Component;
 import org.apache.airavata.workflow.model.component.ComponentException;
+import org.apache.airavata.workflow.model.component.ComponentOperationReference;
 import org.apache.airavata.workflow.model.component.ComponentReference;
+import org.apache.airavata.workflow.model.component.ComponentRegistry;
 import org.apache.airavata.workflow.model.component.ComponentRegistryException;
-import org.apache.airavata.workflow.model.component.registry.ComponentOperationReference;
-import org.apache.airavata.workflow.model.component.registry.ComponentRegistry;
 import org.apache.airavata.workflow.model.component.ws.WSComponent;
 import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
 import org.apache.airavata.xbaya.XBayaEngine;

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentTreeNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentTreeNode.java?rev=1411675&r1=1411674&r2=1411675&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentTreeNode.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentTreeNode.java
Tue Nov 20 14:18:47 2012
@@ -27,7 +27,7 @@ import javax.swing.tree.DefaultMutableTr
 import javax.swing.tree.MutableTreeNode;
 
 import org.apache.airavata.workflow.model.component.ComponentReference;
-import org.apache.airavata.workflow.model.component.registry.ComponentRegistry;
+import org.apache.airavata.workflow.model.component.ComponentRegistry;
 
 public class ComponentTreeNode extends DefaultMutableTreeNode {
 



Mime
View raw message