Author: raminder
Date: Wed Oct 23 18:46:12 2013
New Revision: 1535120
URL: http://svn.apache.org/r1535120
Log:
rearranged the properties and added some descriptions to fix AIRAVATA-744.
Modified:
airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
Modified:
airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties?rev=1535120&r1=1535119&r2=1535120&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
(original)
+++
airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-server.properties
Wed Oct 23 18:46:12 2013
@@ -44,13 +44,14 @@ port=8080
#This property will enable https and stops http, during the url registration,
https urls will be stored and
# http urls will not get registered, because currently airavata supports only
one url for each service
#enable.https=false
+#system properties used by services to register service URLs
+system.gateway=default
+system.user=admin
+system.password=admin
###########################################################################
# Airavata Registry Configuration
###########################################################################
-system.gateway=default
-system.user=admin
-system.password=admin
#for derby [AiravataJPARegistry]
registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
registry.jdbc.url=jdbc:derby://localhost:1527/persistent_data;create=true;user=airavata;password=airavata
@@ -60,12 +61,13 @@ registry.jdbc.url=jdbc:derby://localhost
registry.jdbc.user=airavata
registry.jdbc.password=airavata
start.derby.server.mode=true
+validationQuery=SELECT 1 from Configuration
+jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
+# Properties to setup registry service
default.registry.user=admin
default.registry.password=admin
default.registry.password.hash.method=SHA
default.registry.gateway=default
-validationQuery=SELECT 1 from Configuration
-jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
#for rest [RegistryClient]
#registry.jdbc.url=http://localhost:9080/airavata-services
@@ -248,4 +250,4 @@ amqp.broadcast.sender=org.apache.airavat
registry.service.wsdl=http://localhost:${port}/${server.context-root}/services/RegistryService?wsdl
# If false, disables two phase commit when submitting jobs
-TwoPhase=true
+TwoPhase=true
\ No newline at end of file
