airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject git commit: fixing build error to make qstat work - AIRAVATA-1023
Date Mon, 24 Feb 2014 19:31:48 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 81faafb91 -> bd217f86f


fixing build error to make qstat work - AIRAVATA-1023


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

Branch: refs/heads/master
Commit: bd217f86f5179581dff431176b37dc07f73379e7
Parents: 81faafb
Author: lahiru <lahiru@apache.org>
Authored: Mon Feb 24 14:31:39 2014 -0500
Committer: lahiru <lahiru@apache.org>
Committed: Mon Feb 24 14:31:39 2014 -0500

----------------------------------------------------------------------
 modules/airavata-job-monitor/pom.xml            |  7 +++---
 .../job/monitor/AiravataJobStatusUpdator.java   |  2 +-
 .../job/monitor/core/MessageParser.java         |  1 -
 .../monitor/impl/pull/qstat/QstatMonitor.java   |  5 +---
 .../impl/pull/qstat/ResourceConnection.java     |  3 +--
 .../airavata/job/monitor/state/JobStatus.java   |  8 +++---
 .../src/test/resources/gsissh.properties        | 26 ++++++++++++++++++++
 7 files changed, 37 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/bd217f86/modules/airavata-job-monitor/pom.xml
----------------------------------------------------------------------
diff --git a/modules/airavata-job-monitor/pom.xml b/modules/airavata-job-monitor/pom.xml
index d42e25e..4476a5d 100644
--- a/modules/airavata-job-monitor/pom.xml
+++ b/modules/airavata-job-monitor/pom.xml
@@ -48,13 +48,14 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk16</artifactId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.48</version>
         </dependency>
-        <!--dependency>
+        <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
             <version>1.48</version>
-        </dependency-->
+        </dependency>
         <!-- Logging -->
         <dependency>
             <groupId>org.slf4j</groupId>

http://git-wip-us.apache.org/repos/asf/airavata/blob/bd217f86/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/AiravataJobStatusUpdator.java
----------------------------------------------------------------------
diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/AiravataJobStatusUpdator.java
b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/AiravataJobStatusUpdator.java
index db76e1d..8ce7f34 100644
--- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/AiravataJobStatusUpdator.java
+++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/AiravataJobStatusUpdator.java
@@ -22,7 +22,7 @@ package org.apache.airavata.job.monitor;
 
 import com.google.common.eventbus.Subscribe;
 import org.apache.airavata.job.monitor.state.JobStatus;
-import org.apache.airavata.model.experiment.JobState;
+import org.apache.airavata.model.workspace.experiment.JobState;
 import org.apache.airavata.registry.cpi.Registry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/airavata/blob/bd217f86/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/core/MessageParser.java
----------------------------------------------------------------------
diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/core/MessageParser.java
b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/core/MessageParser.java
index 4d54fae..cd827ca 100644
--- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/core/MessageParser.java
+++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/core/MessageParser.java
@@ -22,7 +22,6 @@ package org.apache.airavata.job.monitor.core;
 
 import org.apache.airavata.job.monitor.MonitorID;
 import org.apache.airavata.job.monitor.state.JobStatus;
-import org.apache.airavata.model.experiment.JobState;
 
 /**
  * This is an interface to implement messageparser, it could be

http://git-wip-us.apache.org/repos/asf/airavata/blob/bd217f86/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/QstatMonitor.java
----------------------------------------------------------------------
diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/QstatMonitor.java
b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/QstatMonitor.java
index a5d1553..9568691 100644
--- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/QstatMonitor.java
+++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/QstatMonitor.java
@@ -26,16 +26,13 @@ import org.apache.airavata.job.monitor.core.PullMonitor;
 import org.apache.airavata.job.monitor.event.MonitorPublisher;
 import org.apache.airavata.job.monitor.exception.AiravataMonitorException;
 import org.apache.airavata.job.monitor.state.JobStatus;
-import org.apache.airavata.model.experiment.JobState;
-import org.apache.derby.client.am.DateTime;
+import org.apache.airavata.model.workspace.experiment.JobState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.net.ssl.SSLEngineResult;
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/bd217f86/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/ResourceConnection.java
----------------------------------------------------------------------
diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/ResourceConnection.java
b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/ResourceConnection.java
index 2867f74..8568da5 100644
--- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/ResourceConnection.java
+++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/ResourceConnection.java
@@ -31,8 +31,7 @@ import org.apache.airavata.gsi.ssh.jsch.ExtendedJSch;
 import org.apache.airavata.gsi.ssh.util.SSHAPIUIKeyboardInteractive;
 import org.apache.airavata.gsi.ssh.util.SSHKeyPasswordHandler;
 import org.apache.airavata.job.monitor.MonitorID;
-import org.apache.airavata.job.monitor.state.JobStatus;
-import org.apache.airavata.model.experiment.JobState;
+import org.apache.airavata.model.workspace.experiment.JobState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/bd217f86/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/state/JobStatus.java
----------------------------------------------------------------------
diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/state/JobStatus.java
b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/state/JobStatus.java
index 56b2798..957e168 100644
--- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/state/JobStatus.java
+++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/state/JobStatus.java
@@ -21,7 +21,7 @@
 package org.apache.airavata.job.monitor.state;
 
 import org.apache.airavata.job.monitor.MonitorID;
-import org.apache.airavata.model.experiment.JobState;
+import org.apache.airavata.model.workspace.experiment.JobState;
 
 /**
  * This is the primary job state object used in
@@ -31,15 +31,15 @@ import org.apache.airavata.model.experiment.JobState;
  * the monitoring ID
  */
 public class JobStatus {
-    private org.apache.airavata.model.experiment.JobState state;
+    private JobState state;
 
     private MonitorID monitorID;
 
-    public org.apache.airavata.model.experiment.JobState getState() {
+    public JobState getState() {
         return state;
     }
 
-    public void setState(org.apache.airavata.model.experiment.JobState state) {
+    public void setState(JobState state) {
         this.state = state;
     }
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/bd217f86/modules/airavata-job-monitor/src/test/resources/gsissh.properties
----------------------------------------------------------------------
diff --git a/modules/airavata-job-monitor/src/test/resources/gsissh.properties b/modules/airavata-job-monitor/src/test/resources/gsissh.properties
new file mode 100644
index 0000000..3fdf76d
--- /dev/null
+++ b/modules/airavata-job-monitor/src/test/resources/gsissh.properties
@@ -0,0 +1,26 @@
+#
+#
+# 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.
+#
+
+###########################################################################
+# Specifies system level configurations as a key/value pairs.
+###########################################################################
+
+StrictHostKeyChecking=no
+ssh.session.timeout=360000


Mime
View raw message