# HG changeset patch
# User Tom Gottfried <tom@intevation.de>
# Date 1394031226 -3600
# Node ID e55119cbdc19b3a7e0b47d9bee53a5efda7f4e23
# Parent  507ce37ba6cdeceb5408bc6195a3d69bf3828e9e
Useful server-logging for demo installation.

diff -r 507ce37ba6cd -r e55119cbdc19 artifacts/doc/conf/log4j.properties
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/doc/conf/log4j.properties	Wed Mar 05 15:53:46 2014 +0100
@@ -0,0 +1,18 @@
+log4j.rootLogger=DEBUG, FLYS
+
+########## EXTERNAL PACKAGES
+log4j.category.org.hibernate=WARN
+log4j.category.net.sf.ehcache=WARN
+log4j.category.org.eclipse=WARN
+log4j.category.org.restlet=INFO
+
+
+########## APPENDER SETTINGS
+log4j.appender.FLYS.layout=org.apache.log4j.PatternLayout
+log4j.appender.FLYS.layout.ConversionPattern=%d{HH:mm:ss} [%t] %-5p %c{1} - %m%n
+
+
+log4j.appender.FLYS=org.apache.log4j.RollingFileAppender
+log4j.appender.FLYS.File=/var/log/d4e-river/d4e-server.log
+log4j.appender.FLYS.MaxFileSize=5000KB
+log4j.appender.FLYS.MaxBackupIndex=1
diff -r 507ce37ba6cd -r e55119cbdc19 contrib/make_flys_release/confs/log4j.properties
--- a/contrib/make_flys_release/confs/log4j.properties	Tue Mar 04 19:24:10 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-log4j.rootLogger=DEBUG, FLYS
-
-########## INTERNAL PACKAGES
-log4j.category.de.intevation.artifactdatabase=INFO
-
-########## INTERNAL CLASSES
-log4j.category.de.intevation.artifactdatabase.DatabaseCleaner=INFO
-log4j.category.de.intevation.flys.utils.ThemeUtil=INFO
-
-
-########## EXTERNAL PACKAGES
-log4j.category.org.hibernate=WARN
-log4j.category.net.sf.ehcache=WARN
-log4j.category.org.eclipse=WARN
-log4j.category.org.restlet=INFO
-
-
-########## APPENDER SETTINGS
-log4j.appender.FLYS.layout=org.apache.log4j.PatternLayout
-log4j.appender.FLYS.layout.ConversionPattern=%d{HH:mm:ss} [%t] %-5p %c{1} - %m%n
-
-
-log4j.appender.FLYS=org.apache.log4j.RollingFileAppender
-log4j.appender.FLYS.File=/tmp/flys-server-default.log
-log4j.appender.FLYS.MaxFileSize=5000KB
-log4j.appender.FLYS.MaxBackupIndex=1
-
diff -r 507ce37ba6cd -r e55119cbdc19 contrib/make_flys_release/make_release.sh
--- a/contrib/make_flys_release/make_release.sh	Tue Mar 04 19:24:10 2014 +0100
+++ b/contrib/make_flys_release/make_release.sh	Wed Mar 05 15:53:46 2014 +0100
@@ -309,9 +309,8 @@
 sed -i -e "s@/tmp/flys-user-wms.log@${LOG_DIR}/user-wms-${VERSION}.log@g" \
     $WORK_DIR/server/conf/mapserver/mapfile.vm
 
-sed "s@/tmp/flys-server-default.log@${LOG_DIR}/server-${VERSION}.log@" \
-    $SCRIPT_DIR/confs/log4j.properties \
-    > $WORK_DIR/server/conf/log4j.properties
+sed -i -e "s@/var/log/d4e-river/d4e-server.log@${LOG_DIR}/server-${VERSION}.log@" \
+    $WORK_DIR/server/conf/log4j.properties
 
 sed -i -e "s@<dgm-path>/path/to/rivers/</dgm-path>@<dgm-path>${DGM_PATH}</dgm-path>@g" \
        -e "s@<help-url>http://example.com</help-url>@<help-url>${WIKI_URL}</help-url>@g" \
diff -r 507ce37ba6cd -r e55119cbdc19 doc/INSTALL_DE
--- a/doc/INSTALL_DE	Tue Mar 04 19:24:10 2014 +0100
+++ b/doc/INSTALL_DE	Wed Mar 05 15:53:46 2014 +0100
@@ -138,23 +138,10 @@
 
 Konfigurieren des Logging
 -------------------------
-#. Pfade in den log4j.properties anpassen
-
-    $ vi river/artifacts/doc/conf/log4j.properties
-
-    # Den Inhalt mit folgendem ersetzen:
-
-    # Set root logger level to DEBUG and its only appender to A1.
-    log4j.rootLogger=DEBUG, A1
-
-    # A1 uses PatternLayout.
-    log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-    log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
-
-    log4j.appender.A1=org.apache.log4j.RollingFileAppender
-    log4j.appender.A1.File=/var/log/d4e-river/d4e-server.log
-    log4j.appender.A1.MaxFileSize=5000KB
-    log4j.appender.A1.MaxBackupIndex=3
+    # Anpassungen des Loggings können für den Client in 
+    # river/gwt-client/src/main/webapp/WEB-INF/log4j.properties
+    # und für den Server in river/artifacts/doc/conf/log4j.properties
+    # vorgenommen werden
 
 
 Bauen der Server- und Clientkomponenten