airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [09/11] airavata git commit: changing pom and airavata properties in main distribution
Date Fri, 27 Jan 2017 20:41:25 GMT
changing pom and airavata properties in main distribution


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

Branch: refs/heads/develop
Commit: 1e310f3ad6c85bfbdec0dca8a4e0761b08e6b847
Parents: 4d43fc4
Author: Ajinkya Dhamnaskar <adhamnas@umail.iu.edu>
Authored: Sun Dec 18 13:52:24 2016 -0500
Committer: Ajinkya Dhamnaskar <adhamnas@umail.iu.edu>
Committed: Sun Dec 18 13:52:24 2016 -0500

----------------------------------------------------------------------
 .../main/resources/airavata-server.properties   | 28 +++++++++++---------
 pom.xml                                         |  2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/1e310f3a/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 ffc9ea8..c02a892 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -31,14 +31,14 @@
 
 #for derby [AiravataJPARegistry]
 registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-registry.jdbc.url=jdbc:derby://localhost:1527/experiment_catalog;create=true;user=airavata;password=airavata
+registry.jdbc.url=jdbc:derby:experiment_catalog;create=true;user=airavata;password=airavata
 # MySql database configuration
 #registry.jdbc.driver=com.mysql.jdbc.Driver
 #registry.jdbc.url=jdbc:mysql://localhost:3306/experiment_catalog
 registry.jdbc.user=airavata
 registry.jdbc.password=airavata
 #FIXME: Probably the following property should be removed.
-start.derby.server.mode=true
+start.derby.server.mode=false
 validationQuery=SELECT 1 from CONFIGURATION
 cache.enable=true
 jpa.cache.size=5000
@@ -61,7 +61,7 @@ cluster.status.monitoring.repeat.time=18000
 ###########################################################################
 #for derby [AiravataJPARegistry]
 appcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-appcatalog.jdbc.url=jdbc:derby://localhost:1527/app_catalog;create=true;user=airavata;password=airavata
+appcatalog.jdbc.url=jdbc:derby:app_catalog;create=true;user=airavata;password=airavata
 # MySql database configuration
 #appcatalog.jdbc.driver=com.mysql.jdbc.Driver
 #appcatalog.jdbc.url=jdbc:mysql://localhost:3306/app_catalog
@@ -74,7 +74,7 @@ appcatalog.validationQuery=SELECT 1 from CONFIGURATION
 ###########################################################################
 #for derby [AiravataJPARegistry]
 replicacatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-replicacatalog.jdbc.url=jdbc:derby://localhost:1527/replica_catalog;create=true;user=airavata;password=airavata
+replicacatalog.jdbc.url=jdbc:derby:replica_catalog;create=true;user=airavata;password=airavata
 # MySql database configuration
 #replicacatalog.jdbc.driver=com.mysql.jdbc.Driver
 #replicacatalog.jdbc.url=jdbc:mysql://localhost:3306/replica_catalog
@@ -87,7 +87,7 @@ replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
 ###########################################################################
 #for derby [AiravataJPARegistry]
 workflowcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-workflowcatalog.jdbc.url=jdbc:derby://localhost:1527/workflow_catalog;create=true;user=airavata;password=airavata
+workflowcatalog.jdbc.url=jdbc:derby:workflow_catalog;create=true;user=airavata;password=airavata
 # MySql database configuration
 #workflowcatalog.jdbc.driver=com.mysql.jdbc.Driver
 #workflowcatalog.jdbc.url=jdbc:mysql://localhost:3306/workflow_catalog
@@ -100,7 +100,7 @@ workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
 ###########################################################################
 #for derby [AiravataJPARegistry]
 sharingcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-sharingcatalog.jdbc.url=jdbc:derby://localhost:1527/sharing_catalog;create=true;user=airavata;password=airavata
+sharingcatalog.jdbc.url=jdbc:derby:sharing_catalog;create=true;user=airavata;password=airavata
 # MySql database configuration
 #sharingcatalog.jdbc.driver=com.mysql.jdbc.Driver
 #sharingcatalog.jdbc.url=jdbc:mysql://localhost:3306/sharing_catalog
@@ -193,9 +193,9 @@ enactment.thread.pool.size=10
 
 
 ###########################################################################
-#  Job Scheduler can send informative email messages to you about the status of your job.
 
+#  Job Scheduler can send informative email messages to you about the status of your job.
 # Specify a string which consists of either the single character "n" (no mail), or one or
more
-#  of the characters "a" (send mail when job is aborted), "b" (send mail when job begins),

+#  of the characters "a" (send mail when job is aborted), "b" (send mail when job begins),
 # and "e" (send mail when job terminates).  The default is "a" if not specified.
 ###########################################################################
 
@@ -207,14 +207,16 @@ job.notification.flags=abe
 ###########################################################################
 # Credential Store module Configuration
 ###########################################################################
-credential.store.keystore.url=/Users/chathuri/dev/airavata/credential-store/oa4mp/airavata_sym.jks
+credential.store.keystore.url=../../../airavata_sym.jks
 credential.store.keystore.alias=airavata
 credential.store.keystore.password=airavata
-credential.store.jdbc.url=jdbc:derby://localhost:1527/credential-store;create=true;user=airavata;password=airavata
+credential.store.jdbc.url=jdbc:derby:credential-store;create=true;user=airavata;password=airavata
 credential.store.jdbc.user=airavata
 credential.store.jdbc.password=airavata
 credential.store.jdbc.driver=org.apache.derby.jdbc.ClientDriver
 credential.store.jdbc.validationQuery=SELECT 1 from CONFIGURATION
+#credential.store.jdbc.driver=com.mysql.jdbc.Driver
+#credential.store.jdbc.url=jdbc:mysql://localhost:3306/credential_store
 credential.store.server.host=localhost
 credential.store.server.port=8960
 credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
@@ -268,10 +270,10 @@ email.based.monitoring.period=10000
 # AMQP Notification Configuration
 ###########################################################################
 #for simple scenarios we can use the guest user
-rabbitmq.broker.url=amqp://localhost:5672
+#rabbitmq.broker.url=amqp://localhost:5672
 #for production scenarios, give url as amqp://userName:password@hostName:portNumber/virtualHost,
create user, virtualhost
 # and give permissions, refer: http://blog.dtzq.com/2012/06/rabbitmq-users-and-virtual-hosts.html
-#rabbitmq.broker.url=amqp://airavata:airavata@localhost:5672/messaging
+rabbitmq.broker.url=amqp://airavata:airavata@149.165.228.91:5672/messaging
 rabbitmq.status.exchange.name=status_exchange
 rabbitmq.process.exchange.name=process_exchange
 rabbitmq.experiment.exchange.name=experiment_exchange
@@ -302,7 +304,7 @@ aurora.executor.config.template.filename=executor-config-template.json
 api.secured=false
 security.manager.class=org.apache.airavata.api.server.security.DefaultAiravataSecurityManager
 ### TLS related configuration ####
-TLS.enabled=true
+TLS.enabled=false
 TLS.api.server.port=9930
 TLS.client.timeout=10000
 #### keystore configuration ####

http://git-wip-us.apache.org/repos/asf/airavata/blob/1e310f3a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c019dce..2c85b92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -632,7 +632,6 @@
                 <module>modules/cloud</module>
                 <module>modules/server</module>
                 <module>modules/workflow</module>
-                <module>modules/test-suite</module>
                 <module>modules/sharing-registry</module>
                 <module>modules/cluster-monitoring</module>
                 <module>modules/registry-refactoring</module>
@@ -643,6 +642,7 @@
                 <!--<module>modules/workflow</module>-->
                 <!--<module>modules/xbaya-gui</module>-->
                 <module>modules/distribution</module>
+                <module>modules/test-suite</module>
             </modules>
         </profile>
         <profile>


Mime
View raw message