From 8a3f1ea2bee98d30c74317fd31f83b6ea3ec4734 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 16 Feb 2018 17:12:41 -0500 Subject: Nitrogen port : mdsal/sql Update mdsal-resource and sql-resource to support ODL Nitrogen Change-Id: Id7f7ac2da0de9d034e052ee16ef9c2a765a056bf Issue-ID: CCSDK-176 Signed-off-by: Dan Timoney --- sql-resource/features/ccsdk-sql-resource/pom.xml | 54 +++++ .../features/features-sql-resource/pom.xml | 30 +++ sql-resource/features/pom.xml | 152 ++---------- sql-resource/installer/pom.xml | 258 +++++++++++---------- .../src/main/resources/scripts/install-feature.sh | 9 +- sql-resource/pom.xml | 55 ++--- sql-resource/provider/pom.xml | 161 +++++-------- 7 files changed, 320 insertions(+), 399 deletions(-) create mode 100644 sql-resource/features/ccsdk-sql-resource/pom.xml create mode 100755 sql-resource/features/features-sql-resource/pom.xml (limited to 'sql-resource') diff --git a/sql-resource/features/ccsdk-sql-resource/pom.xml b/sql-resource/features/ccsdk-sql-resource/pom.xml new file mode 100644 index 000000000..d547eb1d5 --- /dev/null +++ b/sql-resource/features/ccsdk-sql-resource/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.0.1-SNAPSHOT + + + + org.onap.ccsdk.sli.adaptors + ccsdk-sql-resource + 0.2.1-SNAPSHOT + feature + + ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${project.version} + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-dblib + ${project.version} + xml + features + + + ${project.groupId} + sql-resource-provider + ${project.version} + + + + equinoxSDK381 + org.eclipse.osgi + provided + + + diff --git a/sql-resource/features/features-sql-resource/pom.xml b/sql-resource/features/features-sql-resource/pom.xml new file mode 100755 index 000000000..b39a96a09 --- /dev/null +++ b/sql-resource/features/features-sql-resource/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + feature-repo-parent + 1.0.1-SNAPSHOT + + + + org.onap.ccsdk.sli.adaptors + features-sql-resource + 0.2.1-SNAPSHOT + feature + + ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} + + + + ${project.groupId} + ccsdk-sql-resource + ${project.version} + xml + features + + + + diff --git a/sql-resource/features/pom.xml b/sql-resource/features/pom.xml index 499e3cb7f..63234a78b 100755 --- a/sql-resource/features/pom.xml +++ b/sql-resource/features/pom.xml @@ -1,134 +1,22 @@ - - 4.0.0 - - sql-resource - org.onap.ccsdk.sli.adaptors - 0.2.0-SNAPSHOT - - sql-resource-features - Sql Resource Adaptor - Features - - jar - - - - - - org.onap.ccsdk.sli.adaptors - sql-resource-provider - ${project.version} - - - - commons-lang - commons-lang - 2.6 - compile - - - - org.opendaylight.mdsal - features-mdsal - ${odl.mdsal.features.version} - features - xml - - runtime - - - - - - org.opendaylight.odlparent - opendaylight-karaf-empty - ${odl.karaf.empty.distro.version} - zip - - - - - - org.opendaylight.odlparent - features-test - ${odl.commons.opendaylight.version} - test - - - - org.opendaylight.yangtools - features-yangtools - ${odl.yangtools.version} - features - xml - runtime - - - - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - + + 4.0.0 + + + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + + + org.onap.ccsdk.sli.adaptors + sql-resource-features + pom + + ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} + + + ccsdk-sql-resource + features-sql-resource + diff --git a/sql-resource/installer/pom.xml b/sql-resource/installer/pom.xml index 505cf409c..9629ee438 100755 --- a/sql-resource/installer/pom.xml +++ b/sql-resource/installer/pom.xml @@ -1,138 +1,142 @@ - - 4.0.0 - - sql-resource - org.onap.ccsdk.sli.adaptors - 0.2.0-SNAPSHOT - - sql-resource-installer - SQL Resource - Karaf Installer - pom + + 4.0.0 - - sdnc-sql-resource - sdnc-sql-resource - mvn:org.onap.ccsdk.sli.adaptors/sql-resource-features/${project.version}/xml/features - false - + + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + - + org.onap.ccsdk.sli.adaptors + sql-resource-installer + 0.2.1-SNAPSHOT + pom - - org.onap.ccsdk.sli.adaptors - sql-resource-features - ${project.version} - features - xml - - - * - * - - - + ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} - - org.onap.ccsdk.sli.adaptors - sql-resource-provider - ${project.version} - + + ccsdk-sql-resource + ${application.name} + mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features + false + - + - - - - maven-assembly-plugin - 2.6 - - - maven-repo-zip - - single - - package - - false - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - false - - - - installer-zip - - single - - package - - true - ${application.name}-${project.version}-installer - - src/assembly/assemble_installer_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - org.onap.ccsdk - sli-common,sli-provider,dblib-provider - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - + + org.onap.ccsdk.sli.adaptors + ccsdk-sql-resource + ${project.version} + xml + features + + + * + * + + + - - + + org.onap.ccsdk.sli.adaptors + sql-resource-provider + ${project.version} + - - + + + + + maven-assembly-plugin + 2.6 + + + maven-repo-zip + + single + + package + + false + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + false + + + + installer-zip + + single + + package + + true + ${application.name}-${project.version}-installer + + src/assembly/assemble_installer_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/system + false + true + true + true + false + false + org.onap.ccsdk.sli.adaptor + provided + + + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + + + + + + + diff --git a/sql-resource/installer/src/main/resources/scripts/install-feature.sh b/sql-resource/installer/src/main/resources/scripts/install-feature.sh index e986764b9..cee4a4952 100644 --- a/sql-resource/installer/src/main/resources/scripts/install-feature.sh +++ b/sql-resource/installer/src/main/resources/scripts/install-feature.sh @@ -10,9 +10,9 @@ # 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. @@ -23,7 +23,6 @@ ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client} -ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"} INSTALLERDIR=$(dirname $0) REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip @@ -36,5 +35,5 @@ else exit 1 fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} +${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories} +${ODL_KARAF_CLIENT} feature:install ${features.boot} diff --git a/sql-resource/pom.xml b/sql-resource/pom.xml index e660b5661..cad83d18e 100755 --- a/sql-resource/pom.xml +++ b/sql-resource/pom.xml @@ -1,43 +1,26 @@ - - - org.onap.ccsdk.sli.adaptors - ccsdk-sli-adaptors - 0.2.0-SNAPSHOT - + + 4.0.0 - 4.0.0 - pom - org.onap.ccsdk.sli.adaptors - sql-resource + + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + + org.onap.ccsdk.sli.adaptors + sql-resource + 0.2.1-SNAPSHOT + pom - Sql Resource Adaptor - The Sql resource adaptor allows service logic to read/write data from a local database using direct SQL statements + ccsdk-sli-adaptors :: sql-resource + The Sql resource adaptor allows service logic to read/write data from a local database using direct SQL statements - 0.2.0-SNAPSHOT + + provider + features + installer + - - - - org.onap.ccsdk.sli.adaptors - sql-resource-features - features - xml - ${project.version} - - - - org.onap.ccsdk.sli.adaptors - sql-resource-provider - ${project.version} - - - - - - provider - features - installer - diff --git a/sql-resource/provider/pom.xml b/sql-resource/provider/pom.xml index bcf6f0ffe..7069cf30e 100755 --- a/sql-resource/provider/pom.xml +++ b/sql-resource/provider/pom.xml @@ -1,111 +1,74 @@ - - 4.0.0 - - org.onap.ccsdk.sli.adaptors - sql-resource - 0.2.0-SNAPSHOT - - sql-resource-provider - bundle - Sql Resource Adaptor - Provider - http://maven.apache.org - - UTF-8 - - - - junit - junit - ${junit.version} - test - + + 4.0.0 + + + org.onap.ccsdk.parent + binding-parent + 1.0.1-SNAPSHOT + + + org.onap.ccsdk.sli.adaptors + sql-resource-provider + 0.2.1-SNAPSHOT + bundle + + ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} + http://maven.apache.org + + + UTF-8 + + + + + junit + junit + ${junit.version} + test + ch.vorburger.mariaDB4j mariaDB4j 2.2.3 test - - org.onap.ccsdk.sli.core - sli-common - ${sdnctl.sli.version} - compile - - - org.onap.ccsdk.sli.core - sli-provider - ${sdnctl.sli.version} - compile - - - equinoxSDK381 - org.eclipse.osgi - ${equinox.osgi.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - slf4j-simple - ${slf4j.version} - compile - - - org.onap.ccsdk.sli.core - dblib-provider - ${sdnctl.dblib.version} - - - - - - - - - - org.apache.felix - maven-bundle-plugin - ${bundle.plugin.version} - true - - - org.onap.ccsdk.sli.adaptors.resource.sql - org.onap.ccsdk.sli.adaptors.resource.sql.SqlResourceActivator - org.onap.ccsdk.sli.adaptors.resource.sql - * - * - - + + org.onap.ccsdk.sli.core + sli-common + ${sdnctl.sli.version} + compile + + + org.onap.ccsdk.sli.core + sli-provider + ${sdnctl.sli.version} + compile + + + equinoxSDK381 + org.eclipse.osgi + + + org.slf4j + slf4j-api + ${slf4j.version} + - + + org.slf4j + slf4j-simple + ${slf4j.version} + compile + + + org.onap.ccsdk.sli.core + dblib-provider + ${sdnctl.dblib.version} + - + - - -- cgit 1.2.3-korg