From scm-commit at wald.intevation.org  Thu Apr 28 17:31:02 2022
From: scm-commit at wald.intevation.org (Wald Commits)
Date: Thu, 28 Apr 2022 17:31:02 +0200 (CEST)
Subject: dive4elements/river@9727: new changeset (1 on 3.2.x)
Message-ID: <20220428173102.443267681.scm-commit@wald.intevation.org>

New changeset (1 on 3.2.x) in dive4elements/river:
pushed by: tomgottfried

https://scm.wald.intevation.org/hg/dive4elements/river/rev/a99f07471004
changeset:   9727:a99f07471004
branch:      3.2.x
tag:         tip
user:        Tom Gottfried <tom at intevation.de>
date:        Thu Apr 28 17:30:21 2022 +0200
summary:     Keep config away from Maven Clean Plugin

-- 
Repository URL: https://scm.wald.intevation.org/hg/dive4elements/river

From scm-commit at wald.intevation.org  Thu Apr 28 17:31:02 2022
From: scm-commit at wald.intevation.org (Wald Commits)
Date: Thu, 28 Apr 2022 17:31:02 +0200
Subject: [PATCH] Keep config away from Maven Clean Plugin
In-Reply-To: <20220428173102.443267681.scm-commit@wald.intevation.org>
References: <20220428173102.443267681.scm-commit@wald.intevation.org>
Message-ID: <a99f07471004e77160c4.1651159862@wald.intevation.org>

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1651159821 -7200
#      Thu Apr 28 17:30:21 2022 +0200
# Branch 3.2.x
# Node ID a99f07471004e77160c4ec63666c4bdd3244559a
# Parent  0a5239a1e46e42f44dc139d4fe462923dce9549c
Keep config away from Maven Clean Plugin

diff -r 0a5239a1e46e -r a99f07471004 gwt-client/src/main/resources/log4j2.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gwt-client/src/main/resources/log4j2.xml	Thu Apr 28 17:30:21 2022 +0200
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+    <Appenders>
+        <RollingFile
+            name="RollingFile"
+            fileName="/var/log/d4e-river/d4e-client.log"
+            filePattern="/var/log/d4e-river/d4e-client.log.%i">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5p %c{1} - %m%n"/>
+            <SizeBasedTriggeringPolicy size="5000 KB"/>
+            <DefaultRolloverStrategy max="3"/>
+        </RollingFile>
+    </Appenders>
+    <Loggers>
+        <Root level="DEBUG">
+            <AppenderRef ref="RollingFile"/>
+        </Root>
+        <Logger name="org.apache.http" level="ERROR" additivity="false"/>
+    </Loggers>
+</Configuration>
diff -r 0a5239a1e46e -r a99f07471004 gwt-client/src/main/webapp/WEB-INF/classes/log4j2.xml
--- a/gwt-client/src/main/webapp/WEB-INF/classes/log4j2.xml	Wed Mar 02 10:26:50 2022 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration>
-    <Appenders>
-        <RollingFile
-            name="RollingFile"
-            fileName="/var/log/d4e-river/d4e-client.log"
-            filePattern="/var/log/d4e-river/d4e-client.log.%i">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5p %c{1} - %m%n"/>
-            <SizeBasedTriggeringPolicy size="5000 KB"/>
-            <DefaultRolloverStrategy max="3"/>
-        </RollingFile>
-    </Appenders>
-    <Loggers>
-        <Root level="DEBUG">
-            <AppenderRef ref="RollingFile"/>
-        </Root>
-        <Logger name="org.apache.http" level="ERROR" additivity="false"/>
-    </Loggers>
-</Configuration>

From scm-commit at wald.intevation.org  Thu Apr 28 18:02:35 2022
From: scm-commit at wald.intevation.org (Wald Commits)
Date: Thu, 28 Apr 2022 18:02:35 +0200 (CEST)
Subject: dive4elements/river@9728: new changeset (1 on 3.2.x)
Message-ID: <20220428180235.188070311.scm-commit@wald.intevation.org>

New changeset (1 on 3.2.x) in dive4elements/river:
pushed by: tomgottfried

https://scm.wald.intevation.org/hg/dive4elements/river/rev/ca1319d5816d
changeset:   9728:ca1319d5816d
branch:      3.2.x
tag:         tip
user:        Tom Gottfried <tom at intevation.de>
date:        Thu Apr 28 18:02:21 2022 +0200
summary:     Amend release script to include custom client resources

-- 
Repository URL: https://scm.wald.intevation.org/hg/dive4elements/river

From scm-commit at wald.intevation.org  Thu Apr 28 18:02:35 2022
From: scm-commit at wald.intevation.org (Wald Commits)
Date: Thu, 28 Apr 2022 18:02:35 +0200
Subject: [PATCH] Amend release script to include custom client resources
In-Reply-To: <20220428180235.188070311.scm-commit@wald.intevation.org>
References: <20220428180235.188070311.scm-commit@wald.intevation.org>
Message-ID: <ca1319d5816d91624d88.1651161755@wald.intevation.org>

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1651161741 -7200
#      Thu Apr 28 18:02:21 2022 +0200
# Branch 3.2.x
# Node ID ca1319d5816d91624d8889ecaff10c98eb252ba0
# Parent  a99f07471004e77160c4ec63666c4bdd3244559a
Amend release script to include custom client resources

diff -r a99f07471004 -r ca1319d5816d contrib/make_flys_release/make_release.sh
--- a/contrib/make_flys_release/make_release.sh	Thu Apr 28 17:30:21 2022 +0200
+++ b/contrib/make_flys_release/make_release.sh	Thu Apr 28 18:02:21 2022 +0200
@@ -236,6 +236,15 @@
     done
 fi
 
+if [ -d "$CLIENT_RESOURCES" ]; then
+    echo "INFO: copy custom client resources to target destination"
+    CLIENT_RESOURCES_DIR=$FLYS_SOURCE_DIR/river/gwt-client/src/main/resources/
+    cp -R $CLIENT_RESOURCES/* $CLIENT_RESOURCES_DIR
+    for file in `find $CLIENT_RESOURCES_DIR/ -type f`; do
+        sed -i -e "s at D4E_VERSION@${VERSION}@g" $file
+    done
+fi
+
 if [ -f "$CLIENT_CONF" ]; then
     echo "INFO: copy custom java script client configuration to target destination"
     cp "$CLIENT_CONF" \