From c7d0075d223eab9f89fd28853c4b138792059be9 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Thu, 1 Jun 2017 10:45:37 -0700 Subject: Merge of new rebased code Change-Id: I9b8d1f69eb3e0af1935ed8304fea4bf54c1aac47 Signed-off-by: Patrick Brady --- appc-oam/appc-oam-installer/.gitignore | 2 + appc-oam/appc-oam-installer/pom.xml | 143 +++++++++++++++++++++ .../src/assembly/assemble_installer_zip.xml | 59 +++++++++ .../src/assembly/assemble_mvnrepo_zip.xml | 54 ++++++++ .../src/main/resources/scripts/install-feature.sh | 40 ++++++ 5 files changed, 298 insertions(+) create mode 100644 appc-oam/appc-oam-installer/.gitignore create mode 100644 appc-oam/appc-oam-installer/pom.xml create mode 100644 appc-oam/appc-oam-installer/src/assembly/assemble_installer_zip.xml create mode 100644 appc-oam/appc-oam-installer/src/assembly/assemble_mvnrepo_zip.xml create mode 100644 appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh (limited to 'appc-oam/appc-oam-installer') diff --git a/appc-oam/appc-oam-installer/.gitignore b/appc-oam/appc-oam-installer/.gitignore new file mode 100644 index 000000000..731eb433c --- /dev/null +++ b/appc-oam/appc-oam-installer/.gitignore @@ -0,0 +1,2 @@ +/target/ +/.settings/ diff --git a/appc-oam/appc-oam-installer/pom.xml b/appc-oam/appc-oam-installer/pom.xml new file mode 100644 index 000000000..02c6ee8a7 --- /dev/null +++ b/appc-oam/appc-oam-installer/pom.xml @@ -0,0 +1,143 @@ + + + 4.0.0 + + appc-oam + org.openecomp.appc + 1.1.0-SNAPSHOT + + + appc-oam-installer + APPC OAM - Karaf Installer + pom + + + appc-oam + appc-oam + mvn:org.openecomp.appc/appc-oam-features/${project.version}/xml/features + false + + + + + + org.openecomp.appc + appc-oam-features + ${project.version} + features + xml + + + * + * + + + + + + org.openecomp.appc + appc-oam-bundle + ${project.version} + + + + org.openecomp.appc + appc-oam-bundle + ${project.version} + config + xml + + + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + false + false + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + + + + installer-zip + + single + + package + + false + true + ${application.name}-${project.version} + + src/assembly/assemble_installer_zip.xml + + + + + + + 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.opendaylight + provided + + + + + + maven-resources-plugin + + + copy-version + + copy-resources + + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + + + + + + + diff --git a/appc-oam/appc-oam-installer/src/assembly/assemble_installer_zip.xml b/appc-oam/appc-oam-installer/src/assembly/assemble_installer_zip.xml new file mode 100644 index 000000000..8948a3302 --- /dev/null +++ b/appc-oam/appc-oam-installer/src/assembly/assemble_installer_zip.xml @@ -0,0 +1,59 @@ + + + + + + controller + + zip + + + + false + + + + target/stage/ + ${application.name} + 755 + + *.sh + + + + target/stage/ + ${application.name} + 644 + + *.sh + + + + + + + diff --git a/appc-oam/appc-oam-installer/src/assembly/assemble_mvnrepo_zip.xml b/appc-oam/appc-oam-installer/src/assembly/assemble_mvnrepo_zip.xml new file mode 100644 index 000000000..d88eaaace --- /dev/null +++ b/appc-oam/appc-oam-installer/src/assembly/assemble_mvnrepo_zip.xml @@ -0,0 +1,54 @@ + + + + + + controller + + zip + + + + false + + + + target/assembly/ + . + + + + + + + + ../${feature-name}-bundle/src/main/resources/initial/${feature-name}.xml + ./etc/opendaylight/karaf/201-${feature-name}.xml + + + + diff --git a/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh b/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh new file mode 100644 index 000000000..1d769fada --- /dev/null +++ b/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh @@ -0,0 +1,40 @@ +### +# ============LICENSE_START======================================================= +# openECOMP : APP-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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========================================================= +### + +#!/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 -n -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} -- cgit 1.2.3-korg