diff --git a/logs/DEFAULT_LOGGING.properties b/logs/DEFAULT_LOGGING.properties
deleted file mode 100644
index 5205a50..0000000
--- a/logs/DEFAULT_LOGGING.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-## This log4j configuration file needs to stay here, and is used as the default logging setup
-## during data_dir upgrades and in case the chosen logging config isn't available.
-
-log4j.rootLogger=WARN, geoserverlogfile, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %p [%c{2}] - %m%n
-
-log4j.appender.geoserverlogfile=org.apache.log4j.FileAppender
-# Pattern to output: date priority [category] - message
-log4j.appender.geoserverlogfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.geoserverlogfile.layout.ConversionPattern=%d %p [%c{2}] - %m%n
-
-log4j.category.log4j=FATAL
-
-log4j.category.org.geotools=WARN
-log4j.category.org.geotools.factory=WARN
-log4j.category.org.geoserver=INFO
-log4j.category.org.vfny.geoserver=INFO
-
-log4j.category.org.springframework=WARN
-
-log4j.category.org.geowebcache=INFO
-log4j.category.org.geowebcache.seed.TruncateTask=WARN
diff --git a/logs/DEFAULT_LOGGING.xml b/logs/DEFAULT_LOGGING.xml
new file mode 100644
index 0000000..47b2042
--- /dev/null
+++ b/logs/DEFAULT_LOGGING.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This log4j configuration file needs to stay here, and is used as the default logging setup -->
+<!-- during data_dir upgrades and in case the chosen logging config isn't available.            -->
+<Configuration name="DEFAULT_LOGGING" status="fatal" dest="out">
+    <Appenders>
+        <Console name="stdout" target="SYSTEM_OUT">
+            <PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
+        </Console>
+        <RollingFile name="geoserverlogfile">
+            <filename>logs/geoserver.log</filename>
+            <filePattern>logs/geoserver-%i.log</filePattern>
+            <PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="20 MB" />
+            </Policies>
+            <DefaultRolloverStrategy max="3" fileIndex="min"/>
+        </RollingFile>
+    </Appenders>
+    <Loggers>
+        <Logger name="org.geotools" level="warn" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.geotools.factory" level="warn" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.geoserver" level="CONFIG" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.vfny.geoserver" level="CONFIG" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Logger name="org.springframework" level="warn" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Logger name="org.geowebcache" level="CONFIG" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.geowebcache.seed" level="warn" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Root level="warn">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/logs/GEOSERVER_DEVELOPER_LOGGING.properties b/logs/GEOSERVER_DEVELOPER_LOGGING.properties
deleted file mode 100644
index 78c9f71..0000000
--- a/logs/GEOSERVER_DEVELOPER_LOGGING.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-## This log4j configuration file needs to stay here, and is used as the default logging setup
-## during data_dir upgrades and in case the chosen logging config isn't available.
-##
-## As GeoTools uses java.util.logging logging instead of log4j, GeoServer makes
-## the following mappings to adjust the log4j levels specified in this file to
-## the GeoTools logging system:
-##
-## Log4J Level          java.util.logging Level
-## --------------------------------------------
-## ALL                   FINEST
-## TRACE                 FINER
-## DEBUG                 FINE (includes CONFIG)
-## INFO                  INFO
-## WARN/ERROR            WARNING
-## FATAL                 SEVERE
-## OFF                   OFF
-
-log4j.rootLogger=WARN, geoserverlogfile, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %p [%c] - %m%n
-
-log4j.category.log4j=FATAL
-
-log4j.appender.geoserverlogfile=org.apache.log4j.FileAppender
-# Pattern to output: date priority [category] - message
-log4j.appender.geoserverlogfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.geoserverlogfile.layout.ConversionPattern=%d %p [%c] - %m%n
-
-
-log4j.category.org.geotools=WARN
-log4j.category.org.geotools.factory=WARN
-
-log4j.category.org.geoserver=TRACE
-log4j.category.org.vfny.geoserver=TRACE
-
-log4j.category.org.springframework=WARN
diff --git a/logs/GEOSERVER_DEVELOPER_LOGGING.xml b/logs/GEOSERVER_DEVELOPER_LOGGING.xml
new file mode 100644
index 0000000..bece826
--- /dev/null
+++ b/logs/GEOSERVER_DEVELOPER_LOGGING.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This log4j configuration file needs to stay here, and is used as a default logging setup   -->
+<!-- during data_dir upgrades and in case the chosen logging config isn't available.            -->
+<Configuration name="GEOSERVER_DEVELOPER_LOGGING" status="fatal" dest="out">
+    <!-- As GeoTools uses java.util.logging levels instead of log4j, GeoServer makes the        -->
+    <!-- following mappings to adjust the log4j levels specified in this file.                  -->
+    <!--                                                                                        -->
+    <!-- Log4J Level          java.util.logging Level                                           -->
+    <!-- ==================== =======================                                           -->
+    <!-- ALL                   ALL                                                              -->
+    <!-- FINEST                FINEST                                                           -->
+    <!-- TRACE                 FINER                                                            -->
+    <!-- DEBUG                 FINE                                                             -->
+    <!-- CONFIG                CONFIG                                                           -->
+    <!-- INFO                  INFO                                                             -->
+    <!-- WARN                  WARNING                                                          -->
+    <!-- ERROR                 SEVERE                                                           -->
+    <!-- FATAL                 FATAL                                                            -->
+    <!-- OFF                   OFF                                                              -->
+    <Appenders>
+        <Console name="stdout" target="SYSTEM_OUT">
+            <PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
+        </Console>
+        <RollingFile name="geoserverlogfile">
+            <filename>logs/geoserver.log</filename>
+            <filePattern>logs/geoserver-%i.log</filePattern>
+            <PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="20 MB" />
+            </Policies>
+            <DefaultRolloverStrategy max="3" fileIndex="min"/>
+        </RollingFile>
+    </Appenders>
+    <Loggers>
+
+        <Logger name="org.geotools" level="warn" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.geotools.factory" level="warn" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Logger name="org.geoserver" level="trace" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.vfny.geoserver" level="trace" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Logger name="org.springframework" level="warn" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Root level="warn">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/logs/GEOTOOLS_DEVELOPER_LOGGING.properties b/logs/GEOTOOLS_DEVELOPER_LOGGING.properties
deleted file mode 100644
index fb3f70c..0000000
--- a/logs/GEOTOOLS_DEVELOPER_LOGGING.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-## This log4j configuration file needs to stay here, and is used as the default logging setup
-## during data_dir upgrades and in case the chosen logging config isn't available.
-##
-## As GeoTools uses java.util.logging logging instead of log4j, GeoServer makes
-## the following mappings to adjust the log4j levels specified in this file to
-## the GeoTools logging system:
-##
-## Log4J Level          java.util.logging Level
-## --------------------------------------------
-## ALL                   FINEST
-## TRACE                 FINER
-## DEBUG                 FINE (includes CONFIG)
-## INFO                  INFO
-## WARN/ERROR            WARNING
-## FATAL                 SEVERE
-## OFF                   OFF
-
-log4j.rootLogger=WARN, geoserverlogfile, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %p [%c] - %m%n
-
-log4j.category.log4j=FATAL
-
-log4j.appender.geoserverlogfile=org.apache.log4j.FileAppender
-# Pattern to output: date priority [category] - message
-log4j.appender.geoserverlogfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.geoserverlogfile.layout.ConversionPattern=%d %p [%c] - %m%n
-
-
-log4j.category.org.geotools=TRACE
-# Some more geotools loggers you may be interest in tweaking
-log4j.category.org.geotools.factory=TRACE
-log4j.category.org.geotools.renderer=DEBUG
-log4j.category.org.geotools.data=TRACE
-log4j.category.org.geotools.feature=TRACE
-log4j.category.org.geotools.filter=TRACE
-log4j.category.org.geotools.factory=TRACE
-
-log4j.category.org.geoserver=INFO
-log4j.category.org.vfny.geoserver=INFO
-
-log4j.category.org.springframework=WARN
diff --git a/logs/GEOTOOLS_DEVELOPER_LOGGING.xml b/logs/GEOTOOLS_DEVELOPER_LOGGING.xml
new file mode 100644
index 0000000..370dc7b
--- /dev/null
+++ b/logs/GEOTOOLS_DEVELOPER_LOGGING.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This log4j configuration file needs to stay here, and is used as a default logging setup   -->
+<!-- during data_dir upgrades and in case the chosen logging config isn't available.            -->
+<Configuration name="GEOTOOLS_DEVELOPER_LOGGING" status="fatal" dest="out">
+    <!-- As GeoTools uses java.util.logging levels instead of log4j, GeoServer makes the        -->
+    <!-- following mappings to adjust the log4j levels specified in this file.                  -->
+    <!--                                                                                        -->
+    <!-- Log4J Level          java.util.logging Level                                           -->
+    <!-- ==================== =======================                                           -->
+    <!-- ALL                   ALL                                                              -->
+    <!-- FINEST                FINEST                                                           -->
+    <!-- TRACE                 FINER                                                            -->
+    <!-- DEBUG                 FINE                                                             -->
+    <!-- CONFIG                CONFIG                                                           -->
+    <!-- INFO                  INFO                                                             -->
+    <!-- WARN                  WARNING                                                          -->
+    <!-- ERROR                 SEVERE                                                           -->
+    <!-- FATAL                 FATAL                                                            -->
+    <!-- OFF                   OFF                                                              -->
+    <Appenders>
+        <Console name="stdout" target="SYSTEM_OUT">
+            <PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
+        </Console>
+        <RollingFile name="geoserverlogfile">
+            <filename>logs/geoserver.log</filename>
+            <filePattern>logs/geoserver-%i.log</filePattern>
+            <PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="20 MB" />
+            </Policies>
+            <DefaultRolloverStrategy max="3" fileIndex="min"/>
+        </RollingFile>
+    </Appenders>
+    <Loggers>
+
+        <Logger name="org.geotools" level="trace" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.geotools.factory" level="trace" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.geotools.renderer" level="trace" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.geotools.data" level="trace" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.geotools.feature" level="trace" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.geotools.filter" level="trace" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.geotools.filter" level="trace" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Logger name="org.geoserver" level="CONFIG" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.vfny.geoserver" level="CONFIG" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Logger name="org.springframework" level="warn" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Root level="warn">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/logs/PRODUCTION_LOGGING.properties b/logs/PRODUCTION_LOGGING.properties
deleted file mode 100644
index c68cd47..0000000
--- a/logs/PRODUCTION_LOGGING.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-## This log4j configuration file needs to stay here, and is used as the default logging setup
-## during data_dir upgrades and in case the chosen logging config isn't available.
-##
-## As GeoTools uses java.util.logging logging instead of log4j, GeoServer makes
-## the following mappings to adjust the log4j levels specified in this file to
-## the GeoTools logging system:
-##
-## Log4J Level          java.util.logging Level
-## --------------------------------------------
-## ALL                   FINEST
-## TRACE                 FINER
-## DEBUG                 FINE (includes CONFIG)
-## INFO                  INFO
-## WARN/ERROR            WARNING
-## FATAL                 SEVERE
-## OFF                   OFF
-
-log4j.rootLogger=WARN, geoserverlogfile, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %p [%c{2}] - %m%n
-
-
-log4j.appender.geoserverlogfile=org.apache.log4j.FileAppender
-# Pattern to output: date priority [category] - message
-log4j.appender.geoserverlogfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.geoserverlogfile.layout.ConversionPattern=%d %p [%c{2}] - %m%n
-
-log4j.category.log4j=FATAL
-
-log4j.category.org.geotools=WARN
-log4j.category.org.geotools.factory=WARN
-log4j.category.org.geoserver=WARN
-log4j.category.org.vfny.geoserver=WARN
-
-log4j.category.org.springframework=WARN
-
-log4j.category.org.geowebcache=ERROR
diff --git a/logs/PRODUCTION_LOGGING.xml b/logs/PRODUCTION_LOGGING.xml
new file mode 100644
index 0000000..55c5ea2
--- /dev/null
+++ b/logs/PRODUCTION_LOGGING.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This log4j configuration file needs to stay here, and is used as the default logging setup -->
+<!-- during data_dir upgrades and in case the chosen logging config isn't available.            -->
+<Configuration name="PRODUCTION_LOGGING" status="fatal" dest="out">
+    <Appenders>
+        <Console name="stdout" target="SYSTEM_OUT">
+            <PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
+        </Console>
+        <RollingFile name="geoserverlogfile">
+            <filename>logs/geoserver.log</filename>
+            <filePattern>logs/geoserver-%i.log</filePattern>
+            <PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="20 MB" />
+            </Policies>
+            <DefaultRolloverStrategy max="3" fileIndex="min"/>
+        </RollingFile>
+    </Appenders>
+    <Loggers>
+
+        <Logger name="org.geotools" level="warn" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.geotools.factory" level="warn" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Logger name="org.geoserver" level="warn" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.vfny.geoserver" level="warn" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Logger name="org.springframework" level="warn" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Logger name="org.geowebcache" level="error" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Root level="warn">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/logs/QUIET_LOGGING.xml b/logs/QUIET_LOGGING.xml
new file mode 100644
index 0000000..08379e7
--- /dev/null
+++ b/logs/QUIET_LOGGING.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This log4j configuration file needs to stay here, and is used as the default logging setup -->
+<!-- during data_dir upgrades and in case the chosen logging config isn't available.            -->
+<Configuration name="QUIET_LOGGING" status="off" dest="out">
+    <Appenders>
+        <Console name="stdout" target="SYSTEM_OUT">
+            <PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Root level="off">
+            <AppenderRef ref="stdout"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/logs/TEST_LOGGING.xml b/logs/TEST_LOGGING.xml
new file mode 100644
index 0000000..bac71dc
--- /dev/null
+++ b/logs/TEST_LOGGING.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This log4j configuration file needs to stay here, and is used as the default logging setup -->
+<!-- during data_dir upgrades and in case the chosen logging config isn't available.            -->
+<Configuration name="TEST_LOGGING" status="fatal" dest="out">
+    <Appenders>
+        <Console name="stdout" target="SYSTEM_OUT">
+            <PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Logger name="org.geotools" level="error" additivity="false">
+            <AppenderRef ref="stdout"/>
+        </Logger>
+        <Logger name="org.geotools.factory" level="error" additivity="false">
+            <AppenderRef ref="stdout"/>
+        </Logger>
+
+        <Logger name="org.geoserver" level="error" additivity="false">
+            <AppenderRef ref="stdout"/>
+        </Logger>
+        <Logger name="org.vfny.geoserver" level="error" additivity="false">
+            <AppenderRef ref="stdout"/>
+        </Logger>
+
+        <Logger name="org.springframework" level="error" additivity="false">
+            <AppenderRef ref="stdout"/>
+        </Logger>
+
+        <Logger name="org.apache.wicket.util.tester" level="info" additivity="false">
+            <AppenderRef ref="stdout"/>
+        </Logger>
+
+        <Root level="off">
+            <AppenderRef ref="stdout"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/logs/VERBOSE_LOGGING.properties b/logs/VERBOSE_LOGGING.properties
deleted file mode 100644
index 3c8a548..0000000
--- a/logs/VERBOSE_LOGGING.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-## This log4j configuration file needs to stay here, and is used as the default logging setup
-## during data_dir upgrades and in case the chosen logging config isn't available.
-##
-## As GeoTools uses java.util.logging logging instead of log4j, GeoServer makes
-## the following mappings to adjust the log4j levels specified in this file to
-## the GeoTools logging system:
-##
-## Log4J Level          java.util.logging Level
-## --------------------------------------------
-## ALL                   FINEST
-## TRACE                 FINER
-## DEBUG                 FINE (includes CONFIG)
-## INFO                  INFO
-## WARN/ERROR            WARNING
-## FATAL                 SEVERE
-## OFF                   OFF
-
-log4j.rootLogger=WARN, geoserverlogfile, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM HH:mm:ss} %p [%c{2}] - %m%n
-
-log4j.category.log4j=FATAL
-
-log4j.appender.geoserverlogfile=org.apache.log4j.FileAppender
-# Pattern to output: date priority [category] - message
-log4j.appender.geoserverlogfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.geoserverlogfile.layout.ConversionPattern=%d %p [%c{2}] - %m%n
-
-
-log4j.category.org.geotools=TRACE
-log4j.category.org.geotools.factory=TRACE
-log4j.category.org.geotools.renderer=DEBUG
-log4j.category.org.geoserver=TRACE
-log4j.category.org.vfny.geoserver=TRACE
-
-log4j.category.org.springframework=INFO
-log4j.category.org.apache.struts=INFO
-
-log4j.category.org.geowebcache=DEBUG
diff --git a/logs/VERBOSE_LOGGING.xml b/logs/VERBOSE_LOGGING.xml
new file mode 100644
index 0000000..0b5d229
--- /dev/null
+++ b/logs/VERBOSE_LOGGING.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This log4j configuration file needs to stay here, and is used as a default logging setup   -->
+<!-- during data_dir upgrades and in case the chosen logging config isn't available.            -->
+<Configuration name="VERBOSE_LOGGING" status="fatal" dest="out">
+    <!-- As GeoTools uses java.util.logging levels instead of log4j, GeoServer makes the        -->
+    <!-- following mappings to adjust the log4j levels specified in this file.                  -->
+    <!--                                                                                        -->
+    <!-- Log4J Level          java.util.logging Level                                           -->
+    <!-- ==================== =======================                                           -->
+    <!-- ALL                   ALL                                                              -->
+    <!-- FINEST                FINEST                                                           -->
+    <!-- TRACE                 FINER                                                            -->
+    <!-- DEBUG                 FINE                                                             -->
+    <!-- CONFIG                CONFIG                                                           -->
+    <!-- INFO                  INFO                                                             -->
+    <!-- WARN                  WARNING                                                          -->
+    <!-- ERROR                 SEVERE                                                           -->
+    <!-- FATAL                 FATAL                                                            -->
+    <!-- OFF                   OFF                                                              -->
+    <Appenders>
+        <Console name="stdout" target="SYSTEM_OUT">
+            <PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
+        </Console>
+        <RollingFile name="geoserverlogfile">
+            <filename>logs/geoserver.log</filename>
+            <filePattern>logs/geoserver-%i.log</filePattern>
+            <PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="20 MB" />
+            </Policies>
+            <DefaultRolloverStrategy max="3" fileIndex="min"/>
+        </RollingFile>
+    </Appenders>
+    <Loggers>
+
+        <Logger name="org.geotools" level="trace" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.geotools.factory" level="trace" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Logger name="org.geoserver" level="trace" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+        <Logger name="org.vfny.geoserver" level="trace" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Logger name="org.springframework" level="warn" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Logger name="org.apache.wicket.util.tester" level="info" additivity="false">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Logger>
+
+        <Root level="warn">
+            <AppenderRef ref="stdout"/>
+            <AppenderRef ref="geoserverlogfile"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file