Update for karaf 4 features

Update to deployment docker image version and feature
names to match the karaf 4 features in the appc project.

Change-Id: Ibd6cca723862745767f0621cfbfd44b8a7143acf
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-1151

4 files changed, 34 insertions, 32 deletions

diff --git a/installation/appc/src/main/docker/Dockerfile b/installation/appc/src/main/docker/Dockerfile
index edc7c88..de75705 100644
--- a/installation/appc/src/main/docker/Dockerfile
+++ b/installation/appc/src/main/docker/Dockerfile
@@ -21,7 +21,7 @@
 # ============LICENSE_END============================================
 
 # Base ubuntu with added packages needed for ONAP
-FROM onap/ccsdk-odlsli-image:0.2.3
+FROM onap/ccsdk-odlsli-image:0.3.0
 MAINTAINER APP-C Team (appc@lists.openecomp.org)
 
 # Set the Env. Variable in the container to add the APPC CONFIG DIR (the SDNC_CONFIG_DIR is inherited from SDNC Image)
diff --git a/installation/appc/src/main/scripts/installFeatures.sh b/installation/appc/src/main/scripts/installFeatures.sh
index 029e376..858ce39 100644
--- a/installation/appc/src/main/scripts/installFeatures.sh
+++ b/installation/appc/src/main/scripts/installFeatures.sh
@@ -59,38 +59,39 @@ done
  appc-aai-client"
 
 APPC_FEATURES_1=" \
- appc-metric \
- appc-dmaap-adapter \
- appc-chef-adapter \
- appc-netconf-adapter \
- appc-rest-adapter \
- appc-lifecycle-management \
- appc-license-manager"
+ onap-appc-core \
+ onap-appc-metric \
+ onap-appc-dmaap-adapter \
+ onap-appc-chef-adapter \
+ onap-appc-netconf-adapter \
+ onap-appc-rest-adapter \
+ onap-appc-lifecycle-management \
+ onap-appc-license-manager"
  
  APPC_FEATURES_2=" \
- appc-provider \
- appc-dg-util \
- appc-dg-shared \
- appc-sdc-listener \
- appc-oam \
- appc-iaas-adapter \
- appc-ansible-adapter \
- appc-sequence-generator \
- appc-config-generator \
- appc-config-data-services \
- appc-config-adaptor \
- appc-config-audit \
- appc-config-encryption-tool \
- appc-config-flow-controller \
- appc-config-params \
- appc-artifact-handler \
- appc-aai-client \
- appc-event-listener \
- appc-network-inventory-client \
- appc-design-services \
- appc-interfaces-service"
+ onap-appc-provider \
+ onap-appc-dg-util \
+ onap-appc-dg-shared \
+ onap-appc-sdc-listener \
+ onap-appc-oam \
+ onap-appc-iaas-adapter \
+ onap-appc-ansible-adapter \
+ onap-appc-sequence-generator \
+ onap-appc-config-generator \
+ onap-appc-config-data-services \
+ onap-appc-config-adaptor \
+ onap-appc-config-audit \
+ onap-appc-config-encryption-tool \
+ onap-appc-config-flow-controller \
+ onap-appc-config-params \
+ onap-appc-aai-client \
+ onap-appc-event-listener \
+ onap-appc-network-inventory-client \
+ onap-appc-design-services \
+ onap-appc-interfaces-service"
  
  APPC_FEATURES_UNZIP=" \
+ appc-core \
  appc-metric \
  appc-dmaap-adapter \
  appc-event-listener \
@@ -158,7 +159,7 @@ done
 
   echo "Installing dispatcher features"
   start=$(date +%s)
-  ${ODL_HOME}/bin/client "feature:install -r appc-request-handler appc-command-executor appc-lifecycle-management appc-workflow-management lock-manager"
+  ${ODL_HOME}/bin/client "feature:install -r onap-appc-request-handler onap-appc-command-executor onap-appc-lifecycle-management onap-appc-workflow-management lock-manager"
   end=$(date +%s)
   echo "Install of dispatcher features took $(expr $end - $start) seconds"
   sleep 7s
diff --git a/installation/appc/src/main/scripts/installZips.sh b/installation/appc/src/main/scripts/installZips.sh
index ccc610c..02bdcc7 100644
--- a/installation/appc/src/main/scripts/installZips.sh
+++ b/installation/appc/src/main/scripts/installZips.sh
@@ -45,6 +45,7 @@ featureDir=$2/featureDir
 FEATURE_DIRECTORY_COUNT=4
 
 APPC_FEATURES=" \
+ appc-core \
  appc-sdc-listener \
  appc-lifecycle-management \
  appc-provider \
diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh
index 99def7f..a359d02 100644
--- a/installation/appc/src/main/scripts/startODL.sh
+++ b/installation/appc/src/main/scripts/startODL.sh
@@ -112,7 +112,7 @@ then
 		running=0
 		while read a b c d e f g h
 		do
-		if [ "$h" == "/bin/sh /opt/opendaylight/current/bin/karaf server" ]
+		if [ "$h" == "/bin/sh /opt/opendaylight/bin/karaf server" ]
 		then
 			running=1
 		fi
@@ -136,4 +136,4 @@ fi
 echo "Starting cdt-proxy-service jar, logging to ${APPC_HOME}/cdt-proxy-service/jar.log"
 java -jar ${APPC_HOME}/cdt-proxy-service/cdt-proxy-service.jar > ${APPC_HOME}/cdt-proxy-service/jar.log &
 
-exec ${ODL_HOME}/bin/karaf
+exec ${ODL_HOME}/bin/karaf server