[PATCH] Add possibility to give custom client log4j.properties

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1412948674 -7200
# Node ID 35b3bbd1365f25f0f44e48fea8d2cefbd5e8e619
# Parent  5b3947bac65deb98ec76b1d043cd8274bf2ac3e6
Add possibility to give custom client log4j.properties.

diff -r 5b3947bac65d -r 35b3bbd1365f contrib/make_flys_release/make_release.sh
--- a/contrib/make_flys_release/make_release.sh	Fri Oct 10 00:58:30 2014 +0200
+++ b/contrib/make_flys_release/make_release.sh	Fri Oct 10 15:44:34 2014 +0200
@@ -200,6 +200,16 @@
 echo "[INFO]: Artifact Port: $ARTIFACT_PORT"
 
 #Needs to be done before the tomcat replacement below
+if [ -r "$FEATURES_XML" ]; then
+    cp "$FEATURES_XML" \
+        $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/features.xml
+fi
+
+if [ -r "$CLIENT_LOG4J" ]; then
+    cp "$CLIENT_LOG4J" \
+        $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/log4j.properties
+fi
+
 sed -i -e "s at http://localhost:8080/d4e/flys/mapfish-print at https://localhost/flys-${VERSION}/flys/mapfish-print at g" \
     $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/web.xml
 
@@ -213,16 +223,16 @@
 sed -i -e "s at https://flys3-devel.bafg.de/wiki@${WIKI_URL}@g" \
     $FLYS_SOURCE_DIR/river/gwt-client/src/main/java/org/dive4elements/river/client/client/config.xml
 
-sed -i -e "s@/var/log/d4e-river/d4e-client.log@${LOG_DIR}/client-${VERSION}.log at g" \
+sed -i -e \
+    "s@/var/log/d4e-river/d4e-client.log@${LOG_DIR}/client-VERSION.log at g" \
+    $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/log4j.properties
+
+sed -i -e "s at VERSION@${VERSION}@g" \
     $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/log4j.properties
 
 sed -i -e "s at 1a4825f6-925f-11e3-8165-001f29e71d12@${ELBE_MODEL_UUID}@g" \
     $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/images/FLYS_Karte_interactive.html
 
-if [ -r "$FEATURES_XML" ]; then
-    cp "$FEATURES_XML" $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/features.xml
-fi
-
 find $FLYS_SOURCE_DIR/river/ -name \*.properties -o -name \*.xsl |  \
     xargs sed -i "s at https://flys-intern.intevation.de@${WIKI_URL}@g";