airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject [14/20] updating xbaya gui to the new airavata
Date Fri, 11 Jul 2014 22:21:27 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURLs.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURLs.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURLs.java
deleted file mode 100644
index 8669821..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/EventingServiceURLs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-
-public class EventingServiceURLs {
-    private AiravataAPI airavataAPI;
-
-    public EventingServiceURLs(AiravataAPI airavataAPI) {
-        setAiravataAPI(airavataAPI);
-    }
-
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
-
-    public void setAiravataAPI(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
-
-    public List<EventingServiceURL> getURLS() throws AiravataAPIInvocationException {
-        List<EventingServiceURL> urls = new ArrayList<EventingServiceURL>();
-        URI gfacDescriptor = getAiravataAPI().getAiravataManager().getEventingServiceURL();
-		urls.add(new EventingServiceURL(getAiravataAPI(), gfacDescriptor));
-        return urls;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURL.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURL.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURL.java
deleted file mode 100644
index 3f45bdd..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURL.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import org.apache.airavata.client.api.AiravataAPI;
-
-import java.net.URI;
-
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-
-public class GFacURL {
-    private AiravataAPI airavataAPI;
-    private URI gfacURL;
-
-    public GFacURL(AiravataAPI airavataAPI, URI url) {
-        setAiravataAPI(airavataAPI);
-        setGfacURL(url);
-    }
-
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
-
-    public void setAiravataAPI(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
-
-    public URI getGfacURL() {
-        return gfacURL;
-    }
-
-    public void setGfacURL(URI url) {
-        this.gfacURL = url;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java
deleted file mode 100644
index 2c2b89c..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/GFacURLs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-
-public class GFacURLs {
-    private AiravataAPI airavataAPI;
-
-    public GFacURLs(AiravataAPI airavataAPI) {
-        setAiravataAPI(airavataAPI);
-    }
-
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
-
-    public void setAiravataAPI(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
-
-//    public List<GFacURL> getURLS() throws AiravataAPIInvocationException {
-//        List<GFacURL> urls = new ArrayList<GFacURL>();
-//        List<URI> gfacDescriptorList = getAiravataAPI().getAiravataManager().getGFaCURLs();
-//		for (URI url : gfacDescriptorList) {
-//		    urls.add(new GFacURL(getAiravataAPI(), url));
-//		}
-//        return urls;
-//    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java
deleted file mode 100644
index aba3fc2..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/HostDescriptions.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import java.util.List;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.commons.gfac.type.HostDescription;
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-
-public class HostDescriptions {
-    private AiravataAPI airavataAPI;
-
-    public HostDescriptions(AiravataAPI airavataAPI) {
-        setAiravataAPI(airavataAPI);
-    }
-
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
-
-    public void setAiravataAPI(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
-
-    public List<HostDescription> getDescriptions() throws AiravataAPIInvocationException {
-        return getAiravataAPI().getApplicationManager().getAllHostDescriptions();
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InputParameters.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InputParameters.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InputParameters.java
deleted file mode 100644
index 41bf8b0..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InputParameters.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import org.apache.airavata.schemas.gfac.Parameter;
-
-public class InputParameters extends ServiceParameters {
-
-	public InputParameters(NodeParameter[] parameters) {
-		super(parameters);
-	}
-	
-	public InputParameters(Parameter[] parameters) {
-		super(parameters);
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURL.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURL.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURL.java
deleted file mode 100644
index d648af3..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURL.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import org.apache.airavata.client.api.AiravataAPI;
-
-import java.net.URI;
-
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-
-public class InterpreterServiceURL {
-    private AiravataAPI airavataAPI;
-    private URI interpreterServiceURL;
-
-    public InterpreterServiceURL(AiravataAPI airavataAPI, URI interpreterServiceURI) {
-        setAiravataAPI(airavataAPI);
-        setInterpreterServiceURI(interpreterServiceURI);
-    }
-
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
-
-    public void setAiravataAPI(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
-
-    public URI getInterpreterServiceURL() {
-        return interpreterServiceURL;
-    }
-
-    public void setInterpreterServiceURI(URI interpreterServiceURI) {
-        this.interpreterServiceURL = interpreterServiceURI;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java
deleted file mode 100644
index 71ae486..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/InterpreterServiceURLs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-
-public class InterpreterServiceURLs {
-    private AiravataAPI airavataAPI;
-
-    public InterpreterServiceURLs(AiravataAPI airavataAPI) {
-        setAiravataAPI(airavataAPI);
-    }
-
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
-
-    public void setAiravataAPI(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
-
-    public List<InterpreterServiceURL> getURLS() throws AiravataAPIInvocationException {
-        List<InterpreterServiceURL> urls = new ArrayList<InterpreterServiceURL>();
-        List<URI> gfacDescriptorList = getAiravataAPI().getAiravataManager().getWorkflowInterpreterServiceURLs();
-		for (URI uri : gfacDescriptorList) {
-		    urls.add(new InterpreterServiceURL(getAiravataAPI(), uri));
-		}
-        return urls;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURL.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURL.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURL.java
deleted file mode 100644
index 3754f16..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURL.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import org.apache.airavata.client.api.AiravataAPI;
-
-import java.net.URI;
-
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-
-public class MessageBoxURL {
-    private AiravataAPI airavataAPI;
-    private URI messageBoxURL;
-
-    public MessageBoxURL(AiravataAPI airavataAPI, URI messageBoxURL) {
-        setAiravataAPI(airavataAPI);
-        setMessageBoxURL(messageBoxURL);
-    }
-
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
-
-    public void setAiravataAPI(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
-
-    public URI getMessageBoxURL() {
-		return messageBoxURL;
-	}
-
-	public void setMessageBoxURL(URI messageBoxURL) {
-		this.messageBoxURL = messageBoxURL;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java
deleted file mode 100644
index 600af77..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/MessageBoxURLs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-
-public class MessageBoxURLs {
-    private AiravataAPI airavataAPI;
-
-    public MessageBoxURLs(AiravataAPI airavataAPI) {
-        setAiravataAPI(airavataAPI);
-    }
-
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
-
-    public void setAiravataAPI(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
-
-    public List<MessageBoxURL> getURLS() throws AiravataAPIInvocationException {
-        List<MessageBoxURL> urls = new ArrayList<MessageBoxURL>();
-        URI gfacDescriptor = getAiravataAPI().getAiravataManager().getMessageBoxServiceURL();
-		urls.add(new MessageBoxURL(getAiravataAPI(), gfacDescriptor));
-        return urls;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/NodeParameter.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/NodeParameter.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/NodeParameter.java
deleted file mode 100644
index acaa398..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/NodeParameter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import org.apache.airavata.schemas.gfac.Parameter;
-
-
-public class NodeParameter {
-	private Parameter parameter;
-	private Object value;
-	
-	public NodeParameter(Parameter parameter) {
-		this(parameter,null);
-	}
-	
-	public NodeParameter(Parameter parameter, Object value) {
-		setParameter(parameter);
-		setValue(value);
-	}
-	public Parameter getParameter() {
-		return parameter;
-	}
-	public void setParameter(Parameter parameter) {
-		this.parameter = parameter;
-	}
-	public Object getValue() {
-		return value;
-	}
-	public void setValue(Object value) {
-		this.value = value;
-	}
-	
-	public String getName(){
-		return getParameter().getParameterName();
-	}
-	
-	public String getDescription(){
-		return getParameter().getParameterDescription();
-	}
-}
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/OutputParameters.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/OutputParameters.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/OutputParameters.java
deleted file mode 100644
index f3067e5..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/OutputParameters.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import org.apache.airavata.schemas.gfac.Parameter;
-
-public class OutputParameters extends ServiceParameters {
-
-	public OutputParameters(NodeParameter[] parameters) {
-		super(parameters);
-	}
-	
-	public OutputParameters(Parameter[] parameters) {
-		super(parameters);
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java
deleted file mode 100644
index dcef41f..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceDescriptions.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import java.util.List;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.commons.gfac.type.ServiceDescription;
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-
-public class ServiceDescriptions {
-    private AiravataAPI airavataAPI;
-
-    public ServiceDescriptions(AiravataAPI airavataAPI) {
-        setAiravataAPI(airavataAPI);
-    }
-
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
-
-    public void setAiravataAPI(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
-
-    public List<ServiceDescription> getDescriptions() throws RegistryException, AiravataAPIInvocationException {
-        return getAiravataAPI().getApplicationManager().getAllServiceDescriptions();
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceParameters.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceParameters.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceParameters.java
deleted file mode 100644
index a3ea981..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/ServiceParameters.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.airavata.schemas.gfac.Parameter;
-
-public class ServiceParameters {
-	private List<NodeParameter> parameters;
-	
-	public ServiceParameters(Parameter[] parameters) {
-		if (parameters!=null) {
-			List<NodeParameter> serviceParaList = new ArrayList<NodeParameter>();
-			for (Parameter parameter : parameters) {
-				serviceParaList.add(new NodeParameter(parameter));
-			}
-			setParameters(serviceParaList);
-		}
-	}
-	
-	public ServiceParameters(NodeParameter[] parameters) {
-		if (parameters!=null) {
-			setParameters(Arrays.asList(parameters));
-		}
-	}
-	public List<NodeParameter> getParameters() {
-		if (parameters==null){
-			parameters=new ArrayList<NodeParameter>();
-		}
-		return parameters;
-	}
-	public void setParameters(List<NodeParameter> parameters) {
-		this.parameters = parameters;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java
deleted file mode 100644
index 4b619b3..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflow.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException;
-import org.apache.airavata.registry.api.workflow.NodeExecutionData;
-import org.apache.airavata.registry.api.workflow.WorkflowExecution;
-import org.apache.airavata.registry.api.workflow.WorkflowExecutionData;
-
-public class XBayaWorkflow {
-	private List<XBayaWorkflowNodeElement> workflowServices;
-	private WorkflowExecution workflowInstance;
-	private AiravataAPI airavataAPI;
-	
-	public XBayaWorkflow(WorkflowExecution workflowInstance, AiravataAPI airavataAPI) {
-		setWorkflowInstance(workflowInstance);
-		setAiravataAPI(airavataAPI);
-	}
-
-	public List<XBayaWorkflowNodeElement> getWorkflowServices() {
-		if (workflowServices==null){
-			workflowServices=new ArrayList<XBayaWorkflowNodeElement>();
-			try {
-				WorkflowExecutionData workflowInstanceData = getAiravataAPI().getProvenanceManager().getWorkflowInstanceData(getWorkflowId(), getWorkflowId());
-				List<NodeExecutionData> nodeDataList = workflowInstanceData.getNodeDataList();
-				for (NodeExecutionData nodeData : nodeDataList) {
-					workflowServices.add(new XBayaWorkflowNodeElement(nodeData.getWorkflowInstanceNode().getNodeId(), nodeData));
-				}
-			} catch (AiravataAPIInvocationException e) {
-				e.printStackTrace();
-			} catch (ExperimentLazyLoadedException e) {
-                e.printStackTrace();
-            }
-        }
-		return workflowServices;
-	}
-
-	public void setWorkflowNodes(List<XBayaWorkflowNodeElement> workflowServices) {
-		this.workflowServices = workflowServices;
-	}
-	
-	public void add(XBayaWorkflowNodeElement workflowService){
-		getWorkflowServices().add(workflowService);
-	}
-
-	public String getWorkflowName() {
-		return getWorkflowInstance().getTemplateName();
-	}
-
-	public String getWorkflowId() {
-		return getWorkflowInstance().getWorkflowExecutionId();
-	}
-
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
-
-    public void setAiravataAPI(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
-
-    public WorkflowExecution getWorkflowInstance() {
-		return workflowInstance;
-	}
-
-	public void setWorkflowInstance(WorkflowExecution workflowInstance) {
-		this.workflowInstance = workflowInstance;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java
deleted file mode 100644
index 04f6fae..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiment.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.exception.RegistryException;
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.workflow.WorkflowExecution;
-
-public class XBayaWorkflowExperiment {
-	private List<XBayaWorkflow> workflows;
-	private String experimentId;
-	private AiravataAPI airavataAPI;
-	
-	public XBayaWorkflowExperiment(String experimentId, AiravataAPI airavataAPI) {
-		setExperimentId(experimentId);
-		setAiravataAPI(airavataAPI);
-	}
-
-	public List<XBayaWorkflow> getWorkflows() {
-		if (workflows==null){
-			workflows=new ArrayList<XBayaWorkflow>();
-			try {
-				List<WorkflowExecution> experimentWorkflowInstances = getAiravataAPI().getProvenanceManager().getExperimentWorkflowInstances(getExperimentId());
-				for (WorkflowExecution workflowInstance : experimentWorkflowInstances) {
-					workflows.add(new XBayaWorkflow(workflowInstance, getAiravataAPI()));
-				}
-			}  catch (AiravataAPIInvocationException e) {
-                e.printStackTrace();
-            }
-        }
-		return workflows;
-	}
-
-	public void setWorkflows(List<XBayaWorkflow> workflows) {
-		this.workflows = workflows;
-	}
-	
-	public void add(XBayaWorkflow workflow){
-		getWorkflows().add(workflow);
-	}
-
-	public String getExperimentId() {
-		return experimentId;
-	}
-
-	public void setExperimentId(String experimentId) {
-		this.experimentId = experimentId;
-	}
-
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
-
-    public void setAiravataAPI(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java
deleted file mode 100644
index 555aaf2..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowExperiments.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.exception.RegistryException;
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-
-public class XBayaWorkflowExperiments {
-	private AiravataAPI airavataAPI;
-	
-	public XBayaWorkflowExperiments(AiravataAPI airavataAPI) {
-		setAiravataAPI(airavataAPI);
-	}
-	
-	public List<XBayaWorkflowExperiment> getAllExperiments(){
-		Map<String, XBayaWorkflowExperiment> experiments=new HashMap<String,XBayaWorkflowExperiment>();
-    	try {
-    		initializeExperimentMap(experiments);
-		} catch (AiravataAPIInvocationException e) {
-			e.printStackTrace();
-		}
-    	return Arrays.asList(experiments.values().toArray(new XBayaWorkflowExperiment[]{}));
-	}
-	
-	public void initializeExperimentMap(Map<String, XBayaWorkflowExperiment> experiments) throws AiravataAPIInvocationException {
-		List<String> experimentIdByUser = getAiravataAPI().getProvenanceManager().getExperimentIdList();
-		for (String id : experimentIdByUser) {
-			experiments.put(id, new XBayaWorkflowExperiment(id, getAiravataAPI()));
-		}
-	}
-
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
-
-    public void setAiravataAPI(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowNodeElement.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowNodeElement.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowNodeElement.java
deleted file mode 100644
index a3072e0..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowNodeElement.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.airavata.registry.api.workflow.NodeExecutionData;
-import org.apache.airavata.registry.api.workflow.InputData;
-import org.apache.airavata.registry.api.workflow.OutputData;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceNodePortData;
-import org.apache.airavata.schemas.gfac.Parameter;
-
-public class XBayaWorkflowNodeElement {
-	private InputParameters inputParameters;
-	private OutputParameters outputParameters;
-	private NodeExecutionData nodeData;
-	private String nodeId;
-	
-	public XBayaWorkflowNodeElement(String nodeId, NodeExecutionData nodeData) {
-		setNodeId(nodeId);
-		setNodeData(nodeData);
-	}
-
-	public OutputParameters getOutputParameters() {
-		if (outputParameters==null){
-			outputParameters=new OutputParameters((NodeParameter[])null);
-			outputParameters.getParameters().addAll(generateParameterListForOutput(nodeData.getOutputData()));
-		}
-		return outputParameters;
-	}
-
-	private List<NodeParameter> generateParameterListForInput(
-			List<InputData> list) {
-		List<NodeParameter> params=new ArrayList<NodeParameter>();
-		for (WorkflowInstanceNodePortData portData : list) {
-			Parameter parameter = Parameter.Factory.newInstance();
-			parameter.setParameterName(portData.getName());
-			NodeParameter serviceParameter = new NodeParameter(parameter, portData.getValue());
-			params.add(serviceParameter);
-		}
-		return params;
-	}
-	
-	private List<NodeParameter> generateParameterListForOutput(
-			List<OutputData> list) {
-		List<NodeParameter> params=new ArrayList<NodeParameter>();
-		for (WorkflowInstanceNodePortData portData : list) {
-			Parameter parameter = Parameter.Factory.newInstance();
-			parameter.setParameterName(portData.getName());
-			NodeParameter serviceParameter = new NodeParameter(parameter, portData.getValue());
-			params.add(serviceParameter);
-		}
-		return params;
-	}
-
-	public void setOutputParameters(OutputParameters outputParameters) {
-		this.outputParameters = outputParameters;
-	}
-
-	public InputParameters getInputParameters() {
-		if (inputParameters==null){
-			inputParameters=new InputParameters((NodeParameter[])null);
-			inputParameters.getParameters().addAll(generateParameterListForInput(nodeData.getInputData()));
-		}
-		return inputParameters;
-	}
-
-	public void setInputParameters(InputParameters inputParameters) {
-		this.inputParameters = inputParameters;
-	}
-
-	public String getNodeId() {
-		return nodeId;
-	}
-
-	public void setNodeId(String nodeId) {
-		this.nodeId = nodeId;
-	}
-
-	public NodeExecutionData getNodeData() {
-		return nodeData;
-	}
-
-	public void setNodeData(NodeExecutionData nodeData) {
-		this.nodeData = nodeData;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplate.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplate.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplate.java
deleted file mode 100644
index 63af7ac..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplate.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-
-public class XBayaWorkflowTemplate {
-    private String workflowGraph;
-    private String workflowName;
-
-    public XBayaWorkflowTemplate(String workflowName, String workflowGraph) {
-        setWorkflowGraph(workflowGraph);
-        setWorkflowName(workflowName);
-    }
-
-    public String getWorkflowGraph() {
-        return workflowGraph;
-    }
-
-    public void setWorkflowGraph(String workflowGraph) {
-        this.workflowGraph = workflowGraph;
-    }
-
-	public String getWorkflowName() {
-		return workflowName;
-	}
-
-	public void setWorkflowName(String workflowName) {
-		this.workflowName = workflowName;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java
deleted file mode 100644
index 318c3ac..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/model/registrybrowser/XBayaWorkflowTemplates.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.model.registrybrowser;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.workflow.model.wf.Workflow;
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-
-public class XBayaWorkflowTemplates {
-    private AiravataAPI airavataAPI;
-
-    public XBayaWorkflowTemplates(AiravataAPI airavataAPI) {
-        setAiravataAPI(airavataAPI);
-    }
-
-    public AiravataAPI getAiravataAPI() {
-        return airavataAPI;
-    }
-
-    public void setAiravataAPI(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
-
-    public List<XBayaWorkflowTemplate> getWorkflows() {
-        List<XBayaWorkflowTemplate> workflows = new ArrayList<XBayaWorkflowTemplate>();
-        try {
-            List<Workflow> list = getAiravataAPI().getWorkflowManager().getWorkflows();
-
-            for (Workflow workflow : list){
-                String workflowAsString = getAiravataAPI().getWorkflowManager().getWorkflowAsString(workflow.getName());
-                workflows.add(new XBayaWorkflowTemplate(workflow.getName(), workflowAsString));
-            }
-		} catch (AiravataAPIInvocationException e) {
-			e.printStackTrace();
-		}
-        return workflows;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java
deleted file mode 100644
index cf6ce0c..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceReader.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.xbaya.provenance;
-
-import java.util.List;
-
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.registry.api.workflow.ExperimentData;
-import org.apache.airavata.registry.api.workflow.NodeExecutionData;
-import org.apache.airavata.workflow.model.graph.Node;
-
-public class ProvenanceReader {
-
-    public String DEFAULT_LIBRARY_FOLDER_NAME = "provenance";
-
-    private String experimentId;
-
-    private AiravataAPI airavataAPI;
-
-    private Node node;
-
-    public ProvenanceReader(Node node,String experimentId,AiravataAPI airavataAPI) {
-       this.experimentId = experimentId;
-        this.airavataAPI = airavataAPI;
-        this.node = node;
-	}
-
-    public Object read() throws Exception {
-        try {
-            ExperimentData workflowExecution = airavataAPI.getProvenanceManager().getExperimentData(experimentId);
-            List<NodeExecutionData> nodeDataList = workflowExecution.getWorkflowExecutionDataList().get(0).getNodeDataList();
-            if (nodeDataList.size() == 0) {
-                return null;
-            }
-            for (NodeExecutionData data : nodeDataList) {
-                if (this.node.getID().equals(data.getWorkflowInstanceNode().getNodeId())) {
-                    return data.getOutputData().get(0).getValue();
-                }
-            }
-            return null;
-        } catch (Exception e) {
-            return null;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
deleted file mode 100644
index 25401dc..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.xbaya.provenance;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.common.utils.XMLUtil;
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.workflow.WorkflowExecution;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode;
-import org.apache.airavata.workflow.model.exceptions.WorkflowException;
-import org.apache.airavata.workflow.model.graph.DataPort;
-import org.apache.airavata.workflow.model.graph.ForEachExecutableNode;
-import org.apache.airavata.workflow.model.graph.Node;
-import org.apache.airavata.workflow.model.graph.system.EndForEachNode;
-import org.apache.airavata.workflow.model.graph.system.ForEachNode;
-import org.apache.airavata.workflow.model.graph.system.InputNode;
-import org.apache.airavata.workflow.model.graph.ws.WSNode;
-import org.apache.airavata.xbaya.concurrent.PredicatedExecutable;
-import org.apache.airavata.xbaya.graph.controller.NodeController;
-import org.apache.airavata.xbaya.invoker.Invoker;
-import org.apache.airavata.xbaya.util.XBayaUtil;
-import org.xmlpull.infoset.XmlElement;
-
-import xsul5.XmlConstants;
-
-/**
- * @author Chathura Herath
- */
-public final class ProvenanceWrite implements PredicatedExecutable {
-
-	private static final String PROVENANCE_DIR = "provenance";
-
-	private Node node;
-
-	private String workflowName;
-
-	private Map<Node, Invoker> invokerMap;
-
-    private String experimentId;
-
-    private AiravataAPI airavataAPI;
-
-	public ProvenanceWrite(Node node, String workflowName,
-                           Map<Node, Invoker> invokerMap, String experimentId,AiravataAPI airavataAPI) {
-		this.node = node;
-		this.workflowName = workflowName;
-		this.invokerMap = invokerMap;
-        this.experimentId = experimentId;
-        this.airavataAPI = airavataAPI;
-	}
-
-	public void run() {
-
-		try {
-			saveNodeOutputs(node, invokerMap, workflowName);
-		} catch (WorkflowException e) {
-			// do nothing its a failure but go on
-			e.printStackTrace();
-		}
-
-	}
-
-	public boolean isReady() {
-		return NodeController.isFinished(this.node) && invokerMap.get(node) != null;
-	}
-
-	private void saveNodeOutputs(Node node,
-			Map<Node, Invoker> invokerMap, String workflowName)
-			throws WorkflowException {
-
-		if (null != node && !(node instanceof InputNode)) {
-			XmlElement elem = XmlConstants.BUILDER.newFragment("previousdat");
-			XmlElement inputs = null;
-			if (node instanceof WSNode) {
-				String nodeID = node.getComponent().getName();
-				XmlElement nodeElement = elem.newElement("wsnode");
-				elem.addChild(nodeElement);
-				nodeElement.addChild(nodeID);
-				inputs = elem.newElement("inputs");
-				elem.addChild(inputs);
-
-				List<DataPort> portsToBeSaved = node.getInputPorts();
-				for (DataPort savePort : portsToBeSaved) {
-
-					String portID = savePort.getName();
-					XmlElement portElem = inputs.newElement(portID);
-					inputs.addChild(portElem);
-					Object portInput = XBayaUtil.findInputFromPort(
-                            savePort, invokerMap);
-					if (portInput instanceof org.xmlpull.v1.builder.XmlElement) {
-						portInput = XMLUtil
-								.xmlElement3ToXmlElement5((org.xmlpull.v1.builder.XmlElement) portInput);
-					}
-					portElem.addChild(portInput);
-
-				}
-
-			} else if (node instanceof EndForEachNode) {
-				// here we save the inputs for the entire foreach block
-				Node middleNode = node.getInputPort(0).getFromNode();
-				String nodeID = middleNode.getComponent().getName();
-				XmlElement nodeElement = elem.newElement("foreach");
-				elem.addChild(nodeElement);
-				nodeElement.addChild(nodeID);
-				inputs = elem.newElement("inputs");
-				elem.addChild(inputs);
-				XmlConstants.BUILDER.serializeToString(elem);
-				if (middleNode instanceof ForEachExecutableNode) {
-					List<DataPort> portsToBeSaved = middleNode.getInputPorts();
-					for (DataPort savePort : portsToBeSaved) {
-						// we will save all the inputs
-						// these are static inputs and
-						// input to the foreach node
-
-						if (savePort.getFromNode() instanceof ForEachNode) {
-							// this is the foreach node rest are simple
-							// inputs
-							Object value = XBayaUtil
-									.getInputsForForEachNode(
-											(ForEachNode) savePort
-													.getFromNode(),
-											new LinkedList<String>(),
-											invokerMap);
-							if (value instanceof org.xmlpull.v1.builder.XmlElement) {
-								value = XMLUtil
-										.xmlElement3ToXmlElement5((org.xmlpull.v1.builder.XmlElement) value);
-							}
-
-							XmlElement portElement = inputs.newElement(savePort
-									.getName());
-							inputs.addChild(portElement);
-							portElement.addChild(value);
-						} else {
-							String portID = savePort.getName();
-							XmlElement portElem = inputs.newElement(portID);
-							inputs.addChild(portElem);
-							Object portInput = XBayaUtil
-									.findInputFromPort(savePort, invokerMap);
-							if (portInput instanceof org.xmlpull.v1.builder.XmlElement) {
-								portInput = XMLUtil
-										.xmlElement3ToXmlElement5((org.xmlpull.v1.builder.XmlElement) portInput);
-							}
-
-							portElem.addChild(portInput);
-						}
-
-					}
-
-				} else {
-					// error but we will let it pass because it will be
-					// caught at higher level
-				}
-
-			}
-            if (inputs!=null) {
-				try {
-					this.airavataAPI.getProvenanceManager().setWorkflowInstanceNodeInput(new WorkflowInstanceNode(new WorkflowExecution(experimentId, experimentId), node.getID()), xsul5.XmlConstants.BUILDER.serializeToString(inputs));
-                } catch (AiravataAPIInvocationException e) {
-					throw new WorkflowException(e);
-				}
-				// deal with the outputs
-			}
-			XmlElement outputs = elem.newElement("outputs");
-			elem.addChild(outputs);
-
-			List<DataPort> outputPorts = node.getOutputPorts();
-			for (DataPort outputPort : outputPorts) {
-				String outputName = outputPort.getName();
-
-				XmlElement outputParamElement = outputs.newElement(outputName);
-				outputs.addChild(outputParamElement);
-				Object ouputParamValue = invokerMap.get(node).getOutput(
-						outputName);
-
-				if (ouputParamValue instanceof org.xmlpull.v1.builder.XmlElement) {
-					ouputParamValue = XMLUtil
-							.xmlElement3ToXmlElement5((org.xmlpull.v1.builder.XmlElement) ouputParamValue);
-				}
-
-				if (ouputParamValue != null) {
-					outputParamElement.addChild(ouputParamValue);
-				} else {
-					outputParamElement.addChild("null");
-				}
-			}
-            try {
-				this.airavataAPI.getProvenanceManager().setWorkflowInstanceNodeOutput(new WorkflowInstanceNode(new WorkflowExecution(experimentId,experimentId),node.getID()),xsul5.XmlConstants.BUILDER.serializeToString(outputs));
-            } catch (AiravataAPIInvocationException e) {
-				throw new WorkflowException(e);
-			}
-		}
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java
deleted file mode 100644
index de2d836..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowNodeStatusUpdater.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.xbaya.provenance;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.workflow.WorkflowExecution;
-import org.apache.airavata.registry.api.workflow.WorkflowInstanceNode;
-import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus;
-import org.apache.airavata.registry.api.workflow.WorkflowNodeType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class WorkflowNodeStatusUpdater {
-       private static Logger logger = LoggerFactory.getLogger(WorkflowNodeStatusUpdater.class);
-
-    private AiravataAPI airavataAPI;
-
-    public WorkflowNodeStatusUpdater(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
-
-    public boolean workflowNodeStarted(String workflowInstanceID,String nodeID,String inputs,String workflowID){
-        try {
-            //todo we currently save only service nodes
-            WorkflowNodeType workflowNodeType = new WorkflowNodeType();
-            workflowNodeType.setNodeType(WorkflowNodeType.WorkflowNode.SERVICENODE);
-            WorkflowInstanceNode node = new WorkflowInstanceNode(new WorkflowExecution(workflowInstanceID,workflowInstanceID), nodeID);
-			airavataAPI.getProvenanceManager().setWorkflowInstanceNodeInput(node, inputs);
-            airavataAPI.getProvenanceManager().setWorkflowNodeType(node, workflowNodeType);
-            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowExecutionStatus.State.STARTED);
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Error updating Wokflow Node status !!");
-            return false;
-        }
-        return true;
-    }
-
-    public boolean workflowNodeFailed(String workflowInstanceID,String nodeID){
-        try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowExecutionStatus.State.FAILED);
-            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(workflowInstanceID, workflowInstanceID, WorkflowExecutionStatus.State.FAILED);
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Error updating Wokflow Node status !!");
-            return false;
-        }
-        return true;
-    }
-
-    public boolean workflowNodeFinished(String workflowInstanceID,String nodeID,String inputs,String workflowID){
-        try {
-        	WorkflowNodeType workflowNodeType = new WorkflowNodeType();
-            workflowNodeType.setNodeType(WorkflowNodeType.WorkflowNode.SERVICENODE);
-            WorkflowInstanceNode node = new WorkflowInstanceNode(new WorkflowExecution(workflowInstanceID,workflowInstanceID), nodeID);
-            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeOutput(node, inputs);
-            airavataAPI.getProvenanceManager().setWorkflowNodeType(node,workflowNodeType);
-            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowExecutionStatus.State.FINISHED);
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Error updating Wokflow Node status !!");
-            return false;
-        }
-        return true;
-    }
-
-    public boolean workflowNodeRunning(String workflowInstanceID,String nodeID){
-        try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowExecutionStatus.State.RUNNING);
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Error updating Wokflow Node status !!");
-            return false;
-        }
-        return true;
-    }
-
-     public boolean workflowNodePaused(String workflowInstanceID,String nodeID){
-        try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowExecutionStatus.State.PAUSED);
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Error updating Wokflow Node status !!");
-            return false;
-        }
-        return true;
-    }
-
-    public boolean workflowNodeStatusPending(String workflowInstanceID,String nodeID){
-        try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowExecutionStatus.State.PENDING);
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Error updating Wokflow Node status !!");
-            return false;
-        }
-        return true;
-    }
-
-       public boolean workflowNodeStatusActive(String workflowInstanceID,String nodeID){
-        try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowExecutionStatus.State.ACTIVE);
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Error updating Wokflow Node status !!");
-            return false;
-        }
-        return true;
-    }
-
-       public boolean workflowNodeStatusDone(String workflowInstanceID,String nodeID){
-        try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceNodeStatus(workflowInstanceID, workflowInstanceID, nodeID, WorkflowExecutionStatus.State.DONE);
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Error updating Wokflow Node status !!");
-            return false;
-        }
-        return true;
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java
deleted file mode 100644
index cc444b0..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.xbaya.provenance;
-
-import java.sql.Timestamp;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.exception.RegistryException;
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.registry.api.workflow.WorkflowExecution;
-import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class WorkflowStatusUpdater {
-    private static Logger logger = LoggerFactory.getLogger(WorkflowStatusUpdater.class);
-
-    private AiravataAPI airavataAPI;
-
-    public WorkflowStatusUpdater(AiravataAPI airavataAPI) {
-        this.airavataAPI = airavataAPI;
-    }
-
-    public boolean workflowStarted(String experimentID){
-        try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowExecutionStatus.State.STARTED);
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Error updating Wokflow Node status !!");
-            return false;
-        }
-        return true;
-    }
-
-    public boolean workflowFailed(String experimentID){
-        try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowExecutionStatus.State.FAILED);
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Error updating Wokflow Node status !!");
-            return false;
-        }
-        return true;
-    }
-
-    public boolean workflowFinished(String experimentID){
-        try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowExecutionStatus.State.FINISHED);
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Error updating Wokflow Node status !!");
-            return false;
-        }
-        return true;
-    }
-
-    public boolean workflowRunning(String experimentID){
-        try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowExecutionStatus.State.RUNNING);
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Error updating Wokflow Node status !!");
-            return false;
-        }
-        return true;
-    }
-
-     public boolean workflowPaused(String experimentID){
-        try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(experimentID, experimentID, WorkflowExecutionStatus.State.PAUSED);
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Error updating Wokflow Node status !!");
-            return false;
-        }
-        return true;
-    }
-
-    public boolean saveWorkflowData(String experimentID,String workflowInstanceID,String workflowTemplateID) {
-        Timestamp currentTime = new Timestamp((new java.util.Date()).getTime());
-        try {
-            airavataAPI.getProvenanceManager().setWorkflowInstanceTemplateName(workflowInstanceID, workflowTemplateID);
-            airavataAPI.getProvenanceManager().setWorkflowInstanceStatus(new WorkflowExecutionStatus(new WorkflowExecution(experimentID, workflowInstanceID), WorkflowExecutionStatus.State.STARTED,currentTime));
-        } catch (AiravataAPIInvocationException e) {
-            logger.error("Error saving Workflow Data !!");
-        }
-        return true;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
deleted file mode 100644
index 63c6948..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/RegistryAccesser.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.registry;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.jcr.RepositoryException;
-import javax.xml.namespace.QName;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.common.utils.StringUtil;
-import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.workflow.model.component.ComponentException;
-import org.apache.airavata.workflow.model.graph.GraphException;
-import org.apache.airavata.workflow.model.wf.Workflow;
-import org.apache.airavata.xbaya.XBayaConfiguration;
-import org.apache.airavata.xbaya.XBayaConstants;
-import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.jython.script.JythonScript;
-import org.apache.airavata.xbaya.ui.experiment.RegistryWorkflowPublisherWindow;
-import org.apache.airavata.xbaya.util.XBayaUtil;
-import org.ietf.jgss.GSSCredential;
-import org.xmlpull.infoset.XmlElement;
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-
-public class RegistryAccesser {
-
-    /**
-     * PUBLIC_ACTOR
-     */
-    public static final String PUBLIC_ACTOR = "public";
-
-    private XBayaEngine engine;
-
-    private GSSCredential gssCredential;
-
-    /**
-     * Constructs a RegistryAccesser.
-     * 
-     * @param engine
-     */
-    public RegistryAccesser(XBayaEngine engine) {
-        this.engine = engine;
-    }
-
-    private AiravataAPI connectToRegistry() {
-        return this.engine.getConfiguration().getAiravataAPI();
-    }
-
-    /**
-     * 
-     * @return
-     * @throws RepositoryException
-     */
-    public Map<String, String> getOGCEWorkflowTemplateList() throws AiravataAPIInvocationException {
-        AiravataAPI airavataAPI = connectToRegistry();
-        List<Workflow> workflows = airavataAPI.getWorkflowManager().getWorkflows();
-        Map<String, String> workflowMap = new HashMap<String, String>();
-        for(Workflow workflow : workflows){
-            workflowMap.put(workflow.getName(), airavataAPI.getWorkflowManager().getWorkflowAsString(workflow.getName()));
-        }
-        return workflowMap;
-    }
-
-    /**
-     * 
-     * @param workflowTemplateId
-     * @return
-     * @throws RepositoryException
-     * @throws GraphException
-     * @throws ComponentException
-     * @throws Exception
-     */
-    public Workflow getOGCEWorkflow(QName workflowTemplateId) throws RepositoryException, GraphException,
-            ComponentException, Exception {
-        AiravataAPI registry = connectToRegistry();
-        String xml = registry.getWorkflowManager().getWorkflowAsString(workflowTemplateId.getLocalPart());
-        XmlElement xwf = XMLUtil.stringToXmlElement(xml);
-        Workflow workflow = new Workflow(xwf);
-        return workflow;
-    }
-
-    /**
-     * Save workflow in to Registry
-     */
-    public boolean saveWorkflow() {
-        if (XBayaUtil.acquireJCRRegistry(this.engine)) {
-            try {
-
-                Workflow workflow = this.engine.getGUI().getWorkflow();
-                JythonScript script = new JythonScript(workflow, this.engine.getConfiguration());
-
-                // Check if there is any errors in the workflow first.
-                ArrayList<String> warnings = new ArrayList<String>();
-                if (!script.validate(warnings)) {
-                    StringBuilder buf = new StringBuilder();
-                    for (String warning : warnings) {
-                        buf.append("- ");
-                        buf.append(warning);
-                        buf.append("\n");
-                    }
-                    this.engine.getGUI().getErrorWindow().warning(buf.toString());
-                    return false;
-                }
-                RegistryWorkflowPublisherWindow registryPublishingWindow = new RegistryWorkflowPublisherWindow(
-                        this.engine);
-                registryPublishingWindow.show();
-
-                String workflowId = workflow.getName();
-
-                workflowId = StringUtil.convertToJavaIdentifier(workflowId);
-
-                QName workflowQName = new QName(XBayaConstants.OGCE_WORKFLOW_NS, workflowId);
-
-                String workflowAsString = XMLUtil.xmlElementToString(workflow.toXML());
-                String owner = this.engine.getConfiguration().getRegistryUserName();
-
-                AiravataAPI registry = this.connectToRegistry();
-                if (registry.getWorkflowManager().isWorkflowExists(workflow.getName())){
-            		registry.getWorkflowManager().updateWorkflow(workflow.getName(), workflowAsString);
-            	}else{
-            		registry.getWorkflowManager().saveWorkflow(workflowAsString);
-            	}
-                if (registryPublishingWindow.isMakePublic()){
-                	
-                	registry.getWorkflowManager().publishWorkflow(workflow.getName());
-                }
-                registryPublishingWindow.hide();
-                return true;
-            } catch (Exception e) {
-                this.engine.getGUI().getErrorWindow().error(e.getMessage(), e);
-            }
-        }
-		return false;
-    }
-
-    /**
-     * 
-     * @param workflowTemplateId
-     * @throws RepositoryException
-     */
-    public void deleteOGCEWorkflow(QName workflowTemplateId) throws AiravataAPIInvocationException {
-        if (XBayaUtil.acquireJCRRegistry(this.engine)) {
-            AiravataAPI registry = connectToRegistry();
-            registry.getWorkflowManager().removeWorkflow(workflowTemplateId.getLocalPart());
-        }
-    }
-
-    /**
-     * 
-     * @param qname
-     * @return
-     */
-    public Workflow getWorkflow(QName qname) throws AiravataAPIInvocationException {
-        AiravataAPI registry = connectToRegistry();
-        String xml = registry.getWorkflowManager().getWorkflowAsString(qname.getLocalPart());
-        Workflow workflow = null;
-        try {
-            XmlElement xwf = XMLUtil.stringToXmlElement(xml);
-            workflow = new Workflow(xwf);
-        } catch (GraphException e) {
-            e.printStackTrace(); // To change body of catch statement use File | Settings | File Templates.
-        } catch (ComponentException e) {
-            e.printStackTrace(); // To change body of catch statement use File | Settings | File Templates.
-        }
-        return workflow;
-    }
-
-    /**
-     * 
-     * @param name
-     * @return
-     * @throws RegistryException 
-     */
-    public Workflow getWorkflow(String name) throws AiravataAPIInvocationException {
-        return getWorkflow(new QName(XBayaConstants.LEAD_NS, name));
-    }
-
-    public void main() {
-
-        XBayaConfiguration config = new XBayaConfiguration();
-        config.setMyProxyServer("myproxy.teragrid.org");
-        config.setMyProxyUsername("USER");
-        config.setMyProxyPassphrase("PASSWORD");
-
-        new XBayaEngine(config);
-    }
-}
\ No newline at end of file


Mime
View raw message