Repository: airavata Updated Branches: refs/heads/master 44fb8f904 -> 5e851e665
Removing duplicated configuration - AIRAVATA-1028 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5e851e66 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5e851e66 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5e851e66 Branch: refs/heads/master Commit: 5e851e66599e0f1d74ea9b1f90e421c5611f157a Parents: 44fb8f9 Author: lahiru <[email protected]> Authored: Tue Mar 4 11:14:48 2014 -0500 Committer: lahiru <[email protected]> Committed: Tue Mar 4 11:14:48 2014 -0500 ---------------------------------------------------------------------- .../airavata/api/server/handler/AiravataServerHandler.java | 1 - .../airavata/orchestrator/server/OrchestratorServerHandler.java | 2 +- .../src/main/resources/airavata-server.properties | 4 ++-- .../src/main/resources/monitor.properties | 5 ++--- 4 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/5e851e66/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java index fda468f..72446e3 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java @@ -43,7 +43,6 @@ import org.slf4j.LoggerFactory; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; public class AiravataServerHandler implements Airavata.Iface { http://git-wip-us.apache.org/repos/asf/airavata/blob/5e851e66/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 9ce3ca3..6ca0783 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 @@ -91,7 +91,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface { // 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("certificate.path"); + String certPath = properties.getProperty("trusted.certificate.location"); String myProxyServer = properties.getProperty("myproxy.server"); authenticationInfo = new MyProxyAuthenticationInfo(myProxyUser, myProxyPass, myProxyServer, 7512, 17280000, certPath); http://git-wip-us.apache.org/repos/asf/airavata/blob/5e851e66/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 0c24c51..659872d 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 @@ -100,10 +100,10 @@ gfac.embedded=true myproxy.server=myproxy.teragrid.org myproxy.user=ogce -myproxy.pass=0Gce3098 +myproxy.pass= myproxy.life=3600 # XSEDE Trusted certificates can be downloaded from https://software.xsede.org/security/xsede-certs.tar.gz -trusted.cert.location=/Users/chathuri/dev/airavata/cert/certificates +trusted.cert.location= # 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 http://git-wip-us.apache.org/repos/asf/airavata/blob/5e851e66/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 index bc9b267..612fac7 100644 --- a/modules/orchestrator/airavata-orchestrator-service/src/main/resources/monitor.properties +++ b/modules/orchestrator/airavata-orchestrator-service/src/main/resources/monitor.properties @@ -2,9 +2,8 @@ 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=/Users/chathuri/dev/airavata/cert/certificates -certificate.path=/Users/chathuri/dev/airavata/cert/certificates +trusted.certificate.location= myproxy.server=myproxy.teragrid.org myproxy.user=ogce -myproxy.password=0Gce3098 +myproxy.password= myproxy.life=3600 \ No newline at end of file
