8 files changed, 77 insertions, 78 deletions
diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile
index 3765d205..a01449d7 100644
--- a/deployment/docker/src/main/docker/Dockerfile
+++ b/deployment/docker/src/main/docker/Dockerfile
@@ -16,10 +16,6 @@ ENV OPEN_CLI_DEBUG_PORT 5005
 ENV OPEN_CLI_MODE console
 ENV OPEN_CLI_PRODUCT_IN_USE open-cli
 
-ENV OPEN_CLI_HOST_URL http://localhost:8080
-ENV OPEN_CLI_USERNAME guest
-ENV OPEN_CLI_PASSWORD guest
-
 ENV GOTTY_TITLE_FORMAT {{ .command }}
 
 #Copy CLI into docker
@@ -40,7 +36,7 @@ RUN pandoc -t plain $OPEN_CLI_HOME/docs/README.md > $OPEN_CLI_HOME/docs/oclip-re
 COPY ./STAGE/http/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf
 COPY ./STAGE/http/web /var/www-data/servers/open-cli/
 COPY ./STAGE/http/lighttpd/10-proxy.conf /etc/lighttpd/conf-enabled/
-COPY ./STAGE/installer/cli-*.zip /var/www-data/servers/open-cli/open-cli.zip
+COPY ./STAGE/installer/cli-*.zip /var/www-data/servers/open-cli/oclip.zip
 
 RUN if [ ! -f /var/log/lighttpd/access.log ]; then touch /var/log/lighttpd/access.log; fi
 RUN cp /etc/lighttpd/conf-available/10-accesslog.conf /etc/lighttpd/conf-enabled/
diff --git a/deployment/http/web/index.html b/deployment/http/web/index.html
index 3897eb92..5a16ac2a 100644
--- a/deployment/http/web/index.html
+++ b/deployment/http/web/index.html
@@ -1,61 +1,71 @@
-<!DOCTYPE html><html><head><link rel="icon" href="./open-cli.png">
-<meta charset="utf-8"><title>Open CLI Platform (OCLIP)</title><style></style></head><body id="preview" style="background-color: black; color: #c3c3c3">
+<!DOCTYPE html><html><head><link rel="icon" href="./oclip.png">
+<meta charset="utf-8"><title>OCLIP...industry first open platform for cli</title><style></style>
 <script>
 function redirectToConsole(){
-   window.location.href="http://"+  window.location.hostname + ":9090";
+   window.location.href="http://"+  window.location.hostname + ":30261";
 }
 
 </script>
-<h1 id="open-command-line-interface-platform-oclip">Open Command-line interface Platform (OCLIP)</h1>
-<p>Provides unified commands to operate any cloud enabled software products from Linux/Web console.</p>
-<p>Set the following environment variable, before using OCLIP:</p>
-<p><strong>OPEN_CLI_HOME</strong> - Complete path of directory, where OCLIP is installed.</p>
-<h2 id="to-run-a-command">To Run a command</h2>
-<p>Configure the following environment variables:</p>
-<ol style="list-style-type: decimal">
-<li><strong>OPEN_CLI_HOST_URL</strong> - Catalog service URL or a service URL</li>
-<li><strong>OPEN_CLI_HOST_USERNAME</strong> - Service user name</li>
-<li><strong>OPEN_CLI_HOST_PASSWORD</strong> - Service password</li>
-</ol>
-<p>Run <strong>oclip <command></strong> from Linux console.</p>
-<h2 id="to-run-in-interactive-mode">To Run in Interactive mode</h2>
-<p>Run <strong>oclip</strong> from Linux console.</p>
-<p>And use the directive set to set the values for following parameters:</p>
-<ol style="list-style-type: decimal">
-<li><strong>host-url</strong> - Catalog service URL or a service URL</li>
-<li><strong>host-username</strong> - Service user name</li>
-<li><strong>host-password</strong> - Service password</li>
-</ol>
-<p>NOTE: This mode is available as Web command console when OCLIP is running from docker.</p>
-<h2 id="select-the-product-version">Select the product version</h2>
-<p>CLI framework is enhanced to handle multiple product versions at same time. so to choose the product version, set evironment variable <strong>OPEN_CLI_PROUDCT_IN_USE</strong>.</p>
-<p>NOTE: In interactive mode, product version can be selected using typing <strong>use <product-version></strong></p>
-<p>Run <em>oclip [-v|--version]</em> to see the available product version details.</p>
-<h2 id="set-the-parameter-values">Set the parameter values</h2>
-<p>Use the directive 'set' for setting the values for parameters and 'unset' for un-seting the values.</p>
-<h2 id="help">Help</h2>
-<p><em>oclip [-h|--help]</em> <em>oclip <command> [-h|--help]</em></p>
-<h2 id="debug-mode">Debug Mode</h2>
-<p>To run in debug mode, set following environment variables:</p>
-<ol style="list-style-type: decimal">
-<li>OPEN_CLI_DEBUG - By default its false, otherwise Set to true</li>
-<li>OPEN_CLI_DEBUG_PORT - By default it is 5005, otherwise set to new TCP port number</li>
+<style>
+
+body {
+    margin: 0 1% 0;
+    background-color: black
+}
+
+.readme {
+    display: inline-block;
+    float: left;
+    margin: 3% 3% 0;
+
+}
+
+* {box-sizing:border-box}
+
+.slideshow-container {
+ display: inline-block;
+ float: right;
+ max-width: 700px;
+ position: relative;
+ margin: 6% 3% 0;
+}
+
+.mySlides {
+    display: none;
+}
+
+</style>
+
+</head>
+
+<body onload="showSlides()" style="background-color: white;color: black">
+<div class="readme">
+<h2>Open Command-Line Interface Platform (OCLIP)</h2>
+
+<p>Industry first open platform to orchestrate CLI by using an declarative model <a href="http://onap.readthedocs.io/en/latest/submodules/cli.git/docs/open_cli_schema_version_1_0.html#open-cli-schema-version-1-0" style="color: blue;">Open Command Specification (OCS)</a>.
+<p>And for Cloud and Telco Operators, it provides Linux shell and Web Command Console to use those CLI.
+
+<h3 >Web Command Console (WCC)</h3>
+<p>Helps operator to access the command console over HTTP.
+<a onclick="redirectToConsole();" style="color: blue;cursor: pointer">Click here !</a>
+
+<h3>Linux Shell</h3>
+<p>Helps operator to run CLI locally using Linux command shell.
+
+<ol>
+<li>To download, <a href="./oclip.zip">Click here !</a></li>
+<li>Un-zip into folder /opt/oclip</li>
+<li>Run 'source /opt/oclip/install.sh'</li>
 </ol>
 
-<h2>
-<a id="More_details_42"></a>More details
-</h2>
-<p>
-<a href="https://wiki.onap.org">https://wiki.onap.org</a>
-</p>
-<h2>
-<a id="Download_42"></a>To download
-</h2>
-<p>Please download Open CLI Platform <a href="./open-cli.zip">here</a></p>
-
-<h2>
-<a id="Console_42"></a>Web Command console
-</h2>
-<p style="color:blue">Click <a onclick="redirectToConsole();">here</a></p>
-
-</body></html>
+<p>For more details, either run <strong>oclip</strong> from Linux console or refer /opt/oclip/docs/README.md
+
+<br>
+<br>
+
+<hr>
+<a href="http://onap.readthedocs.io/en/latest/submodules/cli.git/docs/index.html" style="color: blue;">
+<sub style="color: blue;"><strong> Manuals !!</strong></sub></a>
+</div>
+
+</body></html>
+\ No newline at end of file
diff --git a/deployment/http/web/oclip.png b/deployment/http/web/oclip.png
new file mode 100644
index 00000000..eb09412f
--- /dev/null
+++ b/deployment/http/web/oclip.png
diff --git a/deployment/http/web/open-cli.png b/deployment/http/web/open-cli.png
deleted file mode 100644
index 35f2b1ec..00000000
--- a/deployment/http/web/open-cli.png
+++ /dev/null
diff --git a/deployment/http/web/version.json b/deployment/http/web/version.json
index cbdc9a04..6fce85a8 100644
--- a/deployment/http/web/version.json
+++ b/deployment/http/web/version.json
@@ -1 +1 @@
-{"name": "oclip", "version": "1.0"}
-\ No newline at end of file
+{"name": "oclip", "version": "2.0.0"}
+\ No newline at end of file
diff --git a/deployment/zip/installer/install-latest.sh b/deployment/zip/installer/install-latest.sh
index 71488dae..19d0ce92 100644
--- a/deployment/zip/installer/install-latest.sh
+++ b/deployment/zip/installer/install-latest.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #*******************************************************************************
-# Copyright 2017 Huawei Technologies Co., Ltd.
+# Copyright 2017-18 Huawei Technologies Co., Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,10 +17,9 @@
 #*******************************************************************************
 
 CLI_LATEST_BINARY="https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.cli&a=cli-zip&e=zip&v=LATEST"
-CLI_INSTALL_DIR=/opt/onap/cli
+CLI_INSTALL_DIR=/opt/oclip
 CLI_ZIP=cli.zip
-CLI_BIN=/usr/bin/onap
-export OPEN_CLI_HOME=$CLI_INSTALL_DIR
+CLI_BIN=/usr/bin/oclip
 
 #create install dir
 if [ -d $CLI_INSTALL_DIR ]
@@ -45,14 +44,5 @@ fi
 wget -O $CLI_ZIP $CLI_LATEST_BINARY
 
 unzip $CLI_ZIP
-if [ ! -d ./data ]; then mkdir ./data; fi
-if [ ! -d ./open-cli-schema ]; then mkdir ./open-cli-schema; fi
-chmod +x ./bin/oclip.sh
 
-#Make oclip available in path
-ln ./bin/oclip.sh $CLI_BIN
-
-#Print the version
-onap -v
-
-cd -
+source ./install.sh
diff --git a/deployment/zip/pom.xml b/deployment/zip/pom.xml
index 46f7df02..645144fa 100644
--- a/deployment/zip/pom.xml
+++ b/deployment/zip/pom.xml
@@ -65,6 +65,9 @@
                                 ant.delete(dir: "${deployUnzip}/open-cli-schema")
                                 ant.mkdir(dir: "${deployUnzip}/open-cli-schema")
 
+                                ant.delete(dir: "${deployUnzip}/open-cli-sample")
+                                ant.mkdir(dir: "${deployUnzip}/open-cli-sample")
+
                                 ant.delete(dir: "${deployUnzip}/data")
                                 ant.mkdir(dir: "${deployUnzip}/data")
 
diff --git a/deployment/zip/src/main/release/data/onap-beijing-profile.json b/deployment/zip/src/main/release/data/onap-beijing-profile.json
index 0c186e11..5cd58c4c 100644
--- a/deployment/zip/src/main/release/data/onap-beijing-profile.json
+++ b/deployment/zip/src/main/release/data/onap-beijing-profile.json
@@ -2,7 +2,7 @@
     {
       "product" : "onap-beijing",
       "name" : "aai:host-url",
-      "value" : ""
+      "value" : "https://192.168.17.35:30233"
     },
     {
       "product" : "onap-beijing",
@@ -17,12 +17,12 @@
     {
       "product" : "onap-beijing",
       "name" : "msb:host-url",
-      "value" : ""
+      "value" : "http://192.168.17.35:30081"
     },
     {
       "product" : "onap-beijing",
       "name" : "sdc:host-url",
-      "value" : ""
+      "value" : "http://192.168.17.35:30206"
     },
     {
       "product" : "onap-beijing",
@@ -37,7 +37,7 @@
     {
       "product" : "onap-beijing",
       "name" : "so:host-url",
-      "value" : ""
+      "value" : "http://192.168.17.35:30223"
     },
     {
       "product" : "onap-beijing",