airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject svn commit: r1408042 - in /airavata/sandbox/grid-tools/gram-client: ./ src/main/java/org/apache/airavata/jobsubmission/ src/main/java/org/apache/airavata/jobsubmission/context/ src/main/java/org/apache/airavata/jobsubmission/gram/ src/main/java/org/apa...
Date Sun, 11 Nov 2012 16:24:50 GMT
Author: smarru
Date: Sun Nov 11 16:24:48 2012
New Revision: 1408042

URL: http://svn.apache.org/viewvc?rev=1408042&view=rev
Log:
Removing all file transfer components and creating a light weight job submission client addressing
AIRAVATA-640

Added:
    airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/
      - copied from r1408021, airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/context/
    airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/SecurityContext.java
      - copied, changed from r1408021, airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/context/ApplicationContext.java
Removed:
    airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/context/
    airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/gram/FileTransfer.java
    airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/gram/JobSubmittionListener.java
    airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/ApplicationContext.java
    airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/utils/GridFTPContactInfo.java
    airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/utils/GridFtp.java
    airavata/sandbox/grid-tools/gram-client/testFileTransfer.sh
Modified:
    airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/CancelJob.java
    airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/JobStatus.java
    airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/JobSubmission.java
    airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/gram/ExectionContext.java
    airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/CertificateManager.java
    airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/MyProxyCredentials.java
    airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/utils/ServiceConstants.java
    airavata/sandbox/grid-tools/gram-client/src/main/resources/airavata-gram-client.properties

Modified: airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/CancelJob.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/CancelJob.java?rev=1408042&r1=1408041&r2=1408042&view=diff
==============================================================================
--- airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/CancelJob.java
(original)
+++ airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/CancelJob.java
Sun Nov 11 16:24:48 2012
@@ -21,8 +21,8 @@
 
 package org.apache.airavata.jobsubmission;
 
-import org.apache.airavata.jobsubmission.context.ApplicationContext;
 import org.apache.airavata.jobsubmission.gram.ExectionContext;
+import org.apache.airavata.jobsubmission.security.SecurityContext;
 import org.apache.log4j.Logger;
 import org.globus.gram.GramJob;
 import org.ietf.jgss.GSSCredential;
@@ -40,7 +40,7 @@ public class CancelJob {
 	}
 public static void main(String[] args) {
 	try {
-		ApplicationContext context = new ApplicationContext();
+		SecurityContext context = new SecurityContext();
 		context.login();
 		CancelJob job = new CancelJob();
 		String jobURL = "https://lslogin2.lonestar.tacc.utexas.edu:50385/16073824805448638521/14062883951572193460/";

Modified: airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/JobStatus.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/JobStatus.java?rev=1408042&r1=1408041&r2=1408042&view=diff
==============================================================================
--- airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/JobStatus.java
(original)
+++ airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/JobStatus.java
Sun Nov 11 16:24:48 2012
@@ -21,7 +21,7 @@
 
 package org.apache.airavata.jobsubmission;
 
-import org.apache.airavata.jobsubmission.context.ApplicationContext;
+import org.apache.airavata.jobsubmission.security.SecurityContext;
 import org.globus.gram.GramJob;
 
 public class JobStatus {
@@ -31,7 +31,7 @@ public class JobStatus {
      */
     public static void main(String[] args) {
         try {
-            ApplicationContext context = new ApplicationContext();
+            SecurityContext context = new SecurityContext();
             context.login();
 
             String rsl = "";

Modified: airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/JobSubmission.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/JobSubmission.java?rev=1408042&r1=1408041&r2=1408042&view=diff
==============================================================================
--- airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/JobSubmission.java
(original)
+++ airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/JobSubmission.java
Sun Nov 11 16:24:48 2012
@@ -21,9 +21,9 @@
 
 package org.apache.airavata.jobsubmission;
 
-import org.apache.airavata.jobsubmission.context.ApplicationContext;
 import org.apache.airavata.jobsubmission.gram.ExectionContext;
 import org.apache.airavata.jobsubmission.gram.GramJobSubmission;
+import org.apache.airavata.jobsubmission.security.SecurityContext;
 import org.apache.log4j.Logger;
 import org.ietf.jgss.GSSCredential;
 
@@ -31,12 +31,12 @@ public class JobSubmission {
 
     private static final Logger log = Logger.getLogger(JobSubmission.class);
     private static ExectionContext contextExectionContext;
-    private static ApplicationContext context;
+    private static SecurityContext context;
     private static String newline = System.getProperty("line.separator");
 
-    public static synchronized ApplicationContext getContext() throws Exception {
+    public static synchronized SecurityContext getContext() throws Exception {
         if (context == null) {
-            context = new ApplicationContext();
+            context = new SecurityContext();
             try {
                 context.login();
             } catch (Exception e) {
@@ -80,7 +80,7 @@ public class JobSubmission {
 
     public static void main(String[] args) {
         try {
-            ApplicationContext context = new ApplicationContext();
+            SecurityContext context = new SecurityContext();
             context.login();
 
             StringBuffer jobstatus = new StringBuffer();

Modified: airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/gram/ExectionContext.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/gram/ExectionContext.java?rev=1408042&r1=1408041&r2=1408042&view=diff
==============================================================================
--- airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/gram/ExectionContext.java
(original)
+++ airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/gram/ExectionContext.java
Sun Nov 11 16:24:48 2012
@@ -33,11 +33,8 @@ public class ExectionContext {
     private String testingHost;
     
     private String lonestarGRAM;
-    private String lonestarGridFTP;
     private String rangerGRAM;
-    private String rangerGridFTP;
     private String trestlesGRAM;
-    private String trestlesGridFTP;
     
     private String workingDir;
     private String tmpDir;
@@ -60,10 +57,6 @@ public class ExectionContext {
     private Integer hostCount;
     private String jobType;
     private String arguments;
-    private String gridFTPServerSource;
-    private String sourcedataLocation;
-    private String gridFTPServerDest;
-    private String destdataLocation;
 
     public static final String PROPERTY_FILE = "airavata-gram-client.properties";
 
@@ -82,11 +75,8 @@ public class ExectionContext {
             String testinghost = properties.getProperty(ServiceConstants.TESTINGHOST);
             
             String lonestargram = properties.getProperty(ServiceConstants.LONESTARGRAMEPR);
-            String lonestargridftp = properties.getProperty(ServiceConstants.LONESTARGRIDFTPEPR);
             String rangergram = properties.getProperty(ServiceConstants.RANGERGRAMEPR);
-            String rangergridftp = properties.getProperty(ServiceConstants.RANGERGRIDFTPEPR);
             String trestlesgram = properties.getProperty(ServiceConstants.TRESTLESGRAMEPR);
-            String trestlesgridftp = properties.getProperty(ServiceConstants.TRESTLESGRIDFTPEPR);
 
             String exec = properties.getProperty(ServiceConstants.EXECUTABLE);
             String args = properties.getProperty(ServiceConstants.ARGUMENTS);
@@ -96,10 +86,6 @@ public class ExectionContext {
             String mwt = properties.getProperty(ServiceConstants.MAX_WALL_TIME);
             String pc = properties.getProperty(ServiceConstants.PCOUNT);
             String hc = properties.getProperty(ServiceConstants.HOSTCOUNT);
-            String gridFTPServerSource = properties.getProperty(ServiceConstants.GRIDFTPSERVERSOURCE);
-            String gridFTPSourcePath = properties.getProperty(ServiceConstants.GRIDFTPSOURCEPATH);
-            String gridFTPServerDest = properties.getProperty(ServiceConstants.GRIDFTPSERVERDEST);
-            String gridFTPDestPath = properties.getProperty(ServiceConstants.GRIDFTPDESTPATH);
 
             if (testinghost != null) {
                 this.testingHost = testinghost;
@@ -108,21 +94,12 @@ public class ExectionContext {
             if (lonestargram != null) {
                 this.lonestarGRAM = lonestargram;
             }
-            if (lonestargridftp != null) {
-                this.lonestarGridFTP = lonestargridftp;
-            }
             if (rangergram != null) {
                 this.rangerGRAM = rangergram;
             }
-            if (rangergridftp != null) {
-                this.rangerGridFTP= rangergridftp;
-            }
             if (trestlesgram != null) {
                 this.trestlesGRAM = trestlesgram;
             }
-            if (trestlesgridftp != null) {
-                this.trestlesGridFTP = trestlesgridftp;
-            }
             
             if (exec != null) {
                 this.executable = exec;
@@ -160,18 +137,6 @@ public class ExectionContext {
                     this.hostCount = 1;
                 }
             }
-            if (gridFTPServerSource != null && !gridFTPServerSource.isEmpty()) {
-                this.gridFTPServerSource = gridFTPServerSource;
-            }
-            if (gridFTPSourcePath != null && !gridFTPSourcePath.isEmpty()) {
-                this.sourcedataLocation = gridFTPSourcePath;
-            }
-            if (gridFTPServerDest != null && !gridFTPServerDest.isEmpty()) {
-                this.gridFTPServerDest = gridFTPServerDest;
-            }
-            if (gridFTPDestPath != null && !gridFTPDestPath.isEmpty()) {
-                this.destdataLocation = gridFTPDestPath;
-            }
 
         }
     }
@@ -192,14 +157,6 @@ public class ExectionContext {
         this.lonestarGRAM = lonestarGRAM;
     }
 
-    public String getLonestarGridFTP() {
-        return lonestarGridFTP;
-    }
-
-    public void setLonestarGridFTP(String lonestarGridFTP) {
-        this.lonestarGridFTP = lonestarGridFTP;
-    }
-
     public String getRangerGRAM() {
         return rangerGRAM;
     }
@@ -208,14 +165,6 @@ public class ExectionContext {
         this.rangerGRAM = rangerGRAM;
     }
 
-    public String getRangerGridFTP() {
-        return rangerGridFTP;
-    }
-
-    public void setRangerGridFTP(String rangerGridFTP) {
-        this.rangerGridFTP = rangerGridFTP;
-    }
-
     public String getTrestlesGRAM() {
         return trestlesGRAM;
     }
@@ -224,14 +173,6 @@ public class ExectionContext {
         this.trestlesGRAM = trestlesGRAM;
     }
 
-    public String getTrestlesGridFTP() {
-        return trestlesGridFTP;
-    }
-
-    public void setTrestlesGridFTP(String trestlesGridFTP) {
-        this.trestlesGridFTP = trestlesGridFTP;
-    }
-
     /**
      * @return the workingDir
      */
@@ -518,36 +459,4 @@ public class ExectionContext {
     public String getArguments() {
         return arguments;
     }
-
-    public String getGridFTPServerSource() {
-        return gridFTPServerSource;
-    }
-
-    public void setGridFTPServerSource(String gridFTPServerSource) {
-        this.gridFTPServerSource = gridFTPServerSource;
-    }
-
-    public String getSourcedataLocation() {
-        return sourcedataLocation;
-    }
-
-    public void setSourcedataLocation(String sourcedataLocation) {
-        this.sourcedataLocation = sourcedataLocation;
-    }
-
-    public String getGridFTPServerDest() {
-        return gridFTPServerDest;
-    }
-
-    public void setGridFTPServerDest(String gridFTPServerDest) {
-        this.gridFTPServerDest = gridFTPServerDest;
-    }
-
-    public String getDestdataLocation() {
-        return destdataLocation;
-    }
-
-    public void setDestdataLocation(String destdataLocation) {
-        this.destdataLocation = destdataLocation;
-    }
 }

Modified: airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/CertificateManager.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/CertificateManager.java?rev=1408042&r1=1408021&r2=1408042&view=diff
==============================================================================
--- airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/CertificateManager.java
(original)
+++ airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/CertificateManager.java
Sun Nov 11 16:24:48 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.jobsubmission.context;
+package org.apache.airavata.jobsubmission.security;
 
 import java.io.InputStream;
 import java.security.GeneralSecurityException;

Modified: airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/MyProxyCredentials.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/MyProxyCredentials.java?rev=1408042&r1=1408021&r2=1408042&view=diff
==============================================================================
--- airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/MyProxyCredentials.java
(original)
+++ airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/MyProxyCredentials.java
Sun Nov 11 16:24:48 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.jobsubmission.context;
+package org.apache.airavata.jobsubmission.security;
 
 import java.io.File;
 import java.io.FileInputStream;

Copied: airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/SecurityContext.java
(from r1408021, airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/context/ApplicationContext.java)
URL: http://svn.apache.org/viewvc/airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/SecurityContext.java?p2=airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/SecurityContext.java&p1=airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/context/ApplicationContext.java&r1=1408021&r2=1408042&rev=1408042&view=diff
==============================================================================
--- airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/context/ApplicationContext.java
(original)
+++ airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/security/SecurityContext.java
Sun Nov 11 16:24:48 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.jobsubmission.context;
+package org.apache.airavata.jobsubmission.security;
 
 import java.io.File;
 import java.io.InputStream;
@@ -31,7 +31,7 @@ import org.apache.log4j.Logger;
 import org.globus.myproxy.MyProxy;
 import org.ietf.jgss.GSSCredential;
 
-public class ApplicationContext {
+public class SecurityContext {
 
     /**
 	 * 
@@ -42,7 +42,7 @@ public class ApplicationContext {
     protected GSSCredential gssCredential;
 
     private MyProxyCredentials credentials;
-    private static final Logger log = Logger.getLogger(ApplicationContext.class);
+    private static final Logger log = Logger.getLogger(SecurityContext.class);
 
     /**
      * 
@@ -51,7 +51,7 @@ public class ApplicationContext {
      * @throws GfacGUIException
      */
 
-    public ApplicationContext() throws Exception {
+    public SecurityContext() throws Exception {
         log.setLevel(org.apache.log4j.Level.INFO);
         loadConfiguration();
 
@@ -59,7 +59,7 @@ public class ApplicationContext {
 
     public static void main(String[] args) {
         try {
-            ApplicationContext context = new ApplicationContext();
+            SecurityContext context = new SecurityContext();
             context.login();
         } catch (Exception e) {
             e.printStackTrace();
@@ -76,7 +76,7 @@ public class ApplicationContext {
 
     public static String getProperty(String name) {
         try {
-            ApplicationContext context = new ApplicationContext();
+            SecurityContext context = new SecurityContext();
             return context.getProperties().getProperty(name);
         } catch (Exception e) {
             e.printStackTrace();

Modified: airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/utils/ServiceConstants.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/utils/ServiceConstants.java?rev=1408042&r1=1408041&r2=1408042&view=diff
==============================================================================
--- airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/utils/ServiceConstants.java
(original)
+++ airavata/sandbox/grid-tools/gram-client/src/main/java/org/apache/airavata/jobsubmission/utils/ServiceConstants.java
Sun Nov 11 16:24:48 2012
@@ -34,11 +34,8 @@ public class ServiceConstants {
 	public static final String TESTINGHOST = "testing.host";
 	
     public static final String LONESTARGRAMEPR = "lonestar.gram.endpoint";
-    public static final String LONESTARGRIDFTPEPR = "lonestar.gridftp.endpoint";
     public static final String RANGERGRAMEPR = "ranger.gram.endpoint";
-    public static final String RANGERGRIDFTPEPR = "ranger.gridftp.endpoint";
     public static final String TRESTLESGRAMEPR = "trestles.gram.endpoint";
-    public static final String TRESTLESGRIDFTPEPR = "trestles.gridftp.endpoint";
 	
 	public static final String EXECUTABLE = "executable";
 	public static final String ARGUMENTS = "arguments";
@@ -48,10 +45,5 @@ public class ServiceConstants {
 	public static final String JOB_TYPE = "jobtype";
 	public static final String PCOUNT = "processors";
 	public static final String HOSTCOUNT = "hosts";
-	
-	public static final String GRIDFTPSERVERSOURCE = "gridftpserverSource";
-	public static final String GRIDFTPSOURCEPATH = "gridftpSourcePath";
-	public static final String GRIDFTPSERVERDEST = "gridftpserverDest";
-	public static final String GRIDFTPDESTPATH = "gridftpDestPath";
 
 }

Modified: airavata/sandbox/grid-tools/gram-client/src/main/resources/airavata-gram-client.properties
URL: http://svn.apache.org/viewvc/airavata/sandbox/grid-tools/gram-client/src/main/resources/airavata-gram-client.properties?rev=1408042&r1=1408041&r2=1408042&view=diff
==============================================================================
--- airavata/sandbox/grid-tools/gram-client/src/main/resources/airavata-gram-client.properties
(original)
+++ airavata/sandbox/grid-tools/gram-client/src/main/resources/airavata-gram-client.properties
Sun Nov 11 16:24:48 2012
@@ -12,15 +12,12 @@ testing.host=trestles
 
 ## TACC Lonestar         
 lonestar.gram.endpoint=gridftp1.ls4.tacc.utexas.edu:2119/jobmanager-sge
-lonestar.gridftp.endpoint=gsiftp://gridftp1.ls4.tacc.utexas.edu:2811/
 
 ## TACC Ranger        
 ranger.gram.endpoint=gatekeeper.ranger.tacc.teragrid.org:2119/jobmanager-sge
-ranger.gridftp.endpoint=gsiftp://gridftp.ranger.tacc.teragrid.org:2811/
 
 ## SDSC Trestles        
 trestles.gram.endpoint=trestles-login2.sdsc.edu:2119/jobmanager-pbstest2
-trestles.gridftp.endpoint=gsiftp://trestles.sdsc.edu:2811/
 
 executable=/bin/hostname
 arguments=30
@@ -29,9 +26,4 @@ project_number=TG-STA110014S
 jobtype=single
 maxwalltime=1
 processors=1
-hosts=1
-gridftpserverSource=gsiftp://gridftp.ranger.tacc.teragrid.org:2812/
-gridftpSourcePath=/share/home/01314/ultrasca/qwtplot3d-0.2.6.tgz
-gridftpserverDest=gsiftp://trestles-dm1.sdsc.edu:2811/
-gsiftp://trestles.sdsc.edu:2811/
-gridftpDestPath=/oasis/projects/nsf/uot111/us3/jobs/US-SOMO_Thu_May_10_14_46_38_EST_2012_57f53af6-7e8d-44a4-acb2-144d59475d54/qwtplot3d-0.2.6.tgz
\ No newline at end of file
+hosts=1
\ No newline at end of file



Mime
View raw message