airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ramin...@apache.org
Subject git commit: airavata-server.properties were out of sync. Fixed AIRAVATA-1001
Date Wed, 29 Jan 2014 16:34:06 GMT
Updated Branches:
  refs/heads/master 528d3ff41 -> 0d42feab5


airavata-server.properties were out of sync. Fixed AIRAVATA-1001

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

Branch: refs/heads/master
Commit: 0d42feab5b8cb3648ab36d1a09d2108e687d6523
Parents: 528d3ff
Author: raminder <raminder@apache.org>
Authored: Wed Jan 29 11:33:29 2014 -0500
Committer: raminder <raminder@apache.org>
Committed: Wed Jan 29 11:33:29 2014 -0500

----------------------------------------------------------------------
 .../main/resources/conf/airavata-server.properties   |  14 ++++++++++++++
 .../src/main/resources/conf/airavata.jks             | Bin 0 -> 501 bytes
 2 files changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/0d42feab/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
b/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
index b4877c9..5858962 100644
--- a/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
+++ b/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
@@ -252,3 +252,17 @@ registry.service.wsdl=http://localhost:${port}/${server.context-root}/services/R
 # If false, disables two phase commit when submitting jobs
 TwoPhase=true
 
+# credential store specific parameters
+credential.store.keystore.url=airavata.jks
+credential.store.keystore.alias=airavata
+credential.store.keystore.password=airavata
+notifier.enabled=false
+#period in milliseconds
+notifier.duration=5000
+
+email.server=smtp.googlemail.com
+email.server.port=465
+email.user=airavata
+email.password=xxx
+email.ssl=true
+email.from=airavata@apache.org
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/0d42feab/modules/distribution/airavata-server/src/main/resources/conf/airavata.jks
----------------------------------------------------------------------
diff --git a/modules/distribution/airavata-server/src/main/resources/conf/airavata.jks b/modules/distribution/airavata-server/src/main/resources/conf/airavata.jks
new file mode 100644
index 0000000..bd6d8fe
Binary files /dev/null and b/modules/distribution/airavata-server/src/main/resources/conf/airavata.jks
differ


Mime
View raw message