Mercurial > dive4elements > river
changeset 8402:35b3bbd1365f
Add possibility to give custom client log4j.properties.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Fri, 10 Oct 2014 15:44:34 +0200 |
| parents | 5b3947bac65d |
| children | e316361229cd |
| files | contrib/make_flys_release/make_release.sh |
| diffstat | 1 files changed, 15 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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@http://localhost:8080/d4e/flys/mapfish-print@https://localhost/flys-${VERSION}/flys/mapfish-print@g" \ $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/web.xml @@ -213,16 +223,16 @@ sed -i -e "s@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@g" \ +sed -i -e \ + "s@/var/log/d4e-river/d4e-client.log@${LOG_DIR}/client-VERSION.log@g" \ + $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/log4j.properties + +sed -i -e "s@VERSION@${VERSION}@g" \ $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/log4j.properties sed -i -e "s@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@https://flys-intern.intevation.de@${WIKI_URL}@g";