From: Aron Roberts Date: Fri, 3 Feb 2012 23:58:47 +0000 (+0000) Subject: CSPACE-4684,CSPACE-4728: In script for prepping a working Apache Tomcat folder for... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=e939fc99b36ba4803354ec392bfcbb446b1835b1;p=tmp%2Fjakarta-migration.git CSPACE-4684,CSPACE-4728: In script for prepping a working Apache Tomcat folder for distribution of a tarball, added command to copy per-tenant settings.xml files to local-settings.xml, consistent with app layer configuration docs. --- diff --git a/scripts/nightlyDist.sh b/scripts/nightlyDist.sh index af05c8d9e..5b1909033 100755 --- a/scripts/nightlyDist.sh +++ b/scripts/nightlyDist.sh @@ -88,9 +88,11 @@ echo "Removing nightly-specific and other host-specific config files ..." find $APP_LAYER_CONFIG_DIR -name nightly-settings.xml -delete find $APP_LAYER_CONFIG_DIR -name local-settings.xml -delete -# FIXME: Need to add an action here to copy each instance of the -# file settings.xml, found in each App layer tenant folder, to -# a file named local-settings.xml files in each of those folder(s) +# This command was tested with Fedora Linux 10; other Linux distros and other +# Unix-like operating systems may have slight variations on 'execdir', etc. +echo "Copying settings.xml files to local-settings.xml for each tenant ..." +find $APP_LAYER_CONFIG_DIR/tenants -mindepth 1 -maxdepth 1 -type d \ + -execdir /bin/cp -p '{}'/settings.xml '{}'/local-settings.xml \; echo "Removing services JAR files ..." rm -Rf $CATALINA_LIB_DIR/cspace-services-authz.jar