airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject git commit: https://issues.apache.org/jira/browse/AIRAVATA-1048
Date Tue, 04 Mar 2014 18:10:02 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 5e851e665 -> bad1273b1


https://issues.apache.org/jira/browse/AIRAVATA-1048


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

Branch: refs/heads/master
Commit: bad1273b19c950ed507a38e5e44ec5ecacb6a78c
Parents: 5e851e6
Author: lahiru <lahiru@apache.org>
Authored: Tue Mar 4 13:09:53 2014 -0500
Committer: lahiru <lahiru@apache.org>
Committed: Tue Mar 4 13:09:53 2014 -0500

----------------------------------------------------------------------
 .../client/samples/CreateLaunchExperiment.java  |  2 +-
 .../src/main/resources/monitor.properties       |  2 --
 .../airavata/job/monitor/QstatMonitorTest.java  |  1 -
 .../apache/airavata/common/utils/Constants.java |  1 -
 .../server/OrchestratorServerHandler.java       | 14 +++--------
 .../main/resources/airavata-server.properties   | 26 ++++++++++++++++++--
 .../src/main/resources/monitor.properties       |  9 -------
 .../src/main/resources/orchestrator.properties  | 26 --------------------
 .../orchestrator/core/job/JobSubmitter.java     |  2 +-
 .../core/utils/OrchestratorConstants.java       |  1 -
 .../core/utils/OrchestratorUtils.java           | 11 ++-------
 .../cpi/impl/AbstractOrchestrator.java          |  2 +-
 .../main/resources/airavata-server.properties   | 20 +++++++++++++++
 .../src/main/resources/orchestrator.properties  | 26 --------------------
 .../test/resources/airavata-server.properties   | 23 ++++++++++++++++-
 .../src/test/resources/orchestrator.properties  | 26 --------------------
 .../gsi/ssh/impl/DefaultSSHApiTest.java         |  1 -
 17 files changed, 75 insertions(+), 118 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index fd90bf6..1773700 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -81,7 +81,7 @@ public class CreateLaunchExperiment {
                      }
                  }
             });
-            monitor.start();
+//            monitor.start();
             try {
                 monitor.join();
             } catch (InterruptedException e) {

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/modules/airavata-job-monitor/src/main/resources/monitor.properties
----------------------------------------------------------------------
diff --git a/modules/airavata-job-monitor/src/main/resources/monitor.properties b/modules/airavata-job-monitor/src/main/resources/monitor.properties
deleted file mode 100644
index 0b0b5f4..0000000
--- a/modules/airavata-job-monitor/src/main/resources/monitor.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-amqp.hosts=info1.dyn.teragrid.org,info2.dyn.teragrid.org
-connection.name=xsede_private
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/modules/airavata-job-monitor/src/test/java/org/apache/airavata/job/monitor/QstatMonitorTest.java
----------------------------------------------------------------------
diff --git a/modules/airavata-job-monitor/src/test/java/org/apache/airavata/job/monitor/QstatMonitorTest.java
b/modules/airavata-job-monitor/src/test/java/org/apache/airavata/job/monitor/QstatMonitorTest.java
index 708fbf0..6b1074a 100644
--- a/modules/airavata-job-monitor/src/test/java/org/apache/airavata/job/monitor/QstatMonitorTest.java
+++ b/modules/airavata-job-monitor/src/test/java/org/apache/airavata/job/monitor/QstatMonitorTest.java
@@ -30,7 +30,6 @@ import org.apache.airavata.gsi.ssh.impl.PBSCluster;
 import org.apache.airavata.gsi.ssh.impl.authentication.MyProxyAuthenticationInfo;
 import org.apache.airavata.job.monitor.exception.AiravataMonitorException;
 import org.apache.airavata.job.monitor.impl.pull.qstat.QstatMonitor;
-import org.apache.airavata.job.monitor.impl.push.amqp.AMQPMonitor;
 import org.apache.airavata.schemas.gfac.GsisshHostType;
 import org.junit.Before;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java
----------------------------------------------------------------------
diff --git a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java
b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java
index 1101d9d..effc4bb 100644
--- a/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java
+++ b/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/Constants.java
@@ -29,5 +29,4 @@ public final class Constants {
     public static final String USER_IN_SESSION = "userName";
     public static final String GATEWAY_NAME = "gateway_id";
     public static final String GFAC_CONFIG_XML = "gfac-config.xml";
-    public static final String MONITOR_PROPERTIES = "monitor.properties";
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index 6ca0783..defbdcf 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -21,8 +21,8 @@
 
 package org.apache.airavata.orchestrator.server;
 
-import org.apache.airavata.common.utils.ApplicationSettings;
 import org.apache.airavata.common.utils.Constants;
+import org.apache.airavata.common.utils.ServerSettings;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.gsi.ssh.api.authentication.GSIAuthenticationInfo;
 import org.apache.airavata.gsi.ssh.impl.authentication.MyProxyAuthenticationInfo;
@@ -78,8 +78,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface
{
 
 
     public OrchestratorServerHandler() {
-        URL monitorUrl = OrchestratorServerHandler.class.getClassLoader().getResource(Constants.MONITOR_PROPERTIES);
-        Properties properties = new Properties();
+        Properties properties = ServerSettings.getProperties();
         try {
             // first constructing the monitorManager and orchestrator, then fill the required
properties
             monitorManager = new MonitorManager();
@@ -87,11 +86,10 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface
{
             registry = RegistryFactory.getDefaultRegistry();
 
             // Filling monitorManager properties
-            properties.load(monitorUrl.openStream());
             // we can keep a single user to do all the monitoring authentication for required
machine..
             String myProxyUser = properties.getProperty("myproxy.user");
-            String myProxyPass = properties.getProperty("myproxy.password");
-            String certPath = properties.getProperty("trusted.certificate.location");
+            String myProxyPass = properties.getProperty("myproxy.pass");
+            String certPath = properties.getProperty("trusted.cert.location");
             String myProxyServer = properties.getProperty("myproxy.server");
             authenticationInfo = new MyProxyAuthenticationInfo(myProxyUser, myProxyPass,
myProxyServer,
                     7512, 17280000, certPath);
@@ -131,10 +129,6 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface
{
             monitorManager.launchMonitor();
         } catch (OrchestratorException e) {
             e.printStackTrace();
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
         } catch (InstantiationException e) {

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/modules/orchestrator/airavata-orchestrator-service/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/resources/airavata-server.properties
b/modules/orchestrator/airavata-orchestrator-service/src/main/resources/airavata-server.properties
index 659872d..ee67de3 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/main/resources/airavata-server.properties
+++ b/modules/orchestrator/airavata-orchestrator-service/src/main/resources/airavata-server.properties
@@ -103,8 +103,7 @@ myproxy.user=ogce
 myproxy.pass=
 myproxy.life=3600
 # XSEDE Trusted certificates can be downloaded from https://software.xsede.org/security/xsede-certs.tar.gz
-trusted.cert.location=
-
+trusted.cert.location=/Users/lahirugunathilake/Downloads/certificates
 # SSH PKI key pair or ssh password can be used SSH based authentication is used.
 # if user specify both password authentication gets the higher preference
 
@@ -252,3 +251,26 @@ registry.service.wsdl=http://localhost:${port}/${server.context-root}/services/R
 
 # If false, disables two phase commit when submitting jobs
 TwoPhase=true
+
+
+###---------------------------Monitoring module Configurations---------------------------###
+#This will be the primary monitoring tool which runs in airavata, in future there will be
multiple monitoring
+#mechanisms and one would be able to start a monitor
+primaryMonitor=org.apache.airavata.job.monitor.impl.pull.qstat.QstatMonitor
+#We do not support a secondaray monitoring at this point or host specific monitoring
+secondaryMonitor=org.apache.airavata.job.monitor.impl.push.amqp.AMQPMonitor
+#This is the amqp related configuration and this lists down the Rabbitmq host, this is an
xsede specific configuration
+amqp.hosts=info1.dyn.teragrid.org,info2.dyn.teragrid.org
+connection.name=xsede_private
+
+
+###---------------------------Orchestrator module Configurations---------------------------###
+job.submitter=org.apache.airavata.orchestrator.core.impl.EmbeddedGFACJobSubmitter
+job.validator=org.apache.airavata.orchestrator.core.validator.impl.SimpleAppDataValidator
+submitter.interval=10000
+threadpool.size=10
+start.submitter=true
+embedded.mode=true
+enable.validation=false
+
+

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/modules/orchestrator/airavata-orchestrator-service/src/main/resources/monitor.properties
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/resources/monitor.properties
b/modules/orchestrator/airavata-orchestrator-service/src/main/resources/monitor.properties
deleted file mode 100644
index 612fac7..0000000
--- a/modules/orchestrator/airavata-orchestrator-service/src/main/resources/monitor.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-secondaryMonitor=org.apache.airavata.job.monitor.impl.push.amqp.AMQPMonitor
-primaryMonitor=org.apache.airavata.job.monitor.impl.pull.qstat.QstatMonitor
-amqp.hosts=info1.dyn.teragrid.org,info2.dyn.teragrid.org
-connection.name=xsede_private
-trusted.certificate.location=
-myproxy.server=myproxy.teragrid.org
-myproxy.user=ogce
-myproxy.password=
-myproxy.life=3600
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/modules/orchestrator/airavata-orchestrator-service/src/main/resources/orchestrator.properties
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/resources/orchestrator.properties
b/modules/orchestrator/airavata-orchestrator-service/src/main/resources/orchestrator.properties
deleted file mode 100644
index 54147e9..0000000
--- a/modules/orchestrator/airavata-orchestrator-service/src/main/resources/orchestrator.properties
+++ /dev/null
@@ -1,26 +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.
-#
-job.submitter=org.apache.airavata.orchestrator.core.impl.EmbeddedGFACJobSubmitter
-job.validator=org.apache.airavata.orchestrator.core.validator.impl.SimpleAppDataValidator
-submitter.interval=10000
-threadpool.size=10
-start.submitter=true
-embedded.mode=true
-enable.validation=false

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/job/JobSubmitter.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/job/JobSubmitter.java
b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/job/JobSubmitter.java
index 6790643..1c3c934 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/job/JobSubmitter.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/job/JobSubmitter.java
@@ -30,7 +30,7 @@ import org.apache.airavata.orchestrator.core.gfac.GFACInstance;
  * This is the submitter interface, orchestrator can
  * submit jobs to gfac in different modes, gfac running embedded
  * or gfac running in server mode. This can be configured in
- * orchestrator.properties
+ * airavata-server.properties
  * todo provide a way to configure this in a dynamic way
  */
 public interface JobSubmitter {

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java
b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java
index ae22ae5..ade141a 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java
@@ -26,7 +26,6 @@ package org.apache.airavata.orchestrator.core.utils;
  */
 public class OrchestratorConstants {
     private static final String SUBMITTER_PROPERTY = "job.submitter";
-    public static final String ORCHESTRATOR_PROPERTIES = "orchestrator.properties";
     public static final String AIRAVATA_PROPERTIES = "airavata-server.properties";
     public static final int hotUpdateInterval=1000;
     public static final String JOB_SUBMITTER = "job.submitter";

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
index b5166fe..3e52e6c 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
@@ -20,6 +20,7 @@
 */
 package org.apache.airavata.orchestrator.core.utils;
 
+import org.apache.airavata.common.utils.ServerSettings;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.gfac.utils.GFacUtils;
 import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling;
@@ -46,16 +47,8 @@ public class OrchestratorUtils {
     private final static Logger logger = LoggerFactory.getLogger(OrchestratorUtils.class);
 
     public static OrchestratorConfiguration loadOrchestratorConfiguration() throws OrchestratorException,
IOException {
-        URL resource =
-                OrchestratorUtils.class.getClassLoader().getResource(OrchestratorConstants.ORCHESTRATOR_PROPERTIES);
-        if (resource == null) {
-            String error = "orchestrator.properties cannot be found, Failed to initialize
Orchestrator";
-            logger.error(error);
-            throw new OrchestratorException(error);
-        }
         OrchestratorConfiguration orchestratorConfiguration = new OrchestratorConfiguration();
-        Properties orchestratorProps = new Properties();
-        orchestratorProps.load(resource.openStream());
+        Properties orchestratorProps = ServerSettings.getProperties();
         orchestratorConfiguration.setNewJobSubmitterClass((String) orchestratorProps.get(OrchestratorConstants.JOB_SUBMITTER));
         orchestratorConfiguration.setSubmitterInterval(Integer.parseInt((String) orchestratorProps.get(OrchestratorConstants.SUBMIT_INTERVAL)));
         orchestratorConfiguration.setThreadPoolSize(Integer.parseInt((String) orchestratorProps.get(OrchestratorConstants.THREAD_POOL_SIZE)));

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/AbstractOrchestrator.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/AbstractOrchestrator.java
b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/AbstractOrchestrator.java
index b7a3d25..4decbd9 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/AbstractOrchestrator.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/AbstractOrchestrator.java
@@ -126,7 +126,7 @@ public abstract class AbstractOrchestrator implements Orchestrator {
             OrchestratorException orchestratorException = new OrchestratorException(e);
             throw orchestratorException;
         } catch (IOException e) {
-            logger.error("Failed to initializing Orchestrator - Error parsing orchestrator.properties");
+            logger.error("Failed to initializing Orchestrator - Error parsing configuration
files");
             OrchestratorException orchestratorException = new OrchestratorException(e);
             throw orchestratorException;
         }

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/modules/orchestrator/orchestrator-core/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/resources/airavata-server.properties
b/modules/orchestrator/orchestrator-core/src/main/resources/airavata-server.properties
index 881c8da..86195aa 100644
--- a/modules/orchestrator/orchestrator-core/src/main/resources/airavata-server.properties
+++ b/modules/orchestrator/orchestrator-core/src/main/resources/airavata-server.properties
@@ -252,3 +252,23 @@ registry.service.wsdl=http://localhost:${port}/${server.context-root}/services/R
 
 # If false, disables two phase commit when submitting jobs
 TwoPhase=true
+
+###---------------------------Monitoring module Configurations---------------------------###
+#This will be the primary monitoring tool which runs in airavata, in future there will be
multiple monitoring
+#mechanisms and one would be able to start a monitor
+primaryMonitor=org.apache.airavata.job.monitor.impl.pull.qstat.QstatMonitor
+#We do not support a secondaray monitoring at this point or host specific monitoring
+secondaryMonitor=org.apache.airavata.job.monitor.impl.push.amqp.AMQPMonitor
+#This is the amqp related configuration and this lists down the Rabbitmq host, this is an
xsede specific configuration
+amqp.hosts=info1.dyn.teragrid.org,info2.dyn.teragrid.org
+connection.name=xsede_private
+
+
+###---------------------------Orchestrator module Configurations---------------------------###
+job.submitter=org.apache.airavata.orchestrator.core.impl.EmbeddedGFACJobSubmitter
+job.validator=org.apache.airavata.orchestrator.core.validator.impl.SimpleAppDataValidator
+submitter.interval=10000
+threadpool.size=10
+start.submitter=true
+embedded.mode=true
+enable.validation=false

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/modules/orchestrator/orchestrator-core/src/main/resources/orchestrator.properties
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/resources/orchestrator.properties
b/modules/orchestrator/orchestrator-core/src/main/resources/orchestrator.properties
deleted file mode 100644
index 54147e9..0000000
--- a/modules/orchestrator/orchestrator-core/src/main/resources/orchestrator.properties
+++ /dev/null
@@ -1,26 +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.
-#
-job.submitter=org.apache.airavata.orchestrator.core.impl.EmbeddedGFACJobSubmitter
-job.validator=org.apache.airavata.orchestrator.core.validator.impl.SimpleAppDataValidator
-submitter.interval=10000
-threadpool.size=10
-start.submitter=true
-embedded.mode=true
-enable.validation=false

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/modules/orchestrator/orchestrator-core/src/test/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/resources/airavata-server.properties
b/modules/orchestrator/orchestrator-core/src/test/resources/airavata-server.properties
index 5543448..bfd50a0 100644
--- a/modules/orchestrator/orchestrator-core/src/test/resources/airavata-server.properties
+++ b/modules/orchestrator/orchestrator-core/src/test/resources/airavata-server.properties
@@ -267,4 +267,25 @@ email.server.port=465
 email.user=airavata
 email.password=xxx
 email.ssl=true
-email.from=airavata@apache.org
\ No newline at end of file
+email.from=airavata@apache.org
+
+
+###---------------------------Monitoring module Configurations---------------------------###
+#This will be the primary monitoring tool which runs in airavata, in future there will be
multiple monitoring
+#mechanisms and one would be able to start a monitor
+primaryMonitor=org.apache.airavata.job.monitor.impl.pull.qstat.QstatMonitor
+#We do not support a secondaray monitoring at this point or host specific monitoring
+secondaryMonitor=org.apache.airavata.job.monitor.impl.push.amqp.AMQPMonitor
+#This is the amqp related configuration and this lists down the Rabbitmq host, this is an
xsede specific configuration
+amqp.hosts=info1.dyn.teragrid.org,info2.dyn.teragrid.org
+connection.name=xsede_private
+
+
+###---------------------------Orchestrator module Configurations---------------------------###
+job.submitter=org.apache.airavata.orchestrator.core.impl.EmbeddedGFACJobSubmitter
+job.validator=org.apache.airavata.orchestrator.core.validator.impl.SimpleAppDataValidator
+submitter.interval=10000
+threadpool.size=10
+start.submitter=true
+embedded.mode=true
+enable.validation=false
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/modules/orchestrator/orchestrator-core/src/test/resources/orchestrator.properties
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/test/resources/orchestrator.properties
b/modules/orchestrator/orchestrator-core/src/test/resources/orchestrator.properties
deleted file mode 100644
index b686181..0000000
--- a/modules/orchestrator/orchestrator-core/src/test/resources/orchestrator.properties
+++ /dev/null
@@ -1,26 +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.
-#
-job.submitter=org.apache.airavata.orchestrator.core.impl.EmbeddedGFACJobSubmitter
-job.validator=org.apache.airavata.orchestrator.core.validator.impl.SimpleAppDataValidator
-submitter.interval=10000
-threadpool.size=0
-start.submitter=true
-embedded.mode=true
-enable.validation=false
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/bad1273b/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/DefaultSSHApiTest.java
----------------------------------------------------------------------
diff --git a/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/DefaultSSHApiTest.java
b/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/DefaultSSHApiTest.java
index 4580e41..c2bc055 100644
--- a/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/DefaultSSHApiTest.java
+++ b/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/DefaultSSHApiTest.java
@@ -37,7 +37,6 @@ import org.testng.annotations.Test;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
 
 public class DefaultSSHApiTest {
     private static final Logger log = LoggerFactory.getLogger(PBSCluster.class);


Mime
View raw message