From ecf26dfcabafe519ffa0358413f388a6ac9eadb3 Mon Sep 17 00:00:00 2001 From: Anuj Bhandar Date: Wed, 14 Dec 2016 15:25:23 -0500 Subject: [PATCH 1/3] update registry-refractoring code to user airavata-ser.properties --- .../registry/core/utils/JPAConstants.java | 32 ++++ .../registry/core/utils/JPAUtils.java | 9 +- .../airavata/registry/core/utils/Utils.java | 156 ++++++++++++++++++ 3 files changed, 193 insertions(+), 4 deletions(-) create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAConstants.java create mode 100644 modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/Utils.java diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAConstants.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAConstants.java new file mode 100644 index 0000000000..25263e1198 --- /dev/null +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAConstants.java @@ -0,0 +1,32 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +package org.apache.airavata.registry.core.utils; +public class JPAConstants { + public static final String KEY_JDBC_URL = "registry.jdbc.url"; + public static final String KEY_JDBC_USER = "registry.jdbc.user"; + public static final String KEY_JDBC_PASSWORD = "registry.jdbc.password"; + public static final String KEY_JDBC_DRIVER = "registry.jdbc.driver"; + public static final String KEY_DERBY_START_ENABLE = "start.derby.server.mode"; + public static final String VALIDATION_QUERY = "validationQuery"; + public static final String JPA_CACHE_SIZE = "jpa.cache.size"; + public static final String ENABLE_CACHING = "cache.enable"; +} diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAUtils.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAUtils.java index 05098c460d..d1572f3364 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAUtils.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/JPAUtils.java @@ -36,12 +36,13 @@ public class JPAUtils { private static EntityManager entityManager; public static EntityManager getEntityManager(){ + if (factory == null) { //FIXME - String connectionProperties = "DriverClassName=com.mysql.jdbc.Driver," + - "Url=jdbc:mysql://localhost:3306/airavata_catalog," + - "Username=root," + - "Password=root"; + String connectionProperties = Utils.getJDBCDriver()+ "," + + Utils.getJDBCURL()+"," + + Utils.getJDBCUser()+"," + + Utils.getJDBCPassword(); logger.info(connectionProperties); Map properties = new HashMap(); properties.put("openjpa.ConnectionDriverName", "org.apache.commons.dbcp.BasicDataSource"); diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/Utils.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/Utils.java new file mode 100644 index 0000000000..7b5c60a1b2 --- /dev/null +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/utils/Utils.java @@ -0,0 +1,156 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.airavata.registry.core.utils; + +import org.apache.airavata.common.exception.ApplicationSettingsException; +import org.apache.airavata.common.utils.ServerSettings; +import org.apache.airavata.registry.core.utils.JPAConstants; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.net.URI; + + +public class Utils { + private final static Logger logger = LoggerFactory.getLogger(Utils.class); + + public static String getJDBCFullURL(){ + String jdbcUrl = getJDBCURL(); + String jdbcUser = getJDBCUser(); + String jdbcPassword = getJDBCPassword(); + jdbcUrl = jdbcUrl + "?" + "user=" + jdbcUser + "&" + "password=" + jdbcPassword; + return jdbcUrl; + } + + public static String getJDBCURL(){ + try { + return ServerSettings.getSetting(JPAConstants.KEY_JDBC_URL); + } catch (ApplicationSettingsException e) { + logger.error(e.getMessage(), e); + return null; + } + } + + public static String getHost(){ + try{ + String jdbcURL = getJDBCURL(); + String cleanURI = jdbcURL.substring(5); + URI uri = URI.create(cleanURI); + return uri.getHost(); + } catch (Exception e) { + logger.error(e.getMessage(), e); + return null; + } + } + + public static int getPort(){ + try{ + String jdbcURL = getJDBCURL(); + String cleanURI = jdbcURL.substring(5); + URI uri = URI.create(cleanURI); + return uri.getPort(); + } catch (Exception e) { + logger.error(e.getMessage(), e); + return -1; + } + } + + public static int getJPACacheSize (){ + try { + String cache = ServerSettings.getSetting(JPAConstants.JPA_CACHE_SIZE, "5000"); + return Integer.parseInt(cache); + }catch (Exception e){ + logger.error(e.getMessage(), e); + return -1; + } + } + + public static String isCachingEnabled (){ + try { + return ServerSettings.getSetting(JPAConstants.ENABLE_CACHING, "true"); + }catch (Exception e){ + logger.error(e.getMessage(), e); + return "true"; + } + } + + public static String getDBType(){ + try{ + String jdbcURL = getJDBCURL(); + String cleanURI = jdbcURL.substring(5); + URI uri = URI.create(cleanURI); + return uri.getScheme(); + } catch (Exception e) { + logger.error(e.getMessage(), e); + return null; + } + } + + public static boolean isDerbyStartEnabled(){ + try { + String s = ServerSettings.getSetting(JPAConstants.KEY_DERBY_START_ENABLE); + if("true".equals(s)){ + return true; + } + } catch (ApplicationSettingsException e) { + logger.error(e.getMessage(), e); + return false; + } + return false; + } + + public static String getJDBCUser(){ + try { + return ServerSettings.getSetting(JPAConstants.KEY_JDBC_USER); + } catch (ApplicationSettingsException e) { + logger.error(e.getMessage(), e); + return null; + } + } + + public static String getValidationQuery(){ + try { + return ServerSettings.getSetting(JPAConstants.VALIDATION_QUERY); + } catch (ApplicationSettingsException e) { + logger.error(e.getMessage(), e); + return null; + } + } + + public static String getJDBCPassword(){ + try { + return ServerSettings.getSetting(JPAConstants.KEY_JDBC_PASSWORD); + } catch (ApplicationSettingsException e) { + logger.error(e.getMessage(), e); + return null; + } + + } + + public static String getJDBCDriver(){ + try { + return ServerSettings.getSetting(JPAConstants.KEY_JDBC_DRIVER); + } catch (ApplicationSettingsException e) { + logger.error(e.getMessage(), e); + return null; + } + } +} \ No newline at end of file From 1ad40e3f5c4f38a66f14f9e6b4be8e05879441d3 Mon Sep 17 00:00:00 2001 From: Anuj Bhandar Date: Thu, 15 Dec 2016 13:01:24 -0500 Subject: [PATCH 2/3] adding dependencies to registry-refractoring --- modules/registry-refactoring/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/registry-refactoring/pom.xml b/modules/registry-refactoring/pom.xml index b794349f33..ec19038e79 100644 --- a/modules/registry-refactoring/pom.xml +++ b/modules/registry-refactoring/pom.xml @@ -63,6 +63,11 @@ derbytools ${derby.version} + + org.apache.airavata + airavata-commons + ${project.version} + junit junit From a65a2bd6caf8fafeae70d2f52aa8c9adbec8f3d8 Mon Sep 17 00:00:00 2001 From: Anuj Bhandar Date: Thu, 15 Dec 2016 13:05:40 -0500 Subject: [PATCH 3/3] correcting compliation errors --- modules/registry-refactoring/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/registry-refactoring/pom.xml b/modules/registry-refactoring/pom.xml index ec19038e79..100f796225 100644 --- a/modules/registry-refactoring/pom.xml +++ b/modules/registry-refactoring/pom.xml @@ -63,17 +63,17 @@ derbytools ${derby.version} - - org.apache.airavata - airavata-commons - ${project.version} - junit junit 4.12 test + + org.apache.airavata + airavata-commons + ${project.version} +