From aedc1ba05fb984b25a4cb2fbf04a53573a356abb Mon Sep 17 00:00:00 2001
From: Marco Genasci <fedeliallalinea@gmail.com>
Date: Thu, 26 Feb 2026 10:12:22 +0100
Subject: [PATCH] Some fix to work as war

Signed-off-by: Marco Genasci <fedeliallalinea@gmail.com>
---
 pom.xml                                       | 44 ++++++++++++++-----
 .../webapp/WEB-INF/classes/log4j2.properties  |  3 +-
 src/main/webapp/WEB-INF/web.xml               |  4 +-
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7e52f3dc..b068bb10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  
+
   <groupId>org.mapfish.print</groupId>
   <artifactId>print-lib</artifactId>
   <version>2.5-SNAPSHOT</version>
@@ -15,7 +15,7 @@
     <name>MapFish</name>
     <url>http://www.mapfish.org</url>
   </organization>
-  
+
   <licenses>
     <license>
       <name>GPL-3.0-or-later</name>
@@ -23,7 +23,7 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
-  
+
   <scm>
     <connection>scm:git:git@github.com:mapfish/mapfish-print-v2.git</connection>
     <developerConnection>scm:git:git@github.com:mapfish/mapfish-print-v2.git</developerConnection>
@@ -35,10 +35,10 @@
     <system>github</system>
     <url>https://github.com/mapfish/mapfish-print-v2/issues</url>
   </issueManagement>
-  
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!--log4j-version>2.24.3</log4j-version-->
+    <log4j-version>2.24.3</log4j-version>
     <spring.version>7.0.2</spring.version>
     <gt.version>35-SNAPSHOT</gt.version>
     <imagen.version>0.9.1-SNAPSHOT</imagen.version> <!-- sync with gt-platform-dependences -->
@@ -48,9 +48,24 @@
     <fork.javac>true</fork.javac>
     <javac.maxHeapSize>512m</javac.maxHeapSize>
   </properties>
-  
+
   <dependencyManagement>
     <dependencies>
+    <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-core</artifactId>
+        <version>${log4j-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-api</artifactId>
+        <version>${log4j-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-slf4j-impl</artifactId>
+        <version>${log4j-version}</version>
+      </dependency>
       <dependency>
         <groupId>org.geotools</groupId>
         <artifactId>gt-bom</artifactId>
@@ -144,7 +159,7 @@
       </dependency>
       <dependency>
         <groupId>io.dropwizard.metrics</groupId>
-        <artifactId>metrics-servlet</artifactId>
+        <artifactId>metrics-jakarta-servlet</artifactId>
         <version>${metrics-version}</version>
       </dependency>
       <dependency>
@@ -174,7 +189,7 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.geotools</groupId>
@@ -283,11 +298,16 @@
       <artifactId>metrics-core</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-jakarta-servlet</artifactId>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-jakarta-servlets</artifactId>
       <scope>compile</scope>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-httpclient</artifactId>
@@ -317,7 +337,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
   <build>
     <plugins>
       <!-- ======================================================= -->
@@ -331,7 +351,7 @@
           <release>17</release> <!-- Java release version -->
           <debug>true</debug>   <!-- Whether to include debugging information.   -->
           <encoding>UTF-8</encoding> <!-- The -encoding argument for the Java compiler. -->
-          <fork>${fork.javac}</fork> 
+          <fork>${fork.javac}</fork>
           <maxmem>${javac.maxHeapSize}</maxmem>
         </configuration>
       </plugin>
@@ -410,7 +430,7 @@
       <url>https://repo.osgeo.org/repository/geoserver-snapshots/</url>
     </snapshotRepository>
   </distributionManagement>
-  
+
   <profiles>
     <!-- build docs first, and this profile -->
     <!-- will assemble into a zip download -->
diff --git a/src/main/webapp/WEB-INF/classes/log4j2.properties b/src/main/webapp/WEB-INF/classes/log4j2.properties
index 0e0bdbbd..a88a8472 100644
--- a/src/main/webapp/WEB-INF/classes/log4j2.properties
+++ b/src/main/webapp/WEB-INF/classes/log4j2.properties
@@ -6,13 +6,14 @@ appender.R.name = File
 appender.R.fileName = /tmp/logs/mapfish-print.log
 appender.R.layout.type = PatternLayout
 appender.R.layout.pattern = %d{ISO8601} [%t] %-5p %30.30c - %m%n
+appender.R.filePattern = %d{ISO8601} [%t] %-5p %30.30c - %m%n
 appender.R.policies.type = Policies
 appender.R.policies.time.type = SizeBasedTriggeringPolicy
 appender.rolling.policies.size.size=10MB
 appender.rolling.strategy.type = DefaultRolloverStrategy
 appender.rolling.strategy.max = 5
 
-rootLogger.appenderRefs = R 
+rootLogger.appenderRefs = R
 rootLogger.appenderRef.R.ref = File
 
 logger.mapfish.name= org.mapfish
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index b20d6e34..19915068 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -26,7 +26,7 @@
 
     <filter>
         <filter-name>instrumentedFilter</filter-name>
-        <filter-class>com.codahale.metrics.servlet.InstrumentedFilter</filter-class>
+        <filter-class>io.dropwizard.metrics.servlet.InstrumentedFilter</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>instrumentedFilter</filter-name>
@@ -35,7 +35,7 @@
 
     <servlet>
         <servlet-name>metrics-servlet</servlet-name>
-        <servlet-class>com.codahale.metrics.servlets.AdminServlet</servlet-class>
+        <servlet-class>io.dropwizard.metrics.servlets.AdminServlet</servlet-class>
     </servlet>
 
     <!-- single mapping to spring, this only works properly if the advanced dispatch filter is