You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/06/12 23:36:40 UTC
[5/6] airavata git commit: Refactored airavata-server.properties file.
Refactored airavata-server.properties file.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/debeae01
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/debeae01
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/debeae01
Branch: refs/heads/master
Commit: debeae018fde8dab0c1617a1d1a912090f0ccbec
Parents: be5c037
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Fri Jun 12 15:34:40 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Fri Jun 12 15:34:40 2015 -0400
----------------------------------------------------------------------
.../main/resources/airavata-server.properties | 42 +-------------------
1 file changed, 1 insertion(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/debeae01/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index 1e52a16..a86a1d4 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -104,6 +104,7 @@ enable.validation=true
###########################################################################
# GFac Server Configurations
###########################################################################
+gfac=org.apache.airavata.gfac.server.GfacServer
gfac.server.name=gfac-node0
gfac.server.host=localhost
gfac.server.port=8950
@@ -152,10 +153,6 @@ credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServe
credential.store.thrift.server.keystore=/Users/chathuri/dev/airavata/credential-store/oa4mp/airavata.jks
credential.store.thrift.server.keystore.password=airavata
-notifier.enabled=false
-#period in milliseconds
-notifier.duration=5000
-
email.server=smtp.googlemail.com
email.server.port=465
email.user=airavata
@@ -163,20 +160,6 @@ email.password=xxx
email.ssl=true
email.from=airavata@apache.org
-###########################################################################
-# Airavata GFac MyProxy GSI credentials to access Grid Resources.
-###########################################################################
-#
-# Security Configuration used by Airavata Generic Factory Service
-# to interact with Computational Resources.
-#
-gfac=org.apache.airavata.gfac.server.GfacServer
-myproxy.server=myproxy.teragrid.org
-myproxy.username=ogce
-myproxy.password=
-myproxy.life=3600
-# XSEDE Trusted certificates can be downloaded from https://software.xsede.org/security/xsede-certs.tar.gz
-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
@@ -194,15 +177,6 @@ trusted.cert.location=/Users/lahirugunathilake/Downloads/certificates
#bes.ca.key.pass=passphrase
###########################################################################
-# Advance configuration to change service implementations
-###########################################################################
-# If false, disables two phase commit when submitting jobs
-TwoPhase=true
-#
-# Class which implemented HostScheduler interface. It will determine the which host to submit the request
-#
-
-###########################################################################
# Monitoring module Configuration
###########################################################################
@@ -222,20 +196,6 @@ email.based.monitoring.period=10000
###########################################################################
# AMQP Notification Configuration
###########################################################################
-amqp.notification.enable=1
-amqp.broker.host=localhost
-amqp.broker.port=5672
-amqp.broker.username=guest
-amqp.broker.password=guest
-amqp.sender=org.apache.airavata.wsmg.client.amqp.rabbitmq.AMQPSenderImpl
-amqp.topic.sender=org.apache.airavata.wsmg.client.amqp.rabbitmq.AMQPTopicSenderImpl
-amqp.broadcast.sender=org.apache.airavata.wsmg.client.amqp.rabbitmq.AMQPBroadcastSenderImpl
-
-#,org.apache.airavata.gfac.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
-proxy.file.path=/Users/lahirugunathilake/Downloads/x509up_u503876
-connection.name=xsede
#publisher
#for simple scenarios we can use the guest user
rabbitmq.broker.url=amqp://localhost:5672