airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [1/9] retiring previous registry API - AIRAVATA-1234
Date Fri, 22 Aug 2014 19:01:30 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 208e9f4d0 -> f72637f21


http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentExecutionError.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentExecutionError.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentExecutionError.java
deleted file mode 100644
index 9a93339..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentExecutionError.java
+++ /dev/null
@@ -1,40 +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.registry.api.workflow;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ExperimentExecutionError extends ExecutionError {
-	private String experimentId;
-
-	public String getExperimentId() {
-		return experimentId;
-	}
-
-	public void setExperimentId(String experimentId) {
-		this.experimentId = experimentId;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentMetadata.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentMetadata.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentMetadata.java
deleted file mode 100644
index faa57f8..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentMetadata.java
+++ /dev/null
@@ -1,49 +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.registry.api.workflow;
-
-public class ExperimentMetadata {
-	private String experimentId;
-	private String metadata;
-	
-	public ExperimentMetadata(String experimentId, String metadata) {
-		setExperimentId(experimentId);
-		setMetadata(metadata);
-	}
-
-	public String getMetadata() {
-		return metadata;
-	}
-
-	public void setMetadata(String metadata) {
-		this.metadata = metadata;
-	}
-
-	public String getExperimentId() {
-		return experimentId;
-	}
-
-	public void setExperimentId(String experimentId) {
-		this.experimentId = experimentId;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentName.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentName.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentName.java
deleted file mode 100644
index 0e8d9d7..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentName.java
+++ /dev/null
@@ -1,49 +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.registry.api.workflow;
-
-public class ExperimentName {
-	private String experimentId;
-	private String instanceName;
-	
-	public ExperimentName(String experimentId, String instanceName) {
-		setExperimentId(experimentId);
-		setInstanceName(instanceName);
-	}
-
-	public String getInstanceName() {
-		return instanceName;
-	}
-
-	public void setInstanceName(String instanceName) {
-		this.instanceName = instanceName;
-	}
-
-	public String getExperimentId() {
-		return experimentId;
-	}
-
-	public void setExperimentId(String experimentId) {
-		this.experimentId = experimentId;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentUser.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentUser.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentUser.java
deleted file mode 100644
index 64371d3..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ExperimentUser.java
+++ /dev/null
@@ -1,48 +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.registry.api.workflow;
-
-public class ExperimentUser {
-	private String experimentId;
-	private String user;
-	
-	public ExperimentUser(String experimentId, String user) {
-		setExperimentId(experimentId);
-		setUser(user);
-	}
-
-	public String getUser() {
-		return user;
-	}
-
-	public void setUser(String user) {
-		this.user = user;
-	}
-
-	public String getExperimentId() {
-		return experimentId;
-	}
-
-	public void setExperimentId(String experimentId) {
-		this.experimentId = experimentId;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/InputData.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/InputData.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/InputData.java
deleted file mode 100644
index 0f0315c..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/InputData.java
+++ /dev/null
@@ -1,34 +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.registry.api.workflow;
-
-public class InputData extends WorkflowInstanceNodePortData {
-	public InputData() {
-		super();
-	}
-    public InputData(WorkflowInstanceNode workflowInstanceNode, String portName, String portValue) {
-		super(workflowInstanceNode, portName, portValue);
-	}
-	public InputData(WorkflowInstanceNode workflowInstanceNode, String data) {
-		super(workflowInstanceNode, data);
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionData.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionData.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionData.java
deleted file mode 100644
index 3cf7464..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionData.java
+++ /dev/null
@@ -1,236 +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.registry.api.workflow;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.airavata.common.utils.StringUtil;
-import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-public class NodeExecutionData {
-	private WorkflowInstanceNode workflowInstanceNode;
-	private List<InputData> inputData;
-	private List<OutputData> outputData;
-	private String input;
-	private String output;
-    private NodeExecutionStatus status;
-    private WorkflowNodeType.WorkflowNode type;
-    private String experimentId;
-    private String workflowExecutionId;
-    private String nodeId;
-
-    public NodeExecutionData() {
-    }
-
-    /**
-     * deprecated Use <code>NodeExecutionData(String experimentId, String workflowExecutionId, String nodeId)</code> instead
-     * @param workflowInstanceNode
-     */
-    public NodeExecutionData(WorkflowInstanceNode workflowInstanceNode) {
-		this(workflowInstanceNode.getWorkflowInstance().getExperimentId(),workflowInstanceNode.getWorkflowInstance().getWorkflowExecutionId(),workflowInstanceNode.getNodeId());
-		setWorkflowInstanceNode(workflowInstanceNode);
-	}
-    
-    public NodeExecutionData(String experimentId, String workflowExecutionId, String nodeId) {
-		this.experimentId=experimentId;
-		this.workflowExecutionId=workflowExecutionId;
-		this.nodeId=nodeId;
-	}
-
-    /* (non-Javadoc)
-	 * @see org.apache.airavata.registry.api.workflow.INodeExecutionData#getId()
-	 */
-	public String getId(){
-    	return nodeId;
-    }
-
-    /* (non-Javadoc)
-	 * @see org.apache.airavata.registry.api.workflow.INodeExecutionData#getExperimentId()
-	 */
-	public String getExperimentId(){
-    	return experimentId;
-    }
-    
-    /* (non-Javadoc)
-	 * @see org.apache.airavata.registry.api.workflow.INodeExecutionData#getWorkflowExecutionId()
-	 */
-	public String getWorkflowExecutionId(){
-    	return workflowExecutionId;
-    }
-    
-    /* (non-Javadoc)
-	 * @see org.apache.airavata.registry.api.workflow.INodeExecutionData#getWorkflowInstanceNode()
-	 */
-	public WorkflowInstanceNode getWorkflowInstanceNode() {
-		return workflowInstanceNode;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.airavata.registry.api.workflow.INodeExecutionData#setWorkflowInstanceNode(org.apache.airavata.registry.api.workflow.WorkflowInstanceNode)
-	 */
-	public void setWorkflowInstanceNode(WorkflowInstanceNode workflowInstanceNode) {
-		this.workflowInstanceNode = workflowInstanceNode;
-	}
-
-    /* (non-Javadoc)
-	 * @see org.apache.airavata.registry.api.workflow.INodeExecutionData#getStatus()
-	 */
-	public NodeExecutionStatus getStatus() {
-        return status;
-    }
-
-    /* (non-Javadoc)
-	 * @see org.apache.airavata.registry.api.workflow.INodeExecutionData#setStatus(org.apache.airavata.registry.api.workflow.NodeExecutionStatus)
-	 */
-	public void setStatus(NodeExecutionStatus status) {
-        this.status = status;
-    }
-
-    /* (non-Javadoc)
-	 * @see org.apache.airavata.registry.api.workflow.INodeExecutionData#setStatus(org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State, java.util.Date)
-	 */
-	public void setStatus(WorkflowExecutionStatus.State status, Date date) {
-        setStatus(new NodeExecutionStatus(this.workflowInstanceNode, status, date));
-
-    }
-
-	/* (non-Javadoc)
-	 * @see org.apache.airavata.registry.api.workflow.INodeExecutionData#getInputData()
-	 */
-	public List<InputData> getInputData() {
-		if (inputData==null){
-			inputData=new ArrayList<InputData>();
-			List<NameValue> data = getIOParameterData(getInput());
-			for (NameValue nameValue : data) {
-				inputData.add(new InputData(getWorkflowInstanceNode(), nameValue.name, nameValue.value));
-			}
-		}
-		return inputData;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.airavata.registry.api.workflow.INodeExecutionData#getOutputData()
-	 */
-	public List<OutputData> getOutputData() {
-		if (outputData==null){
-			outputData=new ArrayList<OutputData>();
-			List<NameValue> data = getIOParameterData(getOutput());
-			for (NameValue nameValue : data) {
-				outputData.add(new OutputData(getWorkflowInstanceNode(), nameValue.name, nameValue.value));
-			}
-		}
-		return outputData;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.airavata.registry.api.workflow.INodeExecutionData#setInputData(java.util.List)
-	 */
-	public void setInputData(List<InputData> inputData) {
-		this.inputData = inputData;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.airavata.registry.api.workflow.INodeExecutionData#setOutputData(java.util.List)
-	 */
-	public void setOutputData(List<OutputData> outputData) {
-		this.outputData = outputData;
-	}
-
-	public String getInput() {
-		return input;
-	}
-
-	public void setInput(String input) {
-		this.input = input;
-	}
-
-	public String getOutput() {
-		return output;
-	}
-
-	public void setOutput(String output) {
-		this.output = output;
-	}
-
-    /* (non-Javadoc)
-	 * @see org.apache.airavata.registry.api.workflow.INodeExecutionData#getType()
-	 */
-	public WorkflowNodeType.WorkflowNode getType() {
-        return type;
-    }
-
-    /* (non-Javadoc)
-	 * @see org.apache.airavata.registry.api.workflow.INodeExecutionData#setType(org.apache.airavata.registry.api.workflow.WorkflowNodeType.WorkflowNode)
-	 */
-	public void setType(WorkflowNodeType.WorkflowNode type) {
-        this.type = type;
-    }
-
-	public State getState() {
-		return status.getExecutionStatus();
-	}
-
-	public Date getStatusUpdateTime() {
-		return status.getStatusUpdateTime();
-	}
-	
-
-    private static class NameValue{
-		String name;
-		String value;
-		public NameValue(String name, String value) {
-			this.name=name;
-			this.value=value;
-		}
-	}
-	
-	private static List<NameValue> getIOParameterData(String data){
-		List<NameValue> parameters=new ArrayList<NameValue>();
-		if (data!=null && !data.trim().equals("")) {
-			String[] pairs = StringUtil.getElementsFromString(data);
-			for (String paras : pairs) {
-				String name=paras.trim();
-				String value="";
-				int i = name.indexOf("=");
-				//if the paras has a value as well
-				if (i!=-1){
-					value=name.substring(i+1);
-					name=name.substring(0,i);
-					parameters.add(new NameValue(name,StringUtil.quoteString(value)));
-				}else{
-					parameters.get(parameters.size()-1).value=parameters.get(parameters.size()-1).value+","+StringUtil.quoteString(name);
-				}
-				
-			}
-		}
-		return parameters;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionError.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionError.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionError.java
deleted file mode 100644
index fe24407..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionError.java
+++ /dev/null
@@ -1,58 +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.registry.api.workflow;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-public class NodeExecutionError extends ExecutionError {
-	private String experimentId;
-	private String workflowInstanceId;
-	private String nodeId;
-
-	public String getExperimentId() {
-		return experimentId;
-	}
-
-	public void setExperimentId(String experimentId) {
-		this.experimentId = experimentId;
-	}
-
-	public String getWorkflowInstanceId() {
-		return workflowInstanceId;
-	}
-
-	public void setWorkflowInstanceId(String workflowInstanceId) {
-		this.workflowInstanceId = workflowInstanceId;
-	}
-
-	public String getNodeId() {
-		return nodeId;
-	}
-
-	public void setNodeId(String nodeId) {
-		this.nodeId = nodeId;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionStatus.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionStatus.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionStatus.java
deleted file mode 100644
index d8f8e90..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/NodeExecutionStatus.java
+++ /dev/null
@@ -1,78 +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.registry.api.workflow;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement
-public class NodeExecutionStatus {
-    private State executionStatus;
-    private Date statusUpdateTime = null;
-    private WorkflowInstanceNode workflowInstanceNode;
-
-    public NodeExecutionStatus() {
-    }
-
-    public State getExecutionStatus() {
-        return executionStatus;
-    }
-
-    public void setExecutionStatus(State executionStatus) {
-        this.executionStatus = executionStatus;
-    }
-
-    public Date getStatusUpdateTime() {
-        return statusUpdateTime;
-    }
-
-    public void setStatusUpdateTime(Date statusUpdateTime) {
-        this.statusUpdateTime = statusUpdateTime;
-    }
-
-    public NodeExecutionStatus(WorkflowInstanceNode workflowInstanceNode, State executionStatus) {
-        this(workflowInstanceNode, executionStatus, null);
-    }
-
-    public NodeExecutionStatus(WorkflowInstanceNode workflowInstanceNode, State executionStatus, Date statusUpdateTime) {
-        statusUpdateTime = statusUpdateTime == null ? Calendar.getInstance().getTime() : statusUpdateTime;
-        setWorkflowInstanceNode(workflowInstanceNode);
-        setExecutionStatus(executionStatus);
-        setStatusUpdateTime(statusUpdateTime);
-    }
-
-	public WorkflowInstanceNode getWorkflowInstanceNode() {
-		return workflowInstanceNode;
-	}
-
-	public void setWorkflowInstanceNode(WorkflowInstanceNode workflowInstanceNode) {
-		this.workflowInstanceNode = workflowInstanceNode;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/OutputData.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/OutputData.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/OutputData.java
deleted file mode 100644
index 61743fa..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/OutputData.java
+++ /dev/null
@@ -1,34 +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.registry.api.workflow;
-
-public class OutputData extends WorkflowInstanceNodePortData {
-	public OutputData() {
-		super();
-	}
-    public OutputData(WorkflowInstanceNode workflowInstanceNode, String portName, String portValue) {
-		super(workflowInstanceNode, portName, portValue);
-	}
-	public OutputData(WorkflowInstanceNode workflowInstanceNode, String data) {
-		super(workflowInstanceNode, data);
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecution.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecution.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecution.java
deleted file mode 100644
index a4ce24e..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecution.java
+++ /dev/null
@@ -1,69 +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.registry.api.workflow;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class WorkflowExecution {
-	private String experimentId;
-	private String workflowExecutionId;
-	private String templateName;
-
-    public WorkflowExecution() {
-    }
-
-    public WorkflowExecution(String experimentId,String instanceId) {
-		setExperimentId(experimentId);
-		setWorkflowExecutionId(instanceId);
-	}
-
-    public WorkflowExecution(String experimentId, String workflowInstanceId, String templateName) {
-        this.experimentId = experimentId;
-        this.workflowExecutionId = workflowInstanceId;
-        this.templateName = templateName;
-    }
-
-    public String getWorkflowExecutionId() {
-		return workflowExecutionId;
-	}
-
-	public void setWorkflowExecutionId(String workflowExecutionId) {
-		this.workflowExecutionId = workflowExecutionId;
-	}
-
-	public String getExperimentId() {
-		return experimentId;
-	}
-
-	public void setExperimentId(String experimentId) {
-		this.experimentId = experimentId;
-	}
-
-	public String getTemplateName() {
-		return templateName;
-	}
-
-	public void setTemplateName(String templateName) {
-		this.templateName = templateName;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionData.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionData.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionData.java
deleted file mode 100644
index 5db469e..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionData.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package org.apache.airavata.registry.api.workflow;/*
- *
- * 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.
- *
- */
-
-import org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException;
-import org.apache.airavata.registry.api.impl.ExperimentDataImpl;
-import org.apache.airavata.registry.api.impl.WorkflowExecutionDataImpl;
-import org.apache.airavata.registry.api.workflow.WorkflowNodeType.WorkflowNode;
-
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import java.util.Date;
-import java.util.List;
-
-@WebService
-@XmlSeeAlso(WorkflowExecutionDataImpl.class)
-public interface WorkflowExecutionData {
-	/**
-	 * Get workflow execution id
-	 * @return
-	 */
-	public String getId();
-	
-    /**
-     * Retrieve all node data in this workflow execution
-     * @return
-     * @throws ExperimentLazyLoadedException
-     */
-    public List<NodeExecutionData> getNodeDataList() throws ExperimentLazyLoadedException;
-    
-    /**
-     * Retrieve all node data of the type <code>type</code>
-     * @param type
-     * @return
-     * @throws ExperimentLazyLoadedException
-     */
-    public List<NodeExecutionData> getNodeDataList(WorkflowNode type)throws ExperimentLazyLoadedException;
-    
-    /**
-     * Retrieve the node data with the given node Id
-     * @param nodeId
-     * @return
-     * @throws ExperimentLazyLoadedException
-     */
-    public NodeExecutionData getNodeData(String nodeId) throws ExperimentLazyLoadedException;
-
-    /**
-     * Add node data to the workflow execution
-     * @param nodeData
-     * @throws ExperimentLazyLoadedException
-     */
-    public void addNodeData(NodeExecutionData...nodeData) throws ExperimentLazyLoadedException;
-    
-    /**
-     * Get id of the experiment which this workflow execution belongs to 
-     * @return
-     */
-    public String getExperimentId();
-    
-    /**
-     * Get the workflow template name corresponding to this workflow execution
-     * @return
-     * @throws ExperimentLazyLoadedException
-     */
-    public String getTemplateName() throws ExperimentLazyLoadedException;
-    
-    /**
-     * Get current state of the execution of this workflow
-     * @return
-     * @throws ExperimentLazyLoadedException
-     */
-    public WorkflowExecutionStatus.State getState() throws ExperimentLazyLoadedException;
-    
-    /**
-     * Get current state updated time
-     * @return
-     * @throws ExperimentLazyLoadedException
-     */
-    public Date getStatusUpdateTime() throws ExperimentLazyLoadedException;
-    
-    /**
-     * Retrieve inputs to the workflow execution
-     * @return
-     * @throws ExperimentLazyLoadedException
-     */
-    public List<InputData> getWorkflowInputs () throws ExperimentLazyLoadedException;
-    
-    /**
-     * Retrieve outputs to the workflow execution
-     * @return
-     * @throws ExperimentLazyLoadedException
-     */
-    public List<OutputData> getWorkflowOutputs ()throws ExperimentLazyLoadedException;
-
-    @Deprecated
-    public WorkflowExecution getWorkflowExecution() throws ExperimentLazyLoadedException;
-    @Deprecated
-    public ExperimentData getExperimentData() throws ExperimentLazyLoadedException;
-    @Deprecated
-    public void setExperimentData(ExperimentDataImpl experimentData) throws ExperimentLazyLoadedException;
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionError.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionError.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionError.java
deleted file mode 100644
index 62d47c4..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionError.java
+++ /dev/null
@@ -1,49 +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.registry.api.workflow;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-public class WorkflowExecutionError extends ExecutionError {
-	private String experimentId;
-	private String workflowInstanceId;
-
-	public String getExperimentId() {
-		return experimentId;
-	}
-
-	public void setExperimentId(String experimentId) {
-		this.experimentId = experimentId;
-	}
-
-	public String getWorkflowInstanceId() {
-		return workflowInstanceId;
-	}
-
-	public void setWorkflowInstanceId(String workflowInstanceId) {
-		this.workflowInstanceId = workflowInstanceId;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionStatus.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionStatus.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionStatus.java
deleted file mode 100644
index 935a048..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowExecutionStatus.java
+++ /dev/null
@@ -1,128 +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.registry.api.workflow;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.Calendar;
-import java.util.Date;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement
-public class WorkflowExecutionStatus {
-
-    public WorkflowExecutionStatus() {
-    }
-
-    public WorkflowExecutionStatus(String experimentID, String workflowInstanceID) {
-        workflowInstance.setExperimentId(experimentID);
-        workflowInstance.setWorkflowExecutionId(workflowInstanceID);
-    }
-
-    public enum State {
-        STARTED {
-            public String toString() {
-                return "STARTED";
-            }
-        },
-        RUNNING {
-            public String toString() {
-                return "RUNNING";
-            }
-        },
-        FAILED {
-            public String toString() {
-                return "FAILED";
-            }
-        },
-        PAUSED {
-            public String toString() {
-                return "PAUSED";
-            }
-        },
-        FINISHED {
-            public String toString() {
-                return "FINISHED";
-            }
-        },
-        PENDING {
-            public String toString() {
-                return "PENDING";
-            }
-        },
-        ACTIVE {
-            public String toString() {
-                return "ACTIVE";
-            }
-        },
-        DONE {
-            public String toString() {
-                return "DONE";
-            }
-        },
-        UNKNOWN {
-            public String toString() {
-                return "UNKNOWN";
-            }
-        }
-    }
-
-    private State executionStatus=State.UNKNOWN;
-    private Date statusUpdateTime = null;
-    private WorkflowExecution workflowInstance;
-
-    public State getExecutionStatus() {
-        return executionStatus;
-    }
-
-    public void setExecutionStatus(State executionStatus) {
-        this.executionStatus = executionStatus;
-    }
-
-    public Date getStatusUpdateTime() {
-        return statusUpdateTime;
-    }
-
-    public void setStatusUpdateTime(Date statusUpdateTime) {
-        this.statusUpdateTime = statusUpdateTime;
-    }
-
-    public WorkflowExecutionStatus(WorkflowExecution workflowInstance, State executionStatus) {
-        this(workflowInstance, executionStatus, null);
-    }
-
-    public WorkflowExecutionStatus(WorkflowExecution workflowInstance, State executionStatus, Date statusUpdateTime) {
-        statusUpdateTime = statusUpdateTime == null ? Calendar.getInstance().getTime() : statusUpdateTime;
-        setWorkflowInstance(workflowInstance);
-        setExecutionStatus(executionStatus);
-        setStatusUpdateTime(statusUpdateTime);
-    }
-
-    public WorkflowExecution getWorkflowInstance() {
-        return workflowInstance;
-    }
-
-    public void setWorkflowInstance(WorkflowExecution workflowInstance) {
-        this.workflowInstance = workflowInstance;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowIOData.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowIOData.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowIOData.java
deleted file mode 100644
index 4267dc6..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowIOData.java
+++ /dev/null
@@ -1,58 +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.registry.api.workflow;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement
-public class WorkflowIOData {
-	private String value; 
-    private String nodeId;
-    
-    public WorkflowIOData() {
-	}
-    
-	public WorkflowIOData(String nodeId,String value) {
-		setValue(value);
-		setNodeId(nodeId);
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	public String getNodeId() {
-		return nodeId;
-	}
-
-	public void setNodeId(String nodeId) {
-		this.nodeId = nodeId;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNode.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNode.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNode.java
deleted file mode 100644
index 46d0f0d..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNode.java
+++ /dev/null
@@ -1,67 +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.registry.api.workflow;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement
-public class WorkflowInstanceNode{
-	private WorkflowExecution workflowInstance;
-	private String nodeId;
-    private String originalNodeID;
-    private int executionIndex;
-
-    public WorkflowInstanceNode() {
-    }
-
-    public WorkflowInstanceNode(WorkflowExecution workflowInstance, String nodeId) {
-		setWorkflowInstance(workflowInstance);
-		setNodeId(nodeId);
-	}
-
-	public WorkflowExecution getWorkflowInstance() {
-		return workflowInstance;
-	}
-
-	public void setWorkflowInstance(WorkflowExecution workflowInstance) {
-		this.workflowInstance = workflowInstance;
-	}
-
-	public String getNodeId() {
-		return nodeId;
-	}
-
-	public void setNodeId(String nodeId) {
-		this.nodeId = nodeId;
-	}
-
-    public String getOriginalNodeID() {
-        return originalNodeID;
-    }
-
-    public int getExecutionIndex() {
-        return executionIndex;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java
deleted file mode 100644
index c602642..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodePortData.java
+++ /dev/null
@@ -1,89 +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.registry.api.workflow;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-public class WorkflowInstanceNodePortData {
-	private WorkflowInstanceNode workflowInstanceNode;
-	private String name;
-	private String value;
-
-    public WorkflowInstanceNodePortData() {
-    }
-
-    public WorkflowInstanceNodePortData(WorkflowInstanceNode workflowInstanceNode, String portName, String portValue) {
-		setWorkflowInstanceNode(workflowInstanceNode);
-		setName(portName);
-		setValue(portValue);
-	}
-	
-	public WorkflowInstanceNodePortData(WorkflowInstanceNode workflowInstanceNode, String data) {
-		setWorkflowInstanceNode(workflowInstanceNode);
-		setValue(data);
-	}
-
-	public WorkflowInstanceNode getWorkflowInstanceNode() {
-		return workflowInstanceNode;
-	}
-
-	public void setWorkflowInstanceNode(WorkflowInstanceNode workflowInstanceNode) {
-		this.workflowInstanceNode = workflowInstanceNode;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-	
-	public String getId(){
-		return getName();
-	}
-	
-
-    public String getExperimentId(){
-    	return getWorkflowInstanceNode().getWorkflowInstance().getExperimentId();
-    }
-    
-    public String getWorkflowInstanceId(){
-    	return getWorkflowInstanceNode().getWorkflowInstance().getWorkflowExecutionId();
-    }
-    
-    public String getWorkflowInstanceNodeId(){
-    	return getWorkflowInstanceNode().getNodeId();
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeGramData.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeGramData.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeGramData.java
deleted file mode 100644
index d9d1c30..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeGramData.java
+++ /dev/null
@@ -1,83 +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.registry.api.workflow;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class WorkflowNodeGramData {
-    String NodeID;
-    String rsl;
-    String invokedHost;
-    String gramJobID;
-    private String workflowInstanceId;
-
-    public WorkflowNodeGramData() {
-    }
-
-    public WorkflowNodeGramData(String workflowInstanceId, String nodeID, String rsl, String invokedHost, String gramJobID) {
-        NodeID = nodeID;
-        this.rsl = rsl;
-        this.invokedHost = invokedHost;
-        this.gramJobID = gramJobID;
-        this.setWorkflowInstanceId(workflowInstanceId);
-    }
-
-    public void setNodeID(String nodeID) {
-        NodeID = nodeID;
-    }
-
-    public void setRsl(String rsl) {
-        this.rsl = rsl;
-    }
-
-    public void setInvokedHost(String invokedHost) {
-        this.invokedHost = invokedHost;
-    }
-
-    public void setGramJobID(String gramJobID) {
-        this.gramJobID = gramJobID;
-    }
-
-    public String getNodeID() {
-        return NodeID;
-    }
-
-    public String getRsl() {
-        return rsl;
-    }
-
-    public String getInvokedHost() {
-        return invokedHost;
-    }
-
-    public String getGramJobID() {
-        return gramJobID;
-    }
-
-	public String getWorkflowInstanceId() {
-		return workflowInstanceId;
-	}
-
-	public void setWorkflowInstanceId(String workflowInstanceId) {
-		this.workflowInstanceId = workflowInstanceId;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeIOData.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeIOData.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeIOData.java
deleted file mode 100644
index 0df6daa..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeIOData.java
+++ /dev/null
@@ -1,114 +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.registry.api.workflow;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement
-public class WorkflowNodeIOData extends WorkflowIOData {
-	private String experimentId;
-    private String workflowName;
-    private String workflowId;
-    private String workflowInstanceId;
-    private WorkflowNodeType nodeType;
-
-
-    /** when you construct this object it set to STARTED state **/
-    private WorkflowExecutionStatus nodeStatus = new
-            WorkflowExecutionStatus(new WorkflowExecution(experimentId,workflowId,workflowName), WorkflowExecutionStatus.State.STARTED);
-    
-    public WorkflowNodeIOData() {
-	}
-    
-	public WorkflowNodeIOData(String data, String experimentId,String workflowInstanceID, String workflowId,
-            String nodeId,String workflowName) {
-		super(nodeId,data);
-		setExperimentId(experimentId);
-        setWorkflowInstanceId(workflowInstanceID);
-		setWorkflowId(workflowId);
-		setWorkflowName(workflowName);
-	}
-
-	public WorkflowNodeIOData(String data, String experimentId,String workflowInstanceID,
-            String nodeId,String workflowName) {
-		this(data, experimentId, experimentId,workflowInstanceID, nodeId, workflowName);
-	}
-
-    public WorkflowNodeIOData(String experimentId,String workflowInstanceID, String workflowName, String workflowId, WorkflowNodeType nodeType) {
-        this.experimentId = experimentId;
-        this.workflowInstanceId = workflowInstanceID;
-        this.workflowName = workflowName;
-        this.workflowId = workflowId;
-        this.nodeType = nodeType;
-    }
-
-    public String getExperimentId() {
-		return experimentId;
-	}
-
-	public void setExperimentId(String experimentId) {
-		this.experimentId = experimentId;
-	}
-
-	public String getWorkflowName() {
-		return workflowName;
-	}
-
-	public void setWorkflowName(String workflowName) {
-		this.workflowName = workflowName;
-	}
-
-	public String getWorkflowId() {
-		return workflowId;
-	}
-
-	public void setWorkflowId(String workflowId) {
-		this.workflowId = workflowId;
-	}
-
-    public String getWorkflowInstanceId() {
-        return workflowInstanceId;
-    }
-
-    public void setWorkflowInstanceId(String workflowInstanceId) {
-        this.workflowInstanceId = workflowInstanceId;
-    }
-
-    public void setNodeType(WorkflowNodeType nodeType) {
-        this.nodeType = nodeType;
-    }
-
-    public WorkflowNodeType getNodeType() {
-        return nodeType;
-    }
-
-    public WorkflowExecutionStatus getNodeStatus() {
-        return nodeStatus;
-    }
-
-    public void setNodeStatus(WorkflowExecutionStatus nodeStatus) {
-        this.nodeStatus = nodeStatus;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeType.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeType.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeType.java
deleted file mode 100644
index 548d506..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowNodeType.java
+++ /dev/null
@@ -1,84 +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.registry.api.workflow;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement
-public class WorkflowNodeType {
-    public WorkflowNodeType(WorkflowNode nodeType) {
-        this.nodeType = nodeType;
-    }
-
-    public WorkflowNodeType() {
-    }
-
-    public enum WorkflowNode {
-        SERVICENODE {
-            public String toString() {
-                return "SERVICE_NODE";
-            }
-        },
-        CONTROLNODE {
-            public String toString() {
-                return "CONTROL_NODE";
-            }
-        },
-        INPUTNODE {
-            public String toString() {
-                return "INPUT_NODE";
-            }
-        },
-        OUTPUTNODE {
-            public String toString() {
-                return "OUTPUT_NODE";
-            }
-        },
-        UNKNOWN {
-            public String toString() {
-                return "UNKNOWN_NODE";
-            }
-        },
-    }
-
-    private WorkflowNode nodeType;
-
-    public WorkflowNode getNodeType() {
-        return nodeType;
-    }
-
-    public void setNodeType(WorkflowNode nodeType) {
-        this.nodeType = nodeType;
-    }
-
-    public static WorkflowNodeType getType(String type){
-        for(WorkflowNode w:WorkflowNode.values()){
-            if (w.toString().equalsIgnoreCase(type)){
-                return new WorkflowNodeType(w);
-            }
-        }
-        return new WorkflowNodeType(WorkflowNode.UNKNOWN);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowRunTimeData.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowRunTimeData.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowRunTimeData.java
deleted file mode 100644
index 65543d0..0000000
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowRunTimeData.java
+++ /dev/null
@@ -1,90 +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.registry.api.workflow;
-
-import java.sql.Timestamp;
-
-public class WorkflowRunTimeData {
-    String experimentID;
-    String workflowInstanceID;
-    String templateID;
-    Timestamp startTime;
-    WorkflowExecutionStatus.State workflowStatus;
-    Timestamp lastUpdateTime;
-
-    public WorkflowRunTimeData(String experimentID, String workflowInstanceID, String templateID,
-                               Timestamp startTime, WorkflowExecutionStatus.State workflowStatus, Timestamp lastUpdateTime) {
-        this.experimentID = experimentID;
-        this.workflowInstanceID = workflowInstanceID;
-        this.templateID = templateID;
-        this.startTime = startTime;
-        this.workflowStatus = workflowStatus;
-        this.lastUpdateTime = lastUpdateTime;
-    }
-
-    public String getExperimentID() {
-        return experimentID;
-    }
-
-    public String getWorkflowInstanceID() {
-        return workflowInstanceID;
-    }
-
-    public String getTemplateID() {
-        return templateID;
-    }
-
-    public Timestamp getStartTime() {
-        return startTime;
-    }
-
-    public WorkflowExecutionStatus.State getWorkflowStatus() {
-        return workflowStatus;
-    }
-
-    public Timestamp getLastUpdateTime() {
-        return lastUpdateTime;
-    }
-
-    public void setExperimentID(String experimentID) {
-        this.experimentID = experimentID;
-    }
-
-    public void setWorkflowInstanceID(String workflowInstanceID) {
-        this.workflowInstanceID = workflowInstanceID;
-    }
-
-    public void setTemplateID(String templateID) {
-        this.templateID = templateID;
-    }
-
-    public void setStartTime(Timestamp startTime) {
-        this.startTime = startTime;
-    }
-
-    public void setWorkflowStatus(WorkflowExecutionStatus.State workflowStatus) {
-        this.workflowStatus = workflowStatus;
-    }
-
-    public void setLastUpdateTime(Timestamp lastUpdateTime) {
-        this.lastUpdateTime = lastUpdateTime;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-cpi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/pom.xml b/modules/registry/registry-cpi/pom.xml
index 57b7395..e9c2478 100644
--- a/modules/registry/registry-cpi/pom.xml
+++ b/modules/registry/registry-cpi/pom.xml
@@ -29,6 +29,11 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-common-utils</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/RegistrySettings.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/RegistrySettings.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/RegistrySettings.java
new file mode 100644
index 0000000..6c7bff0
--- /dev/null
+++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/RegistrySettings.java
@@ -0,0 +1,127 @@
+/*
+ *
+ * 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.registry.cpi.utils;
+
+import org.apache.airavata.common.utils.AiravataUtils;
+import org.apache.airavata.common.utils.ApplicationSettings;
+import org.apache.airavata.common.utils.StringUtil;
+import org.apache.airavata.registry.cpi.RegistryException;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.regex.Pattern;
+
+public class RegistrySettings {
+    private static final String REPOSITORY_PROPERTIES = "registry.properties";
+    private static Properties properties = new Properties();
+    private static Exception propertyLoadException;
+    private static final String REGISTRY_ACCESSOR_CLASS = "class.registry.accessor";
+    private static final String SAVE_APPLICATION_JOB_STATUS_HISTORY="enable.application.job.status.history";
+    
+    static{
+    	URL url = RegistrySettings.class.getClassLoader()
+				.getResource(REPOSITORY_PROPERTIES);
+		if (url == null) {
+    		if (AiravataUtils.isServer()){
+    			 url=RegistrySettings.class.getClassLoader().getResource(ApplicationSettings.SERVER_PROPERTIES);
+                if(url == null){
+                    url=RegistrySettings.class.getClassLoader().getResource(ApplicationSettings.CLIENT_PROPERTIES);
+                }
+    		}else if (AiravataUtils.isClient()){
+        		url=RegistrySettings.class.getClassLoader().getResource(ApplicationSettings.CLIENT_PROPERTIES);
+                if(url == null){
+                    url=RegistrySettings.class.getClassLoader().getResource(ApplicationSettings.SERVER_PROPERTIES);
+                }
+        	}else{
+        		//unknown execution mode... If so, first assume its client, if not server...
+        		url=RegistrySettings.class.getClassLoader().getResource(ApplicationSettings.CLIENT_PROPERTIES);
+        		if (url==null){
+        			url=RegistrySettings.class.getClassLoader().getResource(ApplicationSettings.SERVER_PROPERTIES);
+        		}
+        	}
+		}
+        try {
+            properties.load(url.openStream());
+        } catch (Exception e) {
+        	propertyLoadException=e;
+        }
+        System.out.println(url);
+    }
+    
+    private static void validateSuccessfulPropertyFileLoad() throws RegistryException{
+    	if (propertyLoadException!=null){
+    		throw new RegistryException(propertyLoadException);
+    	}
+    }
+    
+    public static String getSetting(String key) throws RegistryException{
+    	String rawValue=null;
+    	if (System.getProperties().containsKey(key)){
+    		rawValue=System.getProperties().getProperty(key);
+    	}else{
+    		validateSuccessfulPropertyFileLoad();
+	    	if (properties.containsKey(key)){
+	    		rawValue=properties.getProperty(key);
+	    	}else{
+	    		return null;		
+	    	}
+    	}
+    	return deriveAbsoluteValueImpl(rawValue);
+//    	throw new UnspecifiedRegistrySettingsException(key);
+    }
+    
+	private static String deriveAbsoluteValueImpl(String property){
+		if (property!=null){
+			Map<Integer, String> containedParameters = StringUtil.getContainedParameters(property);
+			List<String> parametersAlreadyProcessed=new ArrayList<String>();
+			for (String parameter : containedParameters.values()) {
+				if (!parametersAlreadyProcessed.contains(parameter)) {
+					String parameterName = parameter.substring(2,parameter.length() - 1);
+					String parameterValue = getSetting(parameterName,parameter);
+					property = property.replaceAll(Pattern.quote(parameter), parameterValue);
+					parametersAlreadyProcessed.add(parameter);
+				}
+			}
+		}
+		return property;
+	}
+    public static String getSetting(String key, String defaultValue){
+    	try {
+    		return getSetting(key);
+		} catch (RegistryException e) {
+			//we'll ignore this error since a default value is provided
+		}
+		return defaultValue;
+    }
+    
+    public static String getRegistryAccessorClass() throws RegistryException{
+
+        return getSetting(REGISTRY_ACCESSOR_CLASS);
+    }
+    
+    public static boolean isApplicationJobStatusHistoryEnabled(){
+    	return "true".equalsIgnoreCase(getSetting(SAVE_APPLICATION_JOB_STATUS_HISTORY, "false"));
+    }
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/test-suite/pom.xml
----------------------------------------------------------------------
diff --git a/modules/test-suite/pom.xml b/modules/test-suite/pom.xml
index d3a36ed..cb4b3fc 100644
--- a/modules/test-suite/pom.xml
+++ b/modules/test-suite/pom.xml
@@ -59,12 +59,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-registry-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <!-- Workflow Tracking -->
         <dependency>
             <groupId>org.apache.airavata</groupId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/workflow-model/workflow-engine/pom.xml
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-engine/pom.xml b/modules/workflow-model/workflow-engine/pom.xml
index 0c138b0..79286c4 100644
--- a/modules/workflow-model/workflow-engine/pom.xml
+++ b/modules/workflow-model/workflow-engine/pom.xml
@@ -236,12 +236,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-client-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-common-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -255,12 +249,6 @@
             <artifactId>airavata-jpa-registry</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-registry-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <!-- JCR Support -->
         <!-- TODO need clean up -->
         <dependency>

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreterConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreterConfiguration.java b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreterConfiguration.java
index ed963a1..6fa54c6 100644
--- a/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreterConfiguration.java
+++ b/modules/workflow-model/workflow-engine/src/main/java/org/apache/airavata/workflow/engine/interpretor/WorkflowInterpreterConfiguration.java
@@ -23,8 +23,6 @@ package org.apache.airavata.workflow.engine.interpretor;
 
 import org.apache.airavata.workflow.model.wf.Workflow;
 
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-
 public class WorkflowInterpreterConfiguration {
 //	public static final int GUI_MODE = 1;
 //	public static final int SERVER_MODE = 2;

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/ws-messenger/messagebox/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ws-messenger/messagebox/pom.xml b/modules/ws-messenger/messagebox/pom.xml
index c1a83e5..7b7da69 100644
--- a/modules/ws-messenger/messagebox/pom.xml
+++ b/modules/ws-messenger/messagebox/pom.xml
@@ -30,11 +30,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-client-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-common-utils</artifactId>
             <version>${project.version}</version>
         </dependency>

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/ws-messenger/messagebroker/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ws-messenger/messagebroker/pom.xml b/modules/ws-messenger/messagebroker/pom.xml
index df779a1..b62bded 100644
--- a/modules/ws-messenger/messagebroker/pom.xml
+++ b/modules/ws-messenger/messagebroker/pom.xml
@@ -54,11 +54,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-client-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
             <artifactId>airavata-common-utils</artifactId>
             <version>${project.version}</version>
         </dependency>

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/xbaya-gui/pom.xml
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/pom.xml b/modules/xbaya-gui/pom.xml
index 2200150..491d7c8 100644
--- a/modules/xbaya-gui/pom.xml
+++ b/modules/xbaya-gui/pom.xml
@@ -234,11 +234,6 @@
             <artifactId>airavata-jpa-registry</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-registry-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <!-- JCR Support -->
         <!-- TODO need clean up -->

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/PasswordCallbackImpl.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/PasswordCallbackImpl.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/PasswordCallbackImpl.java
index da83cb2..b4c9562 100644
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/PasswordCallbackImpl.java
+++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registry/PasswordCallbackImpl.java
@@ -1,39 +1,39 @@
-/*
- *
- * 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 org.apache.airavata.registry.api.PasswordCallback;
-
-public class PasswordCallbackImpl implements PasswordCallback {
-    private String username;
-    private String password;
-
-    public PasswordCallbackImpl(String username, String password) {
-        this.username = username;
-        this.password = password;
-    }
-
-    @Override
-    public String getPassword(String username) {
-       return password;
-    }
-}
+///*
+// *
+// * 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 org.apache.airavata.registry.api.PasswordCallback;
+//
+//public class PasswordCallbackImpl implements PasswordCallback {
+//    private String username;
+//    private String password;
+//
+//    public PasswordCallbackImpl(String username, String password) {
+//        this.username = username;
+//        this.password = password;
+//    }
+//
+//    @Override
+//    public String getPassword(String username) {
+//       return password;
+//    }
+//}

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f15ce48..69cd5c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -493,12 +493,12 @@
             <modules>
                 <module>modules/configuration</module>
                 <module>airavata-api</module>
+                <module>modules/airavata-client</module>
                 <module>modules/commons</module>
                 <module>modules/gfac</module>
                 <module>modules/workflow-model</module>
                 <module>modules/registry</module>
                 <module>modules/app-catalog</module>
-                <module>modules/airavata-client</module>
                 <module>modules/security</module>
                 <module>modules/credential-store-service</module>
                 <module>modules/orchestrator</module>

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/samples/java-client/experiment/pom.xml
----------------------------------------------------------------------
diff --git a/samples/java-client/experiment/pom.xml b/samples/java-client/experiment/pom.xml
index 33346c0..8e2e414 100644
--- a/samples/java-client/experiment/pom.xml
+++ b/samples/java-client/experiment/pom.xml
@@ -58,28 +58,6 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-client-api</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-registry-api</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-simple</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
             <version>1.9.2</version>

http://git-wip-us.apache.org/repos/asf/airavata/blob/f72637f2/tools/registry-tool/pom.xml
----------------------------------------------------------------------
diff --git a/tools/registry-tool/pom.xml b/tools/registry-tool/pom.xml
index 1b485a3..fa871ba 100644
--- a/tools/registry-tool/pom.xml
+++ b/tools/registry-tool/pom.xml
@@ -23,11 +23,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-registry-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
             <version>10.9.1.0</version>


Mime
View raw message