Repository: airavata Updated Branches: refs/heads/airavata-gov-registry e29b5c8fc -> a3f9b19c5
adding server property section for sharing catalog Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a3f9b19c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a3f9b19c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a3f9b19c Branch: refs/heads/airavata-gov-registry Commit: a3f9b19c5acd6e5307ecb3a77639adcb159517fc Parents: e29b5c8 Author: scnakandala <[email protected]> Authored: Wed Oct 5 04:12:18 2016 -0400 Committer: scnakandala <[email protected]> Committed: Wed Oct 5 04:12:18 2016 -0400 ---------------------------------------------------------------------- .../airavata/sharing/registry/db/utils/JPAUtils.java | 10 +++++----- .../src/main/resources/airavata-server.properties | 13 +++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/a3f9b19c/modules/airavata-sharing-registry/airavata-sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java ---------------------------------------------------------------------- diff --git a/modules/airavata-sharing-registry/airavata-sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java b/modules/airavata-sharing-registry/airavata-sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java index 45d34d8..f2f7c3a 100644 --- a/modules/airavata-sharing-registry/airavata-sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java +++ b/modules/airavata-sharing-registry/airavata-sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/utils/JPAUtils.java @@ -40,11 +40,11 @@ public class JPAUtils { private final static Logger logger = LoggerFactory.getLogger(JPAUtils.class); private static final String PERSISTENCE_UNIT_NAME = "airavata-sharing-registry"; - private static final String SHARING_REG_JDBC_DRIVER = "appcatalog.jdbc.driver"; - private static final String SHARING_REG_JDBC_URL = "appcatalog.jdbc.url"; - private static final String SHARING_REG_JDBC_USER = "appcatalog.jdbc.user"; - private static final String SHARING_REG_JDBC_PWD = "appcatalog.jdbc.password"; - private static final String SHARING_REG_VALIDATION_QUERY = "appcatalog.validationQuery"; + private static final String SHARING_REG_JDBC_DRIVER = "sharingcatalog.jdbc.driver"; + private static final String SHARING_REG_JDBC_URL = "sharingcatalog.jdbc.url"; + private static final String SHARING_REG_JDBC_USER = "sharingcatalog.jdbc.user"; + private static final String SHARING_REG_JDBC_PWD = "sharingcatalog.jdbc.password"; + private static final String SHARING_REG_VALIDATION_QUERY = "sharingcatalog.validationQuery"; private static final String JPA_CACHE_SIZE = "jpa.cache.size"; private static final String JPA_CACHE_ENABLED = "cache.enable"; http://git-wip-us.apache.org/repos/asf/airavata/blob/a3f9b19c/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 30a6338..e026d7b 100644 --- a/modules/configuration/server/src/main/resources/airavata-server.properties +++ b/modules/configuration/server/src/main/resources/airavata-server.properties @@ -91,6 +91,19 @@ workflowcatalog.jdbc.password=airavata workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION ########################################################################### +# Sharing Catalog DB 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://localhost:3306/sharing_catalog +sharingcatalog.jdbc.user=airavata +sharingcatalog.jdbc.password=airavata +sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION + +########################################################################### # User Profile MongoDB Configuration ########################################################################### userprofile.mongodb.host=localhost
