diff options
| -rw-r--r-- | installation/appc/src/main/scripts/installZips.sh | 5 | ||||
| -rw-r--r-- | installation/appc/src/main/scripts/startODL.sh | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/installation/appc/src/main/scripts/installZips.sh b/installation/appc/src/main/scripts/installZips.sh index 56364c1..8911d1f 100644 --- a/installation/appc/src/main/scripts/installZips.sh +++ b/installation/appc/src/main/scripts/installZips.sh @@ -76,6 +76,7 @@ FEATURES_PER_DIRECTORY=$(($(echo $APPC_FEATURES|wc -w)/$FEATURE_DIRECTORY_COUNT) APPC_VERSION=${APPC_VERSION:-0.0.1} APPC_OAM_VERSION=${APPC_OAM_VERSION:-0.1.1} +AAF_CADI_SHIRO_VERSION=${AAF_CADI_SHIRO_VERSION:-1.5.0-SNAPSHOT} if [ ! -d ${targetDir} ] then @@ -118,6 +119,10 @@ echo "Downloading dg-loader-provider jar from nexus" mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.appc.plugins:dg-loader-provider:${APPC_VERSION}:jar:jar-with-dependencies -DoutputDirectory=${targetDir}/data mv ${targetDir}/data/dg-loader-provider-*-jar-with-dependencies.jar ${targetDir}/data/dg-loader-provider-jar-with-dependencies.jar +echo "Downloading aaf-cadi-shiro from nexus" +mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.aaf.authz.cadi:aaf-cadi-shiro:${AAF_CADI_SHIRO_VERSION} -DoutputDirectory=${targetDir}/data +mv ${targetDir}/data/aaf-cadi-shiro-*.jar ${targetDir}/data/aaf-cadi-shiro.jar + find ${targetDir} -name '*.sh' -exec chmod +x '{}' \; cd $cwd diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh index 573db70..fc1599a 100644 --- a/installation/appc/src/main/scripts/startODL.sh +++ b/installation/appc/src/main/scripts/startODL.sh @@ -76,6 +76,8 @@ then cp ${APPC_HOME}/data/sdncInstallFeatures.sh ${SDNC_HOME}/bin/installFeatures.sh echo "Copying a working version of the logging configuration into the opendaylight etc folder" cp ${APPC_HOME}/data/org.ops4j.pax.logging.cfg ${ODL_HOME}/etc/org.ops4j.pax.logging.cfg + echo "Copying a new version of aaf cadi shiro into the opendaylight deploy folder" + cp ${APPC_HOME}/data/aaf-cadi-shiro.jar ${ODL_HOME}/deploy/aaf-cadi-shiro.jar echo "Installing SDNC platform features" ${SDNC_HOME}/bin/installFeatures.sh if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ] |