From 37d6468cc670045ab4ff1ee23315739a429aa5e3 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 21 Sep 2017 16:07:02 -0400 Subject: [PATCH] Install sdnc-core utils as karaf package New utils jar was added in another change, but wasn't bundled as a karaf feature and was not being installed in container. This broke odlsli docker container. This change wraps that util package as a new feature (sdnc-core-utils). Change-Id: Ie8c1d608e2c67aa1635837bc400cec942761c81c Issue-ID: CCSDK-54 Signed-off-by: Dan Timoney --- dblib/provider/pom.xml | 2 +- pom.xml | 2 +- utils/features/pom.xml | 138 +++++++++++++++++++++ utils/features/src/main/resources/features.xml | 16 +++ utils/installer/pom.xml | 138 +++++++++++++++++++++ .../src/assembly/assemble_installer_zip.xml | 39 ++++++ .../src/assembly/assemble_mvnrepo_zip.xml | 29 +++++ .../src/main/resources/scripts/install-feature.sh | 19 +++ utils/pom.xml | 105 ++++++++++------ utils/provider/pom.xml | 56 +++++++++ .../ccsdk/sli/core/utils/DefaultFileResolver.java | 0 .../ccsdk/sli/core/utils/EnvVarFileResolver.java | 0 .../onap/ccsdk/sli/core/utils/JREFileResolver.java | 0 .../sli/core/utils/KarafRootFileResolver.java | 0 .../sli/core/utils/PropertiesFileResolver.java | 0 .../core/utils/dblib/DblibDefaultFileResolver.java | 0 .../core/utils/dblib/DblibEnvVarFileResolver.java | 0 .../ccsdk/sli/core/utils/JREFileResolverTest.java | 0 .../sli/core/utils/KarafRootFileResolverTest.java | 0 .../utils/dblib/DblibDefaultFileResolverTest.java | 0 .../utils/dblib/DblibEnvVarFileResolverTest.java | 0 21 files changed, 501 insertions(+), 43 deletions(-) create mode 100755 utils/features/pom.xml create mode 100755 utils/features/src/main/resources/features.xml create mode 100755 utils/installer/pom.xml create mode 100755 utils/installer/src/assembly/assemble_installer_zip.xml create mode 100755 utils/installer/src/assembly/assemble_mvnrepo_zip.xml create mode 100644 utils/installer/src/main/resources/scripts/install-feature.sh mode change 100644 => 100755 utils/pom.xml create mode 100644 utils/provider/pom.xml rename utils/{ => provider}/src/main/java/org/onap/ccsdk/sli/core/utils/DefaultFileResolver.java (100%) rename utils/{ => provider}/src/main/java/org/onap/ccsdk/sli/core/utils/EnvVarFileResolver.java (100%) rename utils/{ => provider}/src/main/java/org/onap/ccsdk/sli/core/utils/JREFileResolver.java (100%) rename utils/{ => provider}/src/main/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolver.java (100%) rename utils/{ => provider}/src/main/java/org/onap/ccsdk/sli/core/utils/PropertiesFileResolver.java (100%) rename utils/{ => provider}/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolver.java (100%) rename utils/{ => provider}/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolver.java (100%) rename utils/{ => provider}/src/test/java/org/onap/ccsdk/sli/core/utils/JREFileResolverTest.java (100%) rename utils/{ => provider}/src/test/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolverTest.java (100%) rename utils/{ => provider}/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolverTest.java (100%) rename utils/{ => provider}/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolverTest.java (100%) diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml index ad1cc9d28..6d4d93239 100755 --- a/dblib/provider/pom.xml +++ b/dblib/provider/pom.xml @@ -58,7 +58,7 @@ org.onap.ccsdk.sli.core - utils + utils-provider ${project.version} diff --git a/pom.xml b/pom.xml index a36918109..efbe2738a 100755 --- a/pom.xml +++ b/pom.xml @@ -109,12 +109,12 @@ + utils dblib sli filters sliPluginUtils sliapi - utils ONAP diff --git a/utils/features/pom.xml b/utils/features/pom.xml new file mode 100755 index 000000000..6871d8eb9 --- /dev/null +++ b/utils/features/pom.xml @@ -0,0 +1,138 @@ + + + 4.0.0 + + utils + org.onap.ccsdk.sli.core + 0.1.2-SNAPSHOT + + utils-features + DBLIB Adaptor - Features + + jar + + + + + + org.onap.ccsdk.sli.core + utils-provider + ${project.version} + + + + commons-lang + commons-lang + 2.6 + compile + + + + org.opendaylight.mdsal + features-mdsal + ${odl.mdsal.features.version} + features + xml + + runtime + + + + org.apache.tomcat + tomcat-jdbc + ${tomcat-jdbc.version} + + + + + 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 + + + + + + + + + diff --git a/utils/features/src/main/resources/features.xml b/utils/features/src/main/resources/features.xml new file mode 100755 index 000000000..409f8c485 --- /dev/null +++ b/utils/features/src/main/resources/features.xml @@ -0,0 +1,16 @@ + + + + + mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features + + + + + odl-mdsal-broker + mvn:org.onap.ccsdk.sli.core/util-provider/${project.version} + + + diff --git a/utils/installer/pom.xml b/utils/installer/pom.xml new file mode 100755 index 000000000..b6f7f825c --- /dev/null +++ b/utils/installer/pom.xml @@ -0,0 +1,138 @@ + + + 4.0.0 + + utils + org.onap.ccsdk.sli.core + 0.1.2-SNAPSHOT + + utils-installer + SLI core utils - Karaf Installer + pom + + + sdnc-core-utils + sdnc-core-utils + mvn:org.onap.ccsdk.sli.core/utils-features/${project.version}/xml/features + false + + + + + + org.onap.ccsdk.sli.core + utils-features + ${project.version} + features + xml + + + * + * + + + + + + org.onap.ccsdk.sli.core + utils-provider + ${project.version} + + + + + + + + + maven-assembly-plugin + + + 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,org.apache.tomcat + sli-common,sli-provider + 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/utils/installer/src/assembly/assemble_installer_zip.xml b/utils/installer/src/assembly/assemble_installer_zip.xml new file mode 100755 index 000000000..a6a22a9ba --- /dev/null +++ b/utils/installer/src/assembly/assemble_installer_zip.xml @@ -0,0 +1,39 @@ + + + + bin + + + zip + + + + false + + + + target/stage/ + ${application.name} + 755 + + *.sh + + + + target/stage/ + ${application.name} + 644 + + *.sh + + + + + + + diff --git a/utils/installer/src/assembly/assemble_mvnrepo_zip.xml b/utils/installer/src/assembly/assemble_mvnrepo_zip.xml new file mode 100755 index 000000000..d96c9f402 --- /dev/null +++ b/utils/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -0,0 +1,29 @@ + + + + bin + + + zip + + + + false + + + + target/assembly/ + . + + + + + + + + diff --git a/utils/installer/src/main/resources/scripts/install-feature.sh b/utils/installer/src/main/resources/scripts/install-feature.sh new file mode 100644 index 000000000..16b5be8c4 --- /dev/null +++ b/utils/installer/src/main/resources/scripts/install-feature.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +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 + +if [ -f ${REPOZIP} ] +then + unzip -d ${ODL_HOME} ${REPOZIP} +else + echo "ERROR : repo zip ($REPOZIP) not found" + 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} diff --git a/utils/pom.xml b/utils/pom.xml old mode 100644 new mode 100755 index 93326a9dc..cf7dbc50f --- a/utils/pom.xml +++ b/utils/pom.xml @@ -1,56 +1,79 @@ - - + org.onap.ccsdk.sli.core ccsdk-sli-core 0.1.2-SNAPSHOT + 4.0.0 - bundle + pom + org.onap.ccsdk.sli.core utils - SLI Core Utilities Package - - - The SLI Core Utilities Package provides common functionality for setting up SLI connectivity. - - - - - com.google.guava - guava - - - equinoxSDK381 - org.eclipse.osgi - ${equinox.osgi.version} - - - - - org.mockito - mockito-core - test - - - junit - junit - test - - + + + SLI Utils + Utilities used across sli-core + + 0.1.2-SNAPSHOT - - - org.apache.felix - maven-bundle-plugin - ${bundle.plugin.version} - - + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compile.plugin.version} + + ${java.version.source} + ${java.version.target} + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10 + + + + aggregate + + aggregate + + site + + + + + + maven-source-plugin + 2.1.1 + + + bundle-sources + package + + + jar-no-fork + + + test-jar-no-fork + + + + + + + - Inocybe Technologies and Others + AT&T + + provider + features + installer + diff --git a/utils/provider/pom.xml b/utils/provider/pom.xml new file mode 100644 index 000000000..41527f0e4 --- /dev/null +++ b/utils/provider/pom.xml @@ -0,0 +1,56 @@ + + + + + org.onap.ccsdk.sli.core + ccsdk-sli-core + 0.1.2-SNAPSHOT + + + 4.0.0 + bundle + utils-provider + SLI Core Utilities Package + + + The SLI Core Utilities Package provides common functionality for setting up SLI connectivity. + + + + + com.google.guava + guava + + + equinoxSDK381 + org.eclipse.osgi + ${equinox.osgi.version} + + + + + org.mockito + mockito-core + test + + + junit + junit + test + + + + + + + org.apache.felix + maven-bundle-plugin + ${bundle.plugin.version} + + + + + Inocybe Technologies and Others + + diff --git a/utils/src/main/java/org/onap/ccsdk/sli/core/utils/DefaultFileResolver.java b/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/DefaultFileResolver.java similarity index 100% rename from utils/src/main/java/org/onap/ccsdk/sli/core/utils/DefaultFileResolver.java rename to utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/DefaultFileResolver.java diff --git a/utils/src/main/java/org/onap/ccsdk/sli/core/utils/EnvVarFileResolver.java b/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/EnvVarFileResolver.java similarity index 100% rename from utils/src/main/java/org/onap/ccsdk/sli/core/utils/EnvVarFileResolver.java rename to utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/EnvVarFileResolver.java diff --git a/utils/src/main/java/org/onap/ccsdk/sli/core/utils/JREFileResolver.java b/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/JREFileResolver.java similarity index 100% rename from utils/src/main/java/org/onap/ccsdk/sli/core/utils/JREFileResolver.java rename to utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/JREFileResolver.java diff --git a/utils/src/main/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolver.java b/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolver.java similarity index 100% rename from utils/src/main/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolver.java rename to utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolver.java diff --git a/utils/src/main/java/org/onap/ccsdk/sli/core/utils/PropertiesFileResolver.java b/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/PropertiesFileResolver.java similarity index 100% rename from utils/src/main/java/org/onap/ccsdk/sli/core/utils/PropertiesFileResolver.java rename to utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/PropertiesFileResolver.java diff --git a/utils/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolver.java b/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolver.java similarity index 100% rename from utils/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolver.java rename to utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolver.java diff --git a/utils/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolver.java b/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolver.java similarity index 100% rename from utils/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolver.java rename to utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolver.java diff --git a/utils/src/test/java/org/onap/ccsdk/sli/core/utils/JREFileResolverTest.java b/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/JREFileResolverTest.java similarity index 100% rename from utils/src/test/java/org/onap/ccsdk/sli/core/utils/JREFileResolverTest.java rename to utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/JREFileResolverTest.java diff --git a/utils/src/test/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolverTest.java b/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolverTest.java similarity index 100% rename from utils/src/test/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolverTest.java rename to utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/KarafRootFileResolverTest.java diff --git a/utils/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolverTest.java b/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolverTest.java similarity index 100% rename from utils/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolverTest.java rename to utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibDefaultFileResolverTest.java diff --git a/utils/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolverTest.java b/utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolverTest.java similarity index 100% rename from utils/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolverTest.java rename to utils/provider/src/test/java/org/onap/ccsdk/sli/core/utils/dblib/DblibEnvVarFileResolverTest.java -- 2.16.6