From 07b48a05b99aa8f8d26f6009b55c4f041fbaeec4 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Wed, 9 Jan 2019 16:42:33 -0500 Subject: Template-Node Intall Adding TemplateNode in sli plugin features, as it's not getting installed as a default feature install Change-Id: I4804a40c8078df9f183b7752f5306643dfe0e588 Issue-ID: CCSDK-924 Signed-off-by: Singal, Kapil (ks220y) --- features/ccsdk-sli-plugins-all/pom.xml | 7 + template-node/features/ccsdk-template-node/pom.xml | 5 +- .../features/features-template-node/pom.xml | 8 +- template-node/features/pom.xml | 34 +-- template-node/installer/pom.xml | 258 +++++++++++---------- .../src/assembly/assemble_installer_zip.xml | 57 +++-- .../src/assembly/assemble_mvnrepo_zip.xml | 37 ++- .../src/main/resources/scripts/install-feature.sh | 2 +- template-node/pom.xml | 37 +-- template-node/provider/pom.xml | 5 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 6 +- 11 files changed, 241 insertions(+), 215 deletions(-) diff --git a/features/ccsdk-sli-plugins-all/pom.xml b/features/ccsdk-sli-plugins-all/pom.xml index 4d846bd1..37692c0d 100644 --- a/features/ccsdk-sli-plugins-all/pom.xml +++ b/features/ccsdk-sli-plugins-all/pom.xml @@ -53,6 +53,13 @@ xml features + + ${project.groupId} + ccsdk-template-node + ${project.version} + xml + features + ${project.groupId} ccsdk-sshapi-call-node diff --git a/template-node/features/ccsdk-template-node/pom.xml b/template-node/features/ccsdk-template-node/pom.xml index f544fb5a..30d8383a 100644 --- a/template-node/features/ccsdk-template-node/pom.xml +++ b/template-node/features/ccsdk-template-node/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 @@ -14,6 +16,7 @@ 0.4.0-SNAPSHOT feature + ccsdk-sli-plugins :: template-node :: ${project.artifactId} diff --git a/template-node/features/features-template-node/pom.xml b/template-node/features/features-template-node/pom.xml index 7a61f8ca..058db5ca 100644 --- a/template-node/features/features-template-node/pom.xml +++ b/template-node/features/features-template-node/pom.xml @@ -1,12 +1,14 @@ - + 4.0.0 org.onap.ccsdk.parent feature-repo-parent 1.2.0-SNAPSHOT - + org.onap.ccsdk.sli.plugins @@ -14,6 +16,8 @@ 0.4.0-SNAPSHOT feature + ccsdk-sli-plugins :: template-node :: ${project.artifactId} + ${project.groupId} diff --git a/template-node/features/pom.xml b/template-node/features/pom.xml index 3b9688ed..4056ab4e 100644 --- a/template-node/features/pom.xml +++ b/template-node/features/pom.xml @@ -1,20 +1,24 @@ - - 4.0.0 + + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.2.0-SNAPSHOT - + + org.onap.ccsdk.parent + odlparent-lite + 1.2.0-SNAPSHOT + - org.onap.ccsdk.sli.plugins - template-node-features - 0.4.0-SNAPSHOT - pom + org.onap.ccsdk.sli.plugins + template-node-features + 0.4.0-SNAPSHOT + pom - - ccsdk-template-node - features-template-node - + ccsdk-sli-plugins :: template-node :: ${project.artifactId} + + + ccsdk-template-node + features-template-node + diff --git a/template-node/installer/pom.xml b/template-node/installer/pom.xml index fb1cd1f2..a298828b 100644 --- a/template-node/installer/pom.xml +++ b/template-node/installer/pom.xml @@ -1,136 +1,140 @@ - - 4.0.0 + + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.2.0-SNAPSHOT - + + org.onap.ccsdk.parent + odlparent-lite + 1.2.0-SNAPSHOT + - org.onap.ccsdk.sli.plugins - template-node-installer - 0.4.0-SNAPSHOT - pom + org.onap.ccsdk.sli.plugins + template-node-installer + 0.4.0-SNAPSHOT + pom - - ccsdk-template-node - ${application.name} - mvn:org.onap.ccsdk.sli.plugins/${features.boot}/${project.version}/xml/features - false - + ccsdk-sli-plugins :: template-node :: ${project.artifactId} - - - org.onap.ccsdk.sli.plugins - ${application.name} - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.sli.plugins - template-node-provider - ${project.version} - - + + ccsdk-template-node + ${application.name} + mvn:org.onap.ccsdk.sli.plugins/${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.plugins,org.apache.velocity - 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.plugins + ${application.name} + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.plugins + template-node-provider + ${project.version} + + - - + + + + maven-assembly-plugin + 2.6 + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + 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.plugins,org.apache.velocity + 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/template-node/installer/src/assembly/assemble_installer_zip.xml b/template-node/installer/src/assembly/assemble_installer_zip.xml index b6fd6558..d7a0a630 100644 --- a/template-node/installer/src/assembly/assemble_installer_zip.xml +++ b/template-node/installer/src/assembly/assemble_installer_zip.xml @@ -22,37 +22,36 @@ - installer_zip - - zip - + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + installer_zip + + zip + - - false + + false - - - target/stage/ - ${application.name} - 755 - - *.sh - - - - target/stage/ - ${application.name} - 644 - - *.sh - - - + + + target/stage/ + ${application.name} + 755 + + *.sh + + + + target/stage/ + ${application.name} + 644 + + *.sh + + + diff --git a/template-node/installer/src/assembly/assemble_mvnrepo_zip.xml b/template-node/installer/src/assembly/assemble_mvnrepo_zip.xml index 2ee22447..7500304e 100644 --- a/template-node/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/template-node/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -22,27 +22,26 @@ - mvnrepo_zip - - zip - + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + repo + + zip + - - false + + false - - - target/assembly/ - . - - - - + + + target/assembly/ + . + + + + diff --git a/template-node/installer/src/main/resources/scripts/install-feature.sh b/template-node/installer/src/main/resources/scripts/install-feature.sh index 0eab001d..98276a7e 100644 --- a/template-node/installer/src/main/resources/scripts/install-feature.sh +++ b/template-node/installer/src/main/resources/scripts/install-feature.sh @@ -29,7 +29,7 @@ REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip if [ -f ${REPOZIP} ] then - unzip -d ${ODL_HOME} ${REPOZIP} + unzip -nd ${ODL_HOME} ${REPOZIP} else echo "ERROR : repo zip ($REPOZIP) not found" exit 1 diff --git a/template-node/pom.xml b/template-node/pom.xml index 8cfea743..0c918780 100644 --- a/template-node/pom.xml +++ b/template-node/pom.xml @@ -1,21 +1,26 @@ - - 4.0.0 + + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.2.0-SNAPSHOT - + + org.onap.ccsdk.parent + odlparent-lite + 1.2.0-SNAPSHOT + - org.onap.ccsdk.sli.plugins - template-node - 0.4.0-SNAPSHOT - pom + org.onap.ccsdk.sli.plugins + template-node + 0.4.0-SNAPSHOT + pom - - provider - features - installer - + ccsdk-sli-plugins :: template-node + This is an implementation of DG Execute Node that resolves a Velocity Template + + + provider + features + installer + diff --git a/template-node/provider/pom.xml b/template-node/provider/pom.xml index d7d8d8f8..bf90d352 100644 --- a/template-node/provider/pom.xml +++ b/template-node/provider/pom.xml @@ -13,6 +13,8 @@ 0.4.0-SNAPSHOT bundle + ccsdk-sli-plugins :: template-node :: ${project.artifactId} + junit @@ -22,17 +24,14 @@ org.onap.ccsdk.sli.core sli-common - provided org.onap.ccsdk.sli.core sli-provider - provided org.slf4j slf4j-api - provided org.apache.velocity diff --git a/template-node/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/template-node/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml index a8006b9b..60409c50 100644 --- a/template-node/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/template-node/provider/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,8 +1,10 @@ - + - + \ No newline at end of file -- cgit 1.2.3-korg