airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [2/7] airavata git commit: AIRAVATA-2376 Switch to MariaDB jar in Ansible
Date Thu, 15 Jun 2017 16:20:21 GMT
AIRAVATA-2376 Switch to MariaDB jar in Ansible


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

Branch: refs/heads/develop
Commit: 047521f3a8f54dac9edf6bdc66f89f1d75003400
Parents: 7ff7130
Author: Marcus Christie <machristie@apache.org>
Authored: Wed Jun 14 11:39:14 2017 -0400
Committer: Marcus Christie <machristie@apache.org>
Committed: Wed Jun 14 11:39:14 2017 -0400

----------------------------------------------------------------------
 .../ansible/roles/api-orch/defaults/main.yml    |   1 +
 .../files/mysql-connector-java-5.1.37-bin.jar   | Bin 985603 -> 0 bytes
 dev-tools/ansible/roles/api-orch/tasks/main.yml |  10 +++---
 .../templates/airavata-server.properties.j2     |  34 +++++++++----------
 dev-tools/ansible/roles/gfac/defaults/main.yml  |   1 +
 .../files/mysql-connector-java-5.1.37-bin.jar   | Bin 985603 -> 0 bytes
 dev-tools/ansible/roles/gfac/tasks/main.yml     |  11 +++---
 .../templates/airavata-server.properties.j2     |  34 +++++++++----------
 .../files/mysql-connector-java-5.1.37-bin.jar   | Bin 985603 -> 0 bytes
 .../main/resources/airavata-server.properties   |  34 +++++++++----------
 10 files changed, 63 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/047521f3/dev-tools/ansible/roles/api-orch/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/defaults/main.yml b/dev-tools/ansible/roles/api-orch/defaults/main.yml
index c7dd3a9..7cb73fc 100644
--- a/dev-tools/ansible/roles/api-orch/defaults/main.yml
+++ b/dev-tools/ansible/roles/api-orch/defaults/main.yml
@@ -20,3 +20,4 @@
 
 api_orch_server_names: "api-orch"
 api_orch_log_dir: "../logs"
+mariadb_connector_jar_url: "https://downloads.mariadb.com/Connectors/java/connector-java-2.0.2/mariadb-java-client-2.0.2.jar"

http://git-wip-us.apache.org/repos/asf/airavata/blob/047521f3/dev-tools/ansible/roles/api-orch/files/mysql-connector-java-5.1.37-bin.jar
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/files/mysql-connector-java-5.1.37-bin.jar b/dev-tools/ansible/roles/api-orch/files/mysql-connector-java-5.1.37-bin.jar
deleted file mode 100644
index 465af67..0000000
Binary files a/dev-tools/ansible/roles/api-orch/files/mysql-connector-java-5.1.37-bin.jar
and /dev/null differ

http://git-wip-us.apache.org/repos/asf/airavata/blob/047521f3/dev-tools/ansible/roles/api-orch/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/tasks/main.yml b/dev-tools/ansible/roles/api-orch/tasks/main.yml
index 4793a82..7c1259f 100644
--- a/dev-tools/ansible/roles/api-orch/tasks/main.yml
+++ b/dev-tools/ansible/roles/api-orch/tasks/main.yml
@@ -76,11 +76,11 @@
 - name: create logs directory
   file: path="{{ api_orch_log_dir }}" state=directory owner={{ user }} group={{ group }}
 
-- name: Copy Mysql jar to lib
-  copy: src={{ mysql_connector_jar }}
-        dest="{{ api_orch_dir }}/{{ airavata_dist }}/lib/{{ mysql_connector_jar }}"
-        owner={{ user }}
-        group={{ group }}
+- name: Copy MariaDB connector jar to lib
+  get_url: url="{{ mariadb_connector_jar_url }}"
+          dest="{{ api_orch_dir }}/{{ airavata_dist }}/lib/"
+          owner={{ user }}
+          group={{ group }}
 
 - name: Open firwall ports
   firewalld: port={{ item }} zone=public permanent=true state=enabled immediate=yes

http://git-wip-us.apache.org/repos/asf/airavata/blob/047521f3/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
index e502524..9a07a42 100644
--- a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
@@ -32,9 +32,9 @@
 #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
-# MySql database configuration
-registry.jdbc.driver=com.mysql.jdbc.Driver
-registry.jdbc.url=jdbc:mysql://{{ db_server }}:{{ db_server_port }}/{{ exp_catalog }}
+# MariaDB database configuration
+registry.jdbc.driver=org.mariadb.jdbc.Driver
+registry.jdbc.url=jdbc:mariadb://{{ db_server }}:{{ db_server_port }}/{{ exp_catalog }}
 registry.jdbc.user={{ db_user }}
 registry.jdbc.password={{ db_password }}
 #FIXME: Probably the following property should be removed.
@@ -63,9 +63,9 @@ 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
-# MySql database configuration
-appcatalog.jdbc.driver=com.mysql.jdbc.Driver
-appcatalog.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ app_catalog }}
+# MariaDB database configuration
+appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
+appcatalog.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{ app_catalog }}
 appcatalog.jdbc.user={{ db_user }}
 appcatalog.jdbc.password={{ db_password }}
 appcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -76,9 +76,9 @@ 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
-# MySql database configuration
-replicacatalog.jdbc.driver=com.mysql.jdbc.Driver
-replicacatalog.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ replica_catalog }}
+# MariaDB database configuration
+replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
+replicacatalog.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{ replica_catalog }}
 replicacatalog.jdbc.user={{ db_user }}
 replicacatalog.jdbc.password={{ db_password }}
 replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -89,9 +89,9 @@ 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
-# MySql database configuration
-workflowcatalog.jdbc.driver=com.mysql.jdbc.Driver
-workflowcatalog.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ replica_catalog }}
+# MariaDB database configuration
+workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
+workflowcatalog.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{ replica_catalog }}
 workflowcatalog.jdbc.user={{ db_user }}
 workflowcatalog.jdbc.password={{ db_password }}
 workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -102,9 +102,9 @@ 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
-# MySql database configuration
-sharingcatalog.jdbc.driver=com.mysql.jdbc.Driver
-sharingcatalog.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ sharing_catalog }}
+# MariaDB database configuration
+sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
+sharingcatalog.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{ sharing_catalog }}
 sharingcatalog.jdbc.user={{ db_user }}
 sharingcatalog.jdbc.password={{ db_password }}
 sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -205,10 +205,10 @@ job.notification.flags=abe
 credential.store.keystore.url={{ keystores_location }}/{{ cred_keystore_src_path | basename
}}
 credential.store.keystore.alias={{ cred_keystore_alias }}
 credential.store.keystore.password={{ cred_keystore_passwd }}
-credential.store.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ credential_store }}
+credential.store.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{ credential_store }}
 credential.store.jdbc.user={{ db_user }}
 credential.store.jdbc.password={{ db_password }}
-credential.store.jdbc.driver=com.mysql.jdbc.Driver
+credential.store.jdbc.driver=org.mariadb.jdbc.Driver
 credential.store.server.host={{ cred_store_server_host }}
 credential.store.server.port={{ cred_store_port }}
 credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer

http://git-wip-us.apache.org/repos/asf/airavata/blob/047521f3/dev-tools/ansible/roles/gfac/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/defaults/main.yml b/dev-tools/ansible/roles/gfac/defaults/main.yml
index c7ccc3d..fff346c 100644
--- a/dev-tools/ansible/roles/gfac/defaults/main.yml
+++ b/dev-tools/ansible/roles/gfac/defaults/main.yml
@@ -19,3 +19,4 @@
 #
 
 gfac_log_dir: "../logs"
+mariadb_connector_jar_url: "https://downloads.mariadb.com/Connectors/java/connector-java-2.0.2/mariadb-java-client-2.0.2.jar"

http://git-wip-us.apache.org/repos/asf/airavata/blob/047521f3/dev-tools/ansible/roles/gfac/files/mysql-connector-java-5.1.37-bin.jar
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/files/mysql-connector-java-5.1.37-bin.jar b/dev-tools/ansible/roles/gfac/files/mysql-connector-java-5.1.37-bin.jar
deleted file mode 100644
index 465af67..0000000
Binary files a/dev-tools/ansible/roles/gfac/files/mysql-connector-java-5.1.37-bin.jar and
/dev/null differ

http://git-wip-us.apache.org/repos/asf/airavata/blob/047521f3/dev-tools/ansible/roles/gfac/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/tasks/main.yml b/dev-tools/ansible/roles/gfac/tasks/main.yml
index 16cc55f..db3fea4 100644
--- a/dev-tools/ansible/roles/gfac/tasks/main.yml
+++ b/dev-tools/ansible/roles/gfac/tasks/main.yml
@@ -72,12 +72,11 @@
 - name: create logs directory
   file: path="{{ gfac_log_dir }}" state=directory owner={{ user }} group={{ group }}
 
-- name: Copy Mysql jar to lib
-  copy: src="{{ mysql_connector_jar }}"
-        dest="{{ gfac_dir }}/{{ airavata_dist }}/lib/{{ mysql_connector_jar }}"
-        owner={{ user }}
-        group={{ group }}
-
+- name: Copy MariaDB connector jar to lib
+  get_url: url="{{ mariadb_connector_jar_url }}"
+          dest="{{ gfac_dir }}/{{ airavata_dist }}/lib/"
+          owner={{ user }}
+          group={{ group }}
 
 - name: Open firwall ports
   firewalld: port="{{ gfac_port }}/tcp" zone=public permanent=true state=enabled immediate=yes

http://git-wip-us.apache.org/repos/asf/airavata/blob/047521f3/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
index 8aef970..33ec6f8 100644
--- a/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
@@ -32,9 +32,9 @@
 #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
-# MySql database configuration
-registry.jdbc.driver=com.mysql.jdbc.Driver
-registry.jdbc.url=jdbc:mysql://{{ db_server }}:{{ db_server_port }}/{{ exp_catalog }}
+# MariaDB database configuration
+registry.jdbc.driver=org.mariadb.jdbc.Driver
+registry.jdbc.url=jdbc:mariadb://{{ db_server }}:{{ db_server_port }}/{{ exp_catalog }}
 registry.jdbc.user={{ db_user }}
 registry.jdbc.password={{ db_password }}
 #FIXME: Probably the following property should be removed.
@@ -64,9 +64,9 @@ 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
-# MySql database configuration
-appcatalog.jdbc.driver=com.mysql.jdbc.Driver
-appcatalog.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ app_catalog }}
+# MariaDB database configuration
+appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
+appcatalog.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{ app_catalog }}
 appcatalog.jdbc.user={{ db_user }}
 appcatalog.jdbc.password={{ db_password }}
 appcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -77,9 +77,9 @@ 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
-# MySql database configuration
-replicacatalog.jdbc.driver=com.mysql.jdbc.Driver
-replicacatalog.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ replica_catalog }}
+# MariaDB database configuration
+replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
+replicacatalog.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{ replica_catalog }}
 replicacatalog.jdbc.user={{ db_user }}
 replicacatalog.jdbc.password={{ db_password }}
 replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -90,9 +90,9 @@ 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
-# MySql database configuration
-workflowcatalog.jdbc.driver=com.mysql.jdbc.Driver
-workflowcatalog.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ replica_catalog }}
+# MariaDB database configuration
+workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
+workflowcatalog.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{ replica_catalog }}
 workflowcatalog.jdbc.user={{ db_user }}
 workflowcatalog.jdbc.password={{ db_password }}
 workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -103,9 +103,9 @@ 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
-# MySql database configuration
-sharingcatalog.jdbc.driver=com.mysql.jdbc.Driver
-sharingcatalog.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ sharing_catalog }}
+# MariaDB database configuration
+sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
+sharingcatalog.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{ sharing_catalog }}
 sharingcatalog.jdbc.user={{ db_user }}
 sharingcatalog.jdbc.password={{ db_password }}
 sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -199,10 +199,10 @@ job.notification.flags=abe
 credential.store.keystore.url={{ keystores_location }}/{{ cred_keystore_src_path | basename
}}
 credential.store.keystore.alias={{ cred_keystore_alias }}
 credential.store.keystore.password={{ cred_keystore_passwd }}
-credential.store.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ credential_store }}
+credential.store.jdbc.url=jdbc:mariadb://{{ db_server }}:3306/{{ credential_store }}
 credential.store.jdbc.user={{ db_user }}
 credential.store.jdbc.password={{ db_password }}
-credential.store.jdbc.driver=com.mysql.jdbc.Driver
+credential.store.jdbc.driver=org.mariadb.jdbc.Driver
 credential.store.server.host={{ cred_store_server_host }}
 credential.store.server.port={{ cred_store_port }}
 credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer

http://git-wip-us.apache.org/repos/asf/airavata/blob/047521f3/dev-tools/ansible/roles/registry/files/mysql-connector-java-5.1.37-bin.jar
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/registry/files/mysql-connector-java-5.1.37-bin.jar b/dev-tools/ansible/roles/registry/files/mysql-connector-java-5.1.37-bin.jar
deleted file mode 100644
index 465af67..0000000
Binary files a/dev-tools/ansible/roles/registry/files/mysql-connector-java-5.1.37-bin.jar
and /dev/null differ

http://git-wip-us.apache.org/repos/asf/airavata/blob/047521f3/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 b11107f..1391279 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -32,9 +32,9 @@
 #for derby [AiravataJPARegistry]
 registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
 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
+# MariaDB database configuration
+#registry.jdbc.driver=org.mariadb.jdbc.Driver
+#registry.jdbc.url=jdbc:mariadb://localhost:3306/experiment_catalog
 registry.jdbc.user=airavata
 registry.jdbc.password=airavata
 #FIXME: Probably the following property should be removed.
@@ -63,9 +63,9 @@ cluster.status.monitoring.repeat.time=18000
 #for derby [AiravataJPARegistry]
 appcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
 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
+# MariaDB database configuration
+#appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
+#appcatalog.jdbc.url=jdbc:mariadb://localhost:3306/app_catalog
 appcatalog.jdbc.user=airavata
 appcatalog.jdbc.password=airavata
 appcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -76,9 +76,9 @@ appcatalog.validationQuery=SELECT 1 from CONFIGURATION
 #for derby [AiravataJPARegistry]
 replicacatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
 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
+# MariaDB database configuration
+#replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
+#replicacatalog.jdbc.url=jdbc:mariadb://localhost:3306/replica_catalog
 replicacatalog.jdbc.user=airavata
 replicacatalog.jdbc.password=airavata
 replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -89,9 +89,9 @@ replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
 #for derby [AiravataJPARegistry]
 workflowcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
 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
+# MariaDB database configuration
+#workflowcatalog.jdbc.driver=org.mariadb.jdbc.Driver
+#workflowcatalog.jdbc.url=jdbc:mariadb://localhost:3306/workflow_catalog
 workflowcatalog.jdbc.user=airavata
 workflowcatalog.jdbc.password=airavata
 workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -102,9 +102,9 @@ workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
 #for derby [AiravataJPARegistry]
 sharingcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
 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
+# MariaDB database configuration
+#sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
+#sharingcatalog.jdbc.url=jdbc:mariadb://localhost:3306/sharing_catalog
 sharingcatalog.jdbc.user=airavata
 sharingcatalog.jdbc.password=airavata
 sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
@@ -219,8 +219,8 @@ 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.jdbc.driver=org.mariadb.jdbc.Driver
+#credential.store.jdbc.url=jdbc:mariadb://localhost:3306/credential_store
 credential.store.server.host=localhost
 credential.store.server.port=8960
 credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer


Mime
View raw message