#156 create new .war module without GUI

geoserver · Oct 21, 2020 · 28cc88c · 28cc88c
1 parent e515778
commit 28cc88c
Show file tree

Hide file tree

Showing 15 changed files with 1,380 additions and 55 deletions.
diff --git a/src/pom.xml b/src/pom.xml
@@ -131,7 +131,7 @@
 
    <modules>
       <module>services</module>
-      <!-- <module>gui</module> -->
+      <module>web</module>
    </modules>
 
    <build>

diff --git a/src/services/core/webtest/src/main/resources/log4j.xml b/src/services/core/webtest/src/main/resources/log4j.xml
@@ -1,53 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/* (c) 2014 Open Source Geospatial Foundation - all rights reserved
- * This code is licensed under the GPL 2.0 license, available at the root
- * application directory.
- */
-
-
--->
-
-<configuration>
-
-    <properties>
-        <property name="geofence_logpath">logs/</property>
-    </properties>
-
-    <appenders>
-        <Console name="STDOUT" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{ABSOLUTE} %5p %c{1}:%L - %m%n"/>
-        </Console>
-
-<!--        <RollingFile name="R"
-                 fileName="${sys:geofence_logpath}/geofence.log"
-                 filePattern="${sys:geofence_logpath}/$${date:yyyy-MM}/geofence-%d{MM-dd-yyyy}-%i.log.gz">
-            <PatternLayout>
-                <pattern>%d{ABSOLUTE} %5p %c{1}:%L - %m%n</pattern>
-            </PatternLayout>
-            <Policies>
-                <TimeBasedTriggeringPolicy />
-                <SizeBasedTriggeringPolicy size="10MB"/>
-            </Policies>
-            <DefaultRolloverStrategy max="10"/>
-        </RollingFile> -->
-    </appenders>
-
-    <!-- 
-        <logger name="org.hibernate">
-            <level value="debug"/>
-            <appender-ref ref="R"/>
-        </logger>
-    -->
-
-    <loggers>
-        <logger name="org.geoserver.geofence" level="debug">
-            <!--<appender-ref ref="R"/>-->
-        </logger>
-
-        <root level="info">
-            <appender-ref ref="STDOUT" />
-            <!--<appender-ref ref="R" />-->
-        </root>
-    </loggers>
-</configuration>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+    <appender name="stdout" class="org.apache.log4j.ConsoleAppender">
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{ABSOLUTE} %5p %c{1}:%L - %m%n" />
+        </layout>
+    </appender>
+
+    <appender name="R" class="org.apache.log4j.RollingFileAppender">
+        <param name="file" value="${java.io.tmpdir}/geofence.log"/>
+        <param name="MaxFileSize" value="10MB"/>
+        <param name="MaxBackupIndex" value="1"/>
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{ABSOLUTE} %5p %c{1}:%L - %m%n" />
+        </layout>
+    </appender>
+
+    <logger name="org.geoserver.geofence">
+        <level value="debug"/>
+    </logger>
+
+    <root>
+        <priority value ="info" />
+        <appender-ref ref="stdout" />
+	<!--        <appender-ref ref="R" /> -->
+    </root>
+
+</log4j:configuration>
diff --git a/src/services/core/webtest/src/main/webapp/WEB-INF/web.xml b/src/services/core/webtest/src/main/webapp/WEB-INF/web.xml
@@ -27,7 +27,7 @@
 
 	<!-- spring context loader -->
     <listener>
-        <listener-class>org.apache.logging.log4j.web.Log4jServletContextListener</listener-class>
+        <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
     </listener>
 
     <listener>