diff options
| author |   subhash kumar singh <subhash.kumar.singh@huawei.com> | 2018-09-05 07:24:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-05 07:24:38 +0000 |
| commit | f040ecf089eac94a4efc90316175ccc0529bbfd2 (patch) | |
| tree | 32dcd3bc996f6cdb5cda18752c360d79a1e26efb /deployment/zip | |
| parent | 5a295e30a8cbd0b39144328e23f6b1be37e526c3 (diff) | |
| parent | d6230a718e176f02bc91314a0cd96a49820498fb (diff) | |
Merge changes Ic75c7eca,Ic0b547f7,I932b1ceb,I26c99032,Ifaeeb8f4, ...
* changes:
OCLIP: Change the order of classpath
OCLIP: Fix the correct type of OCS command
VTP: Add schema-list command
OCLIP: Fix OCLIP registrar to log register events
OCLIP: Fix json print format
VTP: Enable grpc part of deployment
VTP: grpc client impl
VTP: grpc server impl
VTP: grpc stub model
VTP: grpc client
VTP: grpc server
VTP: grpc stub
VTP: Add grpc
Diffstat (limited to 'deployment/zip')
| -rw-r--r-- | deployment/zip/pom.xml | 2 | ||||
| -rwxr-xr-x | deployment/zip/src/main/release/bin/oclip.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/deployment/zip/pom.xml b/deployment/zip/pom.xml index eba890af..fa370ebb 100644 --- a/deployment/zip/pom.xml +++ b/deployment/zip/pom.xml @@ -93,6 +93,8 @@ "${project.build.directory}/../../../products/target/lib/") fileset(dir: "${project.build.directory}/../../../profiles/target/lib/") + fileset(dir: + "${project.build.directory}/../../../grpc/target/lib/") } ant.copy(todir: "${deployUnzip}/conf") { diff --git a/deployment/zip/src/main/release/bin/oclip.sh b/deployment/zip/src/main/release/bin/oclip.sh index 90fcfc53..a841c926 100755 --- a/deployment/zip/src/main/release/bin/oclip.sh +++ b/deployment/zip/src/main/release/bin/oclip.sh @@ -29,7 +29,7 @@ else SEP=: fi -CLASSPATH=${OPEN_CLI_HOME}${SEP}${OPEN_CLI_HOME}/conf${SEP}${OPEN_CLI_HOME}/docs +CLASSPATH=${OPEN_CLI_HOME}/conf${SEP}${OPEN_CLI_HOME}${SEP}${OPEN_CLI_HOME}/docs for entry in "$OPEN_CLI_HOME/lib"/* do CLASSPATH=${CLASSPATH}${SEP}${entry} |