From 5be63610c4e7d07ea64b29965a97562dc2d6f4a7 Mon Sep 17 00:00:00 2001
From: Alex Rudyy <orudyy@apache.org>
Date: Wed, 19 Nov 2014 16:01:08 +0000
Subject: QPID-6235: Include backup-log4j.xml into bdbstore jar

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1640580 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/bdbstore/src/main/java/backup-log4j.xml  | 65 ----------------------
 .../bdbstore/src/main/resources/backup-log4j.xml   | 65 ++++++++++++++++++++++
 2 files changed, 65 insertions(+), 65 deletions(-)
 delete mode 100644 qpid/java/bdbstore/src/main/java/backup-log4j.xml
 create mode 100644 qpid/java/bdbstore/src/main/resources/backup-log4j.xml

diff --git a/qpid/java/bdbstore/src/main/java/backup-log4j.xml b/qpid/java/bdbstore/src/main/java/backup-log4j.xml
deleted file mode 100644
index 6b0619f0b6..0000000000
--- a/qpid/java/bdbstore/src/main/java/backup-log4j.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- -
- -   http://www.apache.org/licenses/LICENSE-2.0
- -
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- =============================================================================== -->
-<!--  This is a Log4j configuration specially created for the BDB Backup utility,    -->
-<!-- it outputs logging to the console for specifically designated console loggers   -->
-<!-- at info level or above only. This avoids spamming the user with any internals   -->
-<!-- of the Qpid code.                                                               -->
-<!--  Use a different logging set up to capture debugging output to diagnose errors. -->
-<!-- =============================================================================== -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
-    <!-- ====================================================== -->
-    <!-- Append messages to the console at info level or above. -->
-    <!-- ====================================================== -->
-
-    <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-        <param name="Target" value="System.out"/>
-        <param name="Threshold" value="info"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%m%n"/>
-        </layout>
-
-    </appender>
-
-    <!-- ================ -->
-    <!-- Limit categories -->
-    <!-- ================ -->
-
-    <category name="org.apache.qpid.server.store.berkeleydb.BDBBackup">
-        <priority value="info"/>
-    </category>
-
-    <!-- ======================= -->
-    <!-- Setup the Root category -->
-    <!-- ======================= -->
-
-    <root>
-        <appender-ref ref="CONSOLE"/>
-    </root>
-
-</log4j:configuration>
diff --git a/qpid/java/bdbstore/src/main/resources/backup-log4j.xml b/qpid/java/bdbstore/src/main/resources/backup-log4j.xml
new file mode 100644
index 0000000000..6b0619f0b6
--- /dev/null
+++ b/qpid/java/bdbstore/src/main/resources/backup-log4j.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ -
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements.  See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership.  The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License.  You may obtain a copy of the License at
+ -
+ -   http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied.  See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -
+ -->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- =============================================================================== -->
+<!--  This is a Log4j configuration specially created for the BDB Backup utility,    -->
+<!-- it outputs logging to the console for specifically designated console loggers   -->
+<!-- at info level or above only. This avoids spamming the user with any internals   -->
+<!-- of the Qpid code.                                                               -->
+<!--  Use a different logging set up to capture debugging output to diagnose errors. -->
+<!-- =============================================================================== -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+    <!-- ====================================================== -->
+    <!-- Append messages to the console at info level or above. -->
+    <!-- ====================================================== -->
+
+    <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+        <param name="Target" value="System.out"/>
+        <param name="Threshold" value="info"/>
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <!-- The default pattern: Date Priority [Category] Message\n -->
+            <param name="ConversionPattern" value="%m%n"/>
+        </layout>
+
+    </appender>
+
+    <!-- ================ -->
+    <!-- Limit categories -->
+    <!-- ================ -->
+
+    <category name="org.apache.qpid.server.store.berkeleydb.BDBBackup">
+        <priority value="info"/>
+    </category>
+
+    <!-- ======================= -->
+    <!-- Setup the Root category -->
+    <!-- ======================= -->
+
+    <root>
+        <appender-ref ref="CONSOLE"/>
+    </root>
+
+</log4j:configuration>
-- 
cgit v1.2.1