airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Date Wed, 23 Apr 2014 02:08:25 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata


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

Branch: refs/heads/master
Commit: 49eea6f151b28f55933dc370cbc3f31c987eb030
Parents: 67b44a1 f2b5df4
Author: Saminda Wijeratne <samindaw@gmail.com>
Authored: Tue Apr 22 19:08:02 2014 -0700
Committer: Saminda Wijeratne <samindaw@gmail.com>
Committed: Tue Apr 22 19:08:02 2014 -0700

----------------------------------------------------------------------
 .../client/samples/CreateLaunchExperiment.java  |   6 +-
 modules/airavata-client/pom.xml                 |  12 +-
 .../context/security/SSHSecurityContext.java    | 120 ---------
 .../gfac/handler/AdvancedSCPInputHandler.java   | 139 ----------
 .../gfac/handler/AdvancedSCPOutputHandler.java  | 115 --------
 .../gfac/handler/SCPDirectorySetupHandler.java  | 100 -------
 .../airavata/gfac/handler/SCPInputHandler.java  | 138 ----------
 .../airavata/gfac/handler/SCPOutputHandler.java | 175 -------------
 .../gfac/provider/impl/SSHProvider.java         | 261 -------------------
 .../services/impl/BigRed2TestWithSSHAuth.java   | 253 ------------------
 .../impl/SSHProviderTestWithSSHAuth.java        | 172 ------------
 .../airavata/job/monitor/AMQPMonitorTest.java   |  18 +-
 modules/gfac/gfac-ssh/pom.xml                   | 132 ++++++++++
 .../context/security/SSHSecurityContext.java    | 120 +++++++++
 .../gfac/handler/AdvancedSCPInputHandler.java   | 139 ++++++++++
 .../gfac/handler/AdvancedSCPOutputHandler.java  | 115 ++++++++
 .../gfac/handler/SCPDirectorySetupHandler.java  | 100 +++++++
 .../airavata/gfac/handler/SCPInputHandler.java  | 138 ++++++++++
 .../airavata/gfac/handler/SCPOutputHandler.java | 175 +++++++++++++
 .../gfac/provider/impl/SSHProvider.java         | 261 +++++++++++++++++++
 .../src/main/resources/errors.properties        | 197 ++++++++++++++
 .../src/main/resources/service.properties       |  58 +++++
 .../services/impl/BigRed2TestWithSSHAuth.java   | 253 ++++++++++++++++++
 .../impl/SSHProviderTestWithSSHAuth.java        | 172 ++++++++++++
 .../src/test/resources/PBSTemplate.xslt         |  73 ++++++
 .../gfac-ssh/src/test/resources/gfac-config.xml |  33 +++
 .../src/test/resources/logging.properties       |  42 +++
 modules/gfac/pom.xml                            |   1 +
 .../airavata/gsi/ssh/config/ConfigReader.java   |   6 +
 .../apache/airavata/job/AMQPMonitorTest.java    |  22 +-
 .../job/QstatMonitorTestWithMyProxyAuth.java    |  10 +-
 31 files changed, 2045 insertions(+), 1511 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/49eea6f1/modules/gfac/gfac-monitor/src/test/java/org/apache/airavata/job/monitor/AMQPMonitorTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/49eea6f1/tools/job-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java
----------------------------------------------------------------------
diff --cc tools/job-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java
index c0e579e,83586b3..f2b9ccd
--- a/tools/job-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java
+++ b/tools/job-monitor/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java
@@@ -150,9 -150,9 +150,9 @@@ public class AMQPMonitorTest 
          String jobID = pbsCluster.submitBatchJob(jobDescriptor);
          System.out.println(jobID);
          try {
 -            pushQueue.add(new MonitorID(hostDescription, jobID,null,null, "ogce"));
 +            pushQueue.add(new MonitorID(hostDescription, jobID,null,null,null, "ogce"));
          } catch (Exception e) {
-             e.printStackTrace();  //To change body of catch statement use File | Settings
| File Templates.
+             e.printStackTrace();
          }
          try {
              pushThread.join();

http://git-wip-us.apache.org/repos/asf/airavata/blob/49eea6f1/tools/job-monitor/src/test/java/org/apache/airavata/job/QstatMonitorTestWithMyProxyAuth.java
----------------------------------------------------------------------


Mime
View raw message