Fix classpath to include docs and conf

CLI-37
Change-Id: Iba7be18c12fd242c966eb7567dad401e82bc5149
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

diff --git a/README.md b/README.md
index 5fc739a..b1ef55d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -16,4 +16,4 @@ To run in debug mode, set following environment variables:
 1. ONAP_CLI_DEBUG - By default its false, otherwise Set to true
 2. ONAP_CLI_DEBUG_PORT - By default it is 5005, otherwise set to new TCP port number
 
-To know more, please refer the Onap wiki https://wiki.onap.org
\ No newline at end of file
+To know more, please refer the Onap wiki https://wiki.onap.org

diff --git a/deployment/zip/pom.xml b/deployment/zip/pom.xml
index 22c1cdd..eb214e4 100644 (file)
--- 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 9650ccd..4009a26 100755 (executable)
--- 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

diff --git a/framework/src/test/resources/onap.properties b/framework/src/test/resources/onap.properties
deleted file mode 100644 (file)
index cdbbfa8..0000000
--- a/framework/src/test/resources/onap.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-cli.ignore_auth=false
-cli.version=1.0
-cli.http.api_key_use_cookies=true
-
-cli.service_name=onap-cli
-cli.api_gateway=msb
-cli.auth_service=auth
-
-# service section
-cli.exclude_params_internal_cmd=onap-username,onap-password,host-url,no-auth
-cli.no_auth_disable_include_params_external_cmd=onap-username,onap-password,host-url,no-auth
-cli.no_auth_enable_exclude_params_external_cmd=onap-username,onap-password,no-auth
-cli.no_auth_enable_include_params_external_cmd=host-url
-
-cli.service.auth=aaf
-cli.http.basic.common_headers=x-auth-token,x-transaction-id,x-app-id
-cli.http.basic.common_headers.x-auth-token=Authorization
-cli.http.basic.common_headers.x-transaction-id=X-TransactionId
-cli.http.basic.common_headers.x-transaction-id.value=req-uuid
-cli.http.basic.common_headers.x-app-id=X-FromAppId
-cli.http.basic.common_headers.x-app-id.value=onap-cli
-
-# Service specific headers
-cli.http.basic.common_headers.sdc=user-id
-cli.http.basic.common_headers.sdc.user-id=USER_ID
-cli.http.basic.common_headers.sdc.user-id.value=${onap-username}
-
-#TODO mrkanag add support for aaf like defined above for basic
-#cli.service.auth=aaf
-
-#schema validation
-cli.schema.top_level_params_list=onap_cmd_schema_version,name,description,service,parameters,results,http
-cli.schema.top_level_mandatory_list=onap_cmd_schema_version
-
-cli.schema.service_params_list=name,version,auth,mode
-cli.schema.service_params_mandatory_list=name,version
-
-cli.schema.input_params_list=name,description,type,short_option,long_option, is_optional,default_value,is_secured
-cli.schema.input_params_mandatory_list=name,description,type
-
-cli.schema.result_params_list=name,description,scope,type,is_secured
-cli.schema.result_params_mandatory_list=name, description, type
-
-cli.schema.http_sections=request,success_codes,result_map,sample_response
-cli.schema.http_mandatory_sections=equest, success_codes
-
-cli.schema.http_request_params=uri,method,body,headers,queries
-cli.schema.http_request_mandatory_params=uri,method
-
-cli.schema.http_methods=post,get,delete,put,head
-
-cli.schema.boolean_values=true,false
-cli.schema.auth_values=none,basic
-cli.schema.mode_values=direct,catalog