Author: samindaw
Date: Fri Jan 4 15:30:41 2013
New Revision: 1428928
URL: http://svn.apache.org/viewvc?rev=1428928&view=rev
Log:
updating airavata-client properties file with registry settings
Modified:
airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties
airavata/trunk/modules/airavata-client/src/test/resources/airavata-client.properties
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
Modified:
airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties?rev=1428928&r1=1428927&r2=1428928&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties
(original)
+++
airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties
Fri Jan 4 15:30:41 2013
@@ -25,21 +25,28 @@
#
###########################################################################
-#
-# Accessing Airavata Registry Configuration
-# For 0.5 release the data case information is required. For 0.6 and beyond
-# the clients should only need Registry Service End Points.
-#
-registry.user=admin
-registry.password=admin
-gateway.id=default
-registry.jdbc.user=airavata
-registry.jdbc.password=airavata
+###---------------------------REGISTRY API
IMPLEMENTATION---------------------------###
+
+#class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
-#for mysql
+###---------------------REGISTRY API IMPLEMENTATION - CUSTOM
SETTINGS----------------------###
+
+#for mysql [AiravataJPARegistry]
#registry.jdbc.driver=com.mysql.jdbc.Driver
#registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
-#for derby
+#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
+registry.jdbc.user=airavata
+registry.jdbc.password=airavata
+start.derby.server.mode=true
+
+default.registry.user=admin
+default.registry.password=admin
+default.registry.password.hash.method=SHA
+default.registry.gateway=default
+
+#for rest [RegistryClient]
+#registry.jdbc.url=http://localhost:9080/airavata-services
\ No newline at end of file
Modified:
airavata/trunk/modules/airavata-client/src/test/resources/airavata-client.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/test/resources/airavata-client.properties?rev=1428928&r1=1428927&r2=1428928&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/test/resources/airavata-client.properties
(original)
+++
airavata/trunk/modules/airavata-client/src/test/resources/airavata-client.properties
Fri Jan 4 15:30:41 2013
@@ -25,21 +25,28 @@
#
###########################################################################
-#
-# Accessing Airavata Registry Configuration
-# For 0.5 release the data case information is required. For 0.6 and beyond
-# the clients should only need Registry Service End Points.
-#
-registry.user=admin
-registry.password=admin
-gateway.id=default
-registry.jdbc.user=airavata
-registry.jdbc.password=airavata
+###---------------------------REGISTRY API
IMPLEMENTATION---------------------------###
+
+#class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
+
+###---------------------REGISTRY API IMPLEMENTATION - CUSTOM
SETTINGS----------------------###
-#for mysql
+#for mysql [AiravataJPARegistry]
#registry.jdbc.driver=com.mysql.jdbc.Driver
#registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
-#for derby
+#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
+registry.jdbc.user=airavata
+registry.jdbc.password=airavata
+start.derby.server.mode=true
+
+default.registry.user=admin
+default.registry.password=admin
+default.registry.gateway=default
+
+#for rest [RegistryClient]
+#registry.jdbc.url=http://localhost:9080/airavata-services
+
Modified:
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties?rev=1428928&r1=1428927&r2=1428928&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
(original)
+++
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
Fri Jan 4 15:30:41 2013
@@ -25,21 +25,29 @@
#
###########################################################################
-#
-# Accessing Airavata Registry Configuration
-# For 0.5 release the data case information is required. For 0.6 and beyond
-# the clients should only need Registry Service End Points.
-#
-registry.user=admin
-registry.password=admin
-gateway.id=default
-registry.jdbc.user=airavata
-registry.jdbc.password=airavata
+###---------------------------REGISTRY API
IMPLEMENTATION---------------------------###
+
+class.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
+#class.registry.accessor=org.apache.airavata.rest.client.RegistryClient
+
+###---------------------REGISTRY API IMPLEMENTATION - CUSTOM
SETTINGS----------------------###
-#for mysql
+#for mysql [AiravataJPARegistry]
#registry.jdbc.driver=com.mysql.jdbc.Driver
#registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
-#for derby
+#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
+registry.jdbc.user=airavata
+registry.jdbc.password=airavata
+start.derby.server.mode=true
+
+default.registry.user=admin
+default.registry.password=admin
+default.registry.password.hash.method=SHA
+default.registry.gateway=default
+
+#for rest [RegistryClient]
+#registry.jdbc.url=http://localhost:9080/airavata-services
+
