From 39f345954434553d10e0cea114e15e0521ec9471 Mon Sep 17 00:00:00 2001
From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Tue, 26 Sep 2017 10:04:10 +0530
Subject: Migrate onap-cli-schema into open-cli-schema

Issue-Id: CLI-66

Change-Id: I719719194bc5f21f4316380e606ce1a58f0f046c
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---
 deployment/zip/installer/install.sh         | 5 ++---
 deployment/zip/pom.xml                      | 8 ++++----
 deployment/zip/src/main/release/bin/onap.sh | 8 ++++----
 3 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'deployment/zip')

diff --git a/deployment/zip/installer/install.sh b/deployment/zip/installer/install.sh
index c5ec4216..177656a9 100644
--- a/deployment/zip/installer/install.sh
+++ b/deployment/zip/installer/install.sh
@@ -20,8 +20,7 @@ CLI_LATEST_BINARY="https://nexus.onap.org/service/local/artifact/maven/redirect?
 CLI_INSTALL_DIR=/opt/onap/cli
 CLI_ZIP=cli.zip
 CLI_BIN=/usr/bin/onap
-export ONAP_CLI_HOME=$CLI_INSTALL_DIR
-export CLI_PRODUCT_VERSION=onap-1.1
+export OPEN_CLI_HOME=$CLI_INSTALL_DIR
 
 #create install dir
 if [ -d $CLI_INSTALL_DIR ]
@@ -47,7 +46,7 @@ wget -O $CLI_ZIP $CLI_LATEST_BINARY
 
 unzip $CLI_ZIP
 if [ ! -d ./data ]; then mkdir ./data; fi
-if [ ! -d ./onap-cli-schema ]; then mkdir ./onap-cli-schema; fi
+if [ ! -d ./open-cli-schema ]; then mkdir ./open-cli-schema; fi
 chmod +x ./bin/onap.sh
 
 #Make onap available in path
diff --git a/deployment/zip/pom.xml b/deployment/zip/pom.xml
index 05d015c6..9ad346cc 100644
--- a/deployment/zip/pom.xml
+++ b/deployment/zip/pom.xml
@@ -38,7 +38,7 @@
                 <version>1.5</version>
                 <executions>
                     <execution>
-                        <id>onap-cli-deployment</id>
+                        <id>open-cli-deployment</id>
                         <phase>package</phase>
                         <goals>
                             <goal>execute</goal>
@@ -62,8 +62,8 @@
                                 ant.delete(dir: "${deployUnzip}/lib")
                                 ant.mkdir(dir: "${deployUnzip}/lib")
 
-                                ant.delete(dir: "${deployUnzip}/onap-cli-schema")
-                                ant.mkdir(dir: "${deployUnzip}/onap-cli-schema")
+                                ant.delete(dir: "${deployUnzip}/open-cli-schema")
+                                ant.mkdir(dir: "${deployUnzip}/open-cli-schema")
 
                                 ant.delete(dir: "${deployUnzip}/data")
                                 ant.mkdir(dir: "${deployUnzip}/data")
@@ -93,7 +93,7 @@
                                 ant.copy(todir:
                                 "${deployUnzip}/conf") {
                                 fileset(file:
-                                "${project.build.directory}/../../../framework/src/main/resources/onap.properties")
+                                "${project.build.directory}/../../../framework/src/main/resources/open-cli.properties")
                                 }
 
                                 ant.copy(todir:
diff --git a/deployment/zip/src/main/release/bin/onap.sh b/deployment/zip/src/main/release/bin/onap.sh
index c7d4142a..9349c143 100755
--- a/deployment/zip/src/main/release/bin/onap.sh
+++ b/deployment/zip/src/main/release/bin/onap.sh
@@ -16,14 +16,14 @@
 # limitations under the License.
 #*******************************************************************************
 
-if [ -z "$ONAP_CLI_HOME" ]
+if [ -z "$OPEN_CLI_HOME" ]
 then
-    echo "There is no ONAP_CLI_HOME"
+    echo "There is no OPEN_CLI_HOME"
     exit 1
 fi
 
-CLASSPATH=$ONAP_CLI_HOME:$ONAP_CLI_HOME/conf:$ONAP_CLI_HOME/docs
-for entry in "$ONAP_CLI_HOME/lib"/*
+CLASSPATH=$OPEN_CLI_HOME:$OPEN_CLI_HOME/conf:$OPEN_CLI_HOME/docs
+for entry in "$OPEN_CLI_HOME/lib"/*
 do
   CLASSPATH=$CLASSPATH:$entry
 done
-- 
cgit 1.2.3-korg