From 07b48a05b99aa8f8d26f6009b55c4f041fbaeec4 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
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) <ks220y@att.com>
---
 .../src/assembly/assemble_installer_zip.xml        | 57 +++++++++++-----------
 .../src/assembly/assemble_mvnrepo_zip.xml          | 37 +++++++-------
 .../src/main/resources/scripts/install-feature.sh  |  2 +-
 3 files changed, 47 insertions(+), 49 deletions(-)

(limited to 'template-node/installer/src')

diff --git a/template-node/installer/src/assembly/assemble_installer_zip.xml b/template-node/installer/src/assembly/assemble_installer_zip.xml
index b6fd65582..d7a0a630d 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 @@
 <!-- Defines how we build the .zip file which is our distribution. -->
 
 <assembly
-    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">
-    <id>installer_zip</id>
-    <formats>
-        <format>zip</format>
-    </formats>
+	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">
+	<id>installer_zip</id>
+	<formats>
+		<format>zip</format>
+	</formats>
 
-    <!--  we want "system" and related files right at the root level
-          as this file is suppose to be unzip on top of a karaf
-          distro. -->
-    <includeBaseDirectory>false</includeBaseDirectory>
+	<!-- we want "system" and related files right at the root level as this 
+		file is suppose to be unzip on top of a karaf distro. -->
+	<includeBaseDirectory>false</includeBaseDirectory>
 
-    <fileSets>
-        <fileSet>
-            <directory>target/stage/</directory>
-            <outputDirectory>${application.name}</outputDirectory>
-            <fileMode>755</fileMode>
-            <includes>
-                <include>*.sh</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target/stage/</directory>
-            <outputDirectory>${application.name}</outputDirectory>
-            <fileMode>644</fileMode>
-            <excludes>
-                <exclude>*.sh</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
+	<fileSets>
+		<fileSet>
+			<directory>target/stage/</directory>
+			<outputDirectory>${application.name}</outputDirectory>
+			<fileMode>755</fileMode>
+			<includes>
+				<include>*.sh</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>target/stage/</directory>
+			<outputDirectory>${application.name}</outputDirectory>
+			<fileMode>644</fileMode>
+			<excludes>
+				<exclude>*.sh</exclude>
+			</excludes>
+		</fileSet>
+	</fileSets>
 
 
 
diff --git a/template-node/installer/src/assembly/assemble_mvnrepo_zip.xml b/template-node/installer/src/assembly/assemble_mvnrepo_zip.xml
index 2ee224477..7500304e8 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 @@
 <!-- Defines how we build the .zip file which is our distribution. -->
 
 <assembly
-    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">
-    <id>mvnrepo_zip</id>
-    <formats>
-        <format>zip</format>
-    </formats>
+	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">
+	<id>repo</id>
+	<formats>
+		<format>zip</format>
+	</formats>
 
-    <!--  we want "system" and related files right at the root level
-          as this file is suppose to be unzip on top of a karaf
-          distro. -->
-    <includeBaseDirectory>false</includeBaseDirectory>
+	<!-- we want "system" and related files right at the root level as this 
+		file is suppose to be unzip on top of a karaf distro. -->
+	<includeBaseDirectory>false</includeBaseDirectory>
 
-    <fileSets>
-        <fileSet>
-            <directory>target/assembly/</directory>
-            <outputDirectory>.</outputDirectory>
-            <excludes>
-            </excludes>
-        </fileSet>
-    </fileSets>
+	<fileSets>
+		<fileSet>
+			<directory>target/assembly/</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+			</excludes>
+		</fileSet>
+	</fileSets>
 
 
 
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 0eab001d5..98276a7e0 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
-- 
cgit 1.2.3-korg