From b84d17f0f22c196dc05e719a74ecbaabb0387c3f Mon Sep 17 00:00:00 2001 From: Rich Tabedzki Date: Mon, 3 Apr 2017 10:23:32 +0000 Subject: [SDNC-5] summary Migrated 17.07 changes to master Change-Id: Ida9a458b2e59e0ccad0767fd4b15b94d8757216a Signed-off-by: Rich Tabedzki --- dblib/common/build.properties.default | 100 +++++++++++++++++++++ dblib/features/src/main/resources/features.xml | 1 + .../resource/dblib/config/JndiConfiguration.java | 62 ------------- dblib/provider/src/main/resources/dblib.properties | 4 +- dblib/provider/src/test/resources/dblib.properties | 16 ---- 5 files changed, 103 insertions(+), 80 deletions(-) create mode 100755 dblib/common/build.properties.default delete mode 100644 dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/config/JndiConfiguration.java delete mode 100755 dblib/provider/src/test/resources/dblib.properties diff --git a/dblib/common/build.properties.default b/dblib/common/build.properties.default new file mode 100755 index 0000000..f15ecac --- /dev/null +++ b/dblib/common/build.properties.default @@ -0,0 +1,100 @@ +# ----------------------------------------------------------------------------- +# 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. +# ----------------------------------------------------------------------------- +# build.properties.sample +# +# This is an example "build.properties" file, used to customize building +# Tomcat JDBC Pool for your local environment. It defines the location of all external +# modules that Tomcat JDBC Pool depends on. Copy this file to "build.properties" +# in the top-level source directory, and customize it as needed. +# ----------------------------------------------------------------------------- + +# ----- Vesion Control Flags ----- +version.major=1 +version.minor=1 +version.build=0 +version.patch=1 +version.suffix= + +# ----- Default Base Path for Dependent Packages ----- +# Please note this path must be absolute, not relative, +# as it is referenced with different working directory +# contexts by the various build scripts. +base.path=${basedir}/includes + +compile.source=1.7 +compile.target=1.7 +compile.debug=true + +# Do not pass -deprecation (-Xlint:deprecation) flag to javac +compile.deprecation=false + +# ----- Settings for Junit test database. + +# Common settings +testdb.username=root +testdb.password=password + +# H2 +testdb.url=jdbc:h2:~/.h2/test;QUERY_TIMEOUT=0;DB_CLOSE_ON_EXIT=TRUE;LOCK_TIMEOUT=50000;DEFAULT_LOCK_TIMEOUT=50000 +testdb.driverClassName=org.h2.Driver +testdb.validationQuery=SELECT 1 + +# MySQL +#testdb.url=jdbc:mysql://localhost:3306/mysql?autoReconnect=true +#testdb.driverClassName=com.mysql.jdbc.Driver +#testdb.validationQuery=SELECT 1 + +# Derby +#testdb.url=jdbc:derby:derbyDB;create=true +#testdb.driverClassName=org.apache.derby.jdbc.EmbeddedDriver +#testdb.validationQuery=VALUES 1 + +# JUnit Unit Test Suite +junit.version=4.11 +junit.home=${base.path}/junit-${junit.version} +junit.jar=${junit.home}/junit-${junit.version}.jar +junit.loc=http://repo.maven.apache.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar + +# Hamcrest Library, used by JUnit +hamcrest.version=1.3 +hamcrest.home=${base.path}/hamcrest-${hamcrest.version} +hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar +hamcrest.loc=http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar + +mysql.home=${base.path}/mysql-connector-java-5.1.12 +mysql.jar=${mysql.home}/mysql-connector-java-5.1.12-bin.jar +mysql.loc=http://mysql.mirrors.hoobly.com/Downloads/Connector-J/mysql-connector-java-5.1.12.zip + +tomcat.version=8.0.14 +tomcat.home=${base.path}/apache-tomcat-${tomcat.version} +tomcat.dbcp.jar=${tomcat.home}/lib/tomcat-dbcp.jar +tomcat.juli.jar=${tomcat.home}/bin/tomcat-juli.jar +tomcat.loc=http://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip + +tomcat.project.loc=http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/project.xml +tomcat.project.dest=${base.path}/project.xml + +tomcat.xsl.loc=http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/tomcat-docs.xsl +tomcat.xsl.dest=${base.path}/tomcat-docs.xsl + +derby.home=${base.path}/db-derby-10.5.1.1-bin +derby.loc=http://archive.apache.org/dist/db/derby/db-derby-10.5.1.1/db-derby-10.5.1.1-bin.tar.gz +derby.jar=${derby.home}/lib/derby.jar + +h2.home=${base.path}/h2 +h2.loc=http://h2database.googlecode.com/files/h2-2010-02-19.zip +h2.jar=${h2.home}/bin/h2-1.2.129.jar diff --git a/dblib/features/src/main/resources/features.xml b/dblib/features/src/main/resources/features.xml index d7f0030..faa1e1c 100755 --- a/dblib/features/src/main/resources/features.xml +++ b/dblib/features/src/main/resources/features.xml @@ -12,6 +12,7 @@ odl-mdsal-broker mvn:org.openecomp.sdnc.core/dblib-common/${project.version} mvn:org.openecomp.sdnc.core/dblib-provider/${project.version} + mvn:org.openecomp.sdnc.core/dblib-common/${project.version} mvn:mysql/mysql-connector-java/${mysql.connector.version} diff --git a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/config/JndiConfiguration.java b/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/config/JndiConfiguration.java deleted file mode 100644 index 292372b..0000000 --- a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/config/JndiConfiguration.java +++ /dev/null @@ -1,62 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openecomp - * ================================================================================ - * Copyright (C) 2016 - 2017 AT&T - * ================================================================================ - * Licensed 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. - * ============LICENSE_END========================================================= - */ - -package org.openecomp.sdnc.sli.resource.dblib.config; - -import java.util.Properties; - -public class JndiConfiguration extends BaseDBConfiguration{ - - public JndiConfiguration(Properties xmlElem) { - super(xmlElem); - // TODO Auto-generated constructor stub - } - - public String getJndiConnectionName() { - // TODO Auto-generated method stub - return null; - } - - public String getJndiContextFactory() { - // TODO Auto-generated method stub - return null; - } - - public String getJndiURL() { - // TODO Auto-generated method stub - return null; - } - - public String getJndiSource() { - // TODO Auto-generated method stub - return null; - } - - public void setJndiContextFactory(String jndiContextFactoryStr) { - // TODO Auto-generated method stub - - } - - public void setJndiURL(String jndiURLStr) { - // TODO Auto-generated method stub - - } - -} diff --git a/dblib/provider/src/main/resources/dblib.properties b/dblib/provider/src/main/resources/dblib.properties index 0f28f1f..ac295c7 100755 --- a/dblib/provider/src/main/resources/dblib.properties +++ b/dblib/provider/src/main/resources/dblib.properties @@ -2,7 +2,7 @@ org.openecomp.sdnc.sli.dbtype=jdbc org.openecomp.sdnc.sli.jdbc.hosts=sdnctldb01,sdnctldb02 org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://DBHOST:3306/sdnctl org.openecomp.sdnc.sli.jdbc.database=sdnctl -org.openecomp.sdnc.sli.jdbc.user=sdnctl +org.openecomp.sdnc.sli.jdbc.user={user for sdnctl} org.openecomp.sdnc.sli.jdbc.password={password for sdnctl} org.openecomp.sdnc.sli.jdbc.connection.name=sdnctldb01 @@ -10,4 +10,4 @@ org.openecomp.sdnc.sli.jdbc.connection.timeout=50 org.openecomp.sdnc.sli.jdbc.request.timeout=100 org.openecomp.sdnc.sli.jdbc.limit.init=10 org.openecomp.sdnc.sli.jdbc.limit.min=10 -org.openecomp.sdnc.sli.jdbc.limit.max=20 \ No newline at end of file +org.openecomp.sdnc.sli.jdbc.limit.max=20 diff --git a/dblib/provider/src/test/resources/dblib.properties b/dblib/provider/src/test/resources/dblib.properties deleted file mode 100755 index e15e37a..0000000 --- a/dblib/provider/src/test/resources/dblib.properties +++ /dev/null @@ -1,16 +0,0 @@ -org.openecomp.sdnc.sli.dbtype=jdbc - -org.openecomp.sdnc.sli.jdbc.hosts=sdnctldb01 -org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://dbhost:3306/sdnctl -org.openecomp.sdnc.sli.jdbc.database=sdnctl -org.openecomp.sdnc.sli.jdbc.user=user -org.openecomp.sdnc.sli.jdbc.password=password -org.openecomp.sdnc.sli.jdbc.connection.name=sdnctldb01 - -org.openecomp.sdnc.sli.jdbc.connection.timeout=50 -org.openecomp.sdnc.sli.jdbc.request.timeout=100 -org.openecomp.sdnc.sli.jdbc.limit.init=10 -org.openecomp.sdnc.sli.jdbc.limit.min=10 -org.openecomp.sdnc.sli.jdbc.limit.max=20 - -org.openecomp.dblib.connection.recovery=false \ No newline at end of file -- cgit 1.2.3-korg