airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject git commit: adding new functions to the handler
Date Wed, 21 May 2014 05:50:34 GMT
Repository: airavata
Updated Branches:
  refs/heads/master fef7c4ac0 -> 1bb816a82


adding new functions to the handler


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1bb816a8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1bb816a8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1bb816a8

Branch: refs/heads/master
Commit: 1bb816a829310b319e27d92fd73e99a8c9b19a70
Parents: fef7c4a
Author: Saminda Wijeratne <samindaw@gmail.com>
Authored: Tue May 20 22:50:20 2014 -0700
Committer: Saminda Wijeratne <samindaw@gmail.com>
Committed: Tue May 20 22:50:20 2014 -0700

----------------------------------------------------------------------
 .../handler/ApplicationCatalogHandler.java      | 22 ++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/1bb816a8/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java
b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java
index fa5415a..f19e757 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java
@@ -39,6 +39,7 @@ import org.apache.airavata.model.appcatalog.ApplicationInterface;
 import org.apache.airavata.model.appcatalog.ComputeResourceDescription;
 import org.apache.airavata.model.appcatalog.GSISSHJobSubmission;
 import org.apache.airavata.model.appcatalog.GlobusJobSubmission;
+import org.apache.airavata.model.appcatalog.GridFTPDataMovement;
 import org.apache.airavata.model.appcatalog.JobSubmissionProtocol;
 import org.apache.airavata.model.appcatalog.SCPDataMovement;
 import org.apache.airavata.model.appcatalog.SSHJobSubmission;
@@ -228,7 +229,7 @@ public class ApplicationCatalogHandler implements Iface {
 		try {
 			HostDescription hostDescriptor = getRegistry().getHostDescriptor(scpDataMovementResourceId);
 			SCPDataMovement d = new SCPDataMovement();
-			d.setDataSubmissionDataID(scpDataMovementResourceId);
+			d.setDataMovementDataID(scpDataMovementResourceId);
 			if (hostDescriptor.getType() instanceof GlobusHostType){
 				GlobusHostType globusHostType = (GlobusHostType)hostDescriptor.getType();
 				d.setSshPort(22);
@@ -447,7 +448,7 @@ public class ApplicationCatalogHandler implements Iface {
 			HostDescription hostDescriptor = getRegistry().getHostDescriptor(computeResourceId);
 			hostDescriptor.getType().changeType(GlobusHostType.type);
 			GlobusHostType s = (GlobusHostType)hostDescriptor.getType();
-			s.setGlobusGateKeeperEndPointArray(jobSubmission.getGlobusGateKeeperEndPoint().toArray(new
String[]{}));
+//			s.setGlobusGateKeeperEndPointArray(dataMovement.getGlobusGateKeeperEndPoint().toArray(new
String[]{}));
 			getRegistry().updateHostDescriptor(hostDescriptor);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -455,6 +456,23 @@ public class ApplicationCatalogHandler implements Iface {
 		}
 		
 	}
+
+	@Override
+	public void addGridFTPDataMovementProtocol(String computeResourceId,
+			GridFTPDataMovement dataMovement) throws InvalidRequestException,
+			AiravataClientException, AiravataSystemException, TException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public GridFTPDataMovement getGridFTPDataMovementProtocol(
+			String gridFTPDataMovementResourceId)
+			throws InvalidRequestException, AiravataClientException,
+			AiravataSystemException, TException {
+		// TODO Auto-generated method stub
+		return null;
+	}
 	
 	
 	


Mime
View raw message