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 --- .../features/ccsdk-mdsal-resource/pom.xml | 48 ++++++++ .../features/features-mdsal-resource/pom.xml | 30 +++++ mdsal-resource/features/pom.xml | 137 ++------------------- .../features/src/main/resources/features.xml | 38 ------ mdsal-resource/installer/pom.xml | 30 +++-- .../src/main/resources/scripts/install-feature.sh | 9 +- mdsal-resource/pom.xml | 49 +++----- mdsal-resource/provider/pom.xml | 82 ++---------- 8 files changed, 140 insertions(+), 283 deletions(-) create mode 100644 mdsal-resource/features/ccsdk-mdsal-resource/pom.xml create mode 100755 mdsal-resource/features/features-mdsal-resource/pom.xml delete mode 100644 mdsal-resource/features/src/main/resources/features.xml (limited to 'mdsal-resource') diff --git a/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml b/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml new file mode 100644 index 000000000..6869f16c5 --- /dev/null +++ b/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml @@ -0,0 +1,48 @@ + + + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 1.0.1-SNAPSHOT + + + + org.onap.ccsdk.sli.adaptors + ccsdk-mdsal-resource + 0.2.1-SNAPSHOT + feature + + ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${project.version} + xml + features + + + + ${project.groupId} + mdsal-resource-provider + ${project.version} + + + + equinoxSDK381 + org.eclipse.osgi + provided + + + diff --git a/mdsal-resource/features/features-mdsal-resource/pom.xml b/mdsal-resource/features/features-mdsal-resource/pom.xml new file mode 100755 index 000000000..da7b67d93 --- /dev/null +++ b/mdsal-resource/features/features-mdsal-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-mdsal-resource + 0.2.1-SNAPSHOT + feature + + ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} + + + + ${project.groupId} + ccsdk-mdsal-resource + ${project.version} + xml + features + + + + diff --git a/mdsal-resource/features/pom.xml b/mdsal-resource/features/pom.xml index 478ef057c..f46897baa 100755 --- a/mdsal-resource/features/pom.xml +++ b/mdsal-resource/features/pom.xml @@ -1,134 +1,23 @@ - + 4.0.0 + - mdsal-resource org.onap.ccsdk.sli.adaptors + mdsal-resource 0.2.0-SNAPSHOT - mdsal-resource-features - MD-SAL Resource Adaptor - Features - - jar - - - - - - org.onap.ccsdk.sli.adaptors - mdsal-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 - - + org.onap.ccsdk.sli.adaptors + mdsal-resource-features + 0.2.1-SNAPSHOT + pom - - - - 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 - - - - - - - - + + ccsdk-mdsal-resource + features-mdsal-resource + diff --git a/mdsal-resource/features/src/main/resources/features.xml b/mdsal-resource/features/src/main/resources/features.xml deleted file mode 100644 index 5a2bae1b2..000000000 --- a/mdsal-resource/features/src/main/resources/features.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features - - - - - odl-mdsal-broker - sdnc-sli - mvn:org.onap.ccsdk.sli.adaptors/mdsal-resource-provider/${project.version} - - - diff --git a/mdsal-resource/installer/pom.xml b/mdsal-resource/installer/pom.xml index 9f4027b03..934492260 100755 --- a/mdsal-resource/installer/pom.xml +++ b/mdsal-resource/installer/pom.xml @@ -1,19 +1,25 @@ - + 4.0.0 + - mdsal-resource - org.onap.ccsdk.sli.adaptors - 0.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + + org.onap.ccsdk.sli.adaptors mdsal-resource-installer - MDSAL Resource - Karaf Installer + 0.2.1-SNAPSHOT pom + ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} + - sdnc-mdsal-resource - sdnc-mdsal-resource - mvn:org.onap.ccsdk.sli.adaptors/mdsal-resource-features/${project.version}/xml/features + ccsdk-mdsal-resource + ${application.name} + mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features false @@ -21,10 +27,10 @@ org.onap.ccsdk.sli.adaptors - mdsal-resource-features + ccsdk-mdsal-resource ${project.version} - features xml + features * @@ -98,8 +104,7 @@ true false false - org.onap.ccsdk - sli-common,sli-provider,dblib-provider + org.onap.ccsdk.sli.adaptors provided @@ -134,5 +139,4 @@ - diff --git a/mdsal-resource/installer/src/main/resources/scripts/install-feature.sh b/mdsal-resource/installer/src/main/resources/scripts/install-feature.sh index df03392c8..0eab001d5 100644 --- a/mdsal-resource/installer/src/main/resources/scripts/install-feature.sh +++ b/mdsal-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/mdsal-resource/pom.xml b/mdsal-resource/pom.xml index 5d434668c..e823df289 100755 --- a/mdsal-resource/pom.xml +++ b/mdsal-resource/pom.xml @@ -1,46 +1,27 @@ - + + 4.0.0 + - org.onap.ccsdk.sli.adaptors - ccsdk-sli-adaptors - 0.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT - 4.0.0 - pom org.onap.ccsdk.sli.adaptors mdsal-resource + 0.2.1-SNAPSHOT + pom - - MD-SAL Resource Adaptor + ccsdk-sli-adaptors :: mdsal-resource The MD-SAL resource adaptor allows service logic to access persistent data from MD-SAL config and operational trees - 0.2.0-SNAPSHOT - - - - - - org.onap.ccsdk.sli.adaptors - mdsal-resource-features - features - xml - ${project.version} - - - - org.onap.ccsdk.sli.adaptors - mdsal-resource-provider - ${project.version} - - - + + provider + features + installer + - - - provider - features - installer - diff --git a/mdsal-resource/provider/pom.xml b/mdsal-resource/provider/pom.xml index 0e158ebda..b690b6f2f 100755 --- a/mdsal-resource/provider/pom.xml +++ b/mdsal-resource/provider/pom.xml @@ -1,18 +1,26 @@ - + 4.0.0 + - org.onap.ccsdk.sli.adaptors - mdsal-resource - 0.2.0-SNAPSHOT + org.onap.ccsdk.parent + binding-parent + 1.0.1-SNAPSHOT + + org.onap.ccsdk.sli.adaptors mdsal-resource-provider + 0.2.1-SNAPSHOT bundle - MD-SAL Resource Adaptor - Provider + + ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} http://maven.apache.org + UTF-8 + @@ -36,7 +44,6 @@ equinoxSDK381 org.eclipse.osgi - ${equinox.osgi.version} org.slf4j @@ -67,67 +74,4 @@ - - - - - org.apache.felix - maven-bundle-plugin - ${bundle.plugin.version} - true - - - org.onap.ccsdk.sli.adaptors.resource.mdsal - org.onap.ccsdk.sli.adaptors.resource.mdsal.MdsalResourceActivator - org.onap.ccsdk.sli.adaptors.resource.mdsal - org.onap.ccsdk.sli.adaptors.*,org.osgi.framework.*,org.slf4j.*,com.mysql.jdbc.* - - * - true - - - - - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - com.brocade.developer - - - providermodule-plugin - - - [1.2.0.100-SNAPSHOT,) - - - process - - - - - - - - - - - - - -- cgit 1.2.3-korg