From 56ecabe9f1e7fca51d919df2836811b378c0e7df Mon Sep 17 00:00:00 2001
From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Tue, 29 Aug 2017 18:13:06 +0530
Subject: Fix classpath to include docs and conf

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

(limited to 'deployment/zip')

diff --git a/deployment/zip/pom.xml b/deployment/zip/pom.xml
index 22c1cddf..eb214e42 100644
--- a/deployment/zip/pom.xml
+++ b/deployment/zip/pom.xml
@@ -83,6 +83,17 @@
                                 "${project.build.directory}/../../../plugins/target/lib/")
                                 }
 
+                                ant.copy(todir:
+                                "${deployUnzip}/conf") {
+                                fileset(file:
+                                "${project.build.directory}/../../../framework/src/main/resources/onap.properties")
+                                }
+
+                                ant.copy(todir:
+                                "${deployUnzip}/docs") {
+                                fileset(file:
+                                "${project.build.directory}/../../../README.md")
+                                }
                                 ant.zip(destfile:
                                 "${deployFolder}/${outfileName}") {
                                 fileset(dir: "${deployUnzip}")
diff --git a/deployment/zip/src/main/release/bin/onap.sh b/deployment/zip/src/main/release/bin/onap.sh
index 9650ccd1..4009a265 100755
--- a/deployment/zip/src/main/release/bin/onap.sh
+++ b/deployment/zip/src/main/release/bin/onap.sh
@@ -22,7 +22,7 @@ then
     exit 1
 fi
 
-CLASSPATH=$ONAP_CLI_HOME
+CLASSPATH=$ONAP_CLI_HOME:$ONAP_CLI_HOME/conf:$ONAP_CLI_HOME/docs
 for entry in "$ONAP_CLI_HOME/lib"/*
 do
   CLASSPATH=$CLASSPATH:$entry
@@ -30,8 +30,7 @@ done
 
 if [ "$ONAP_CLI_DEBUG" = "true" ]
 then
-    ${ONAP_CLI_DEBUG_PORT:=5005}
-    java -Xdebug -Xrunjdwp:transport=dt_socket,address=$ONAP_CLI_DEBUG_PORT,server=y -classpath $CLASSPATH org.onap.cli.main.OnapCli "$@"
+    java -Xdebug -Xrunjdwp:transport=dt_socket,address=${ONAP_CLI_DEBUG_PORT:-5005},server=y -classpath $CLASSPATH org.onap.cli.main.OnapCli "$@"
 else
     java -classpath $CLASSPATH org.onap.cli.main.OnapCli "$@"
 fi
-- 
cgit 1.2.3-korg