From bc96b14969fa55f0ee032908fac989924a17a6d4 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Wed, 22 Jan 2014 15:57:20 +0000
Subject: QPID-5048: Logging dependency and configuration tidy up for maven
 build

Patch Supplied by Andrew MacBean <andymacbean@gmail.com>.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1560392 13f79535-47bb-0310-9956-ffa450edef68
---
 java/bdbstore/jmx/pom.xml                          |  7 +++
 java/bdbstore/pom.xml                              |  7 +++
 java/bdbstore/systests/pom.xml                     | 17 ++++++
 java/broker-core/pom.xml                           |  6 +-
 java/broker-plugins/access-control/pom.xml         |  7 +++
 java/broker-plugins/amqp-0-10-protocol/pom.xml     | 14 +++++
 java/broker-plugins/amqp-0-8-protocol/pom.xml      |  7 +++
 java/broker-plugins/amqp-1-0-protocol/pom.xml      |  8 +++
 java/broker-plugins/derby-store/pom.xml            |  7 +++
 java/broker-plugins/jdbc-store/pom.xml             |  7 +++
 java/broker-plugins/management-http/pom.xml        | 14 +++++
 java/broker-plugins/management-jmx/pom.xml         |  7 +++
 java/broker/pom.xml                                | 12 ++--
 java/client/pom.xml                                |  9 +--
 java/common/pom.xml                                | 18 ++----
 java/jca/pom.xml                                   | 15 +++++
 java/perftests/pom.xml                             | 29 ++++------
 java/perftests/visualisation-jfc/pom.xml           |  2 +-
 java/pom.xml                                       | 54 ++++++++++-------
 java/qpid-test-utils/pom.xml                       | 12 ++--
 .../src/main/resources/log4j-test.xml              | 67 ++++++++++++++++++++++
 java/systests/pom.xml                              | 17 ++++++
 java/tools/pom.xml                                 | 21 ++++---
 23 files changed, 284 insertions(+), 80 deletions(-)
 create mode 100644 java/qpid-test-utils/src/main/resources/log4j-test.xml

(limited to 'java')

diff --git a/java/bdbstore/jmx/pom.xml b/java/bdbstore/jmx/pom.xml
index 3480460972..82ece2c66f 100644
--- a/java/bdbstore/jmx/pom.xml
+++ b/java/bdbstore/jmx/pom.xml
@@ -48,6 +48,13 @@
       <scope>compile</scope>
     </dependency>
 
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <dependency>
       <groupId>com.sleepycat</groupId>
       <artifactId>je</artifactId>
diff --git a/java/bdbstore/pom.xml b/java/bdbstore/pom.xml
index c90f904171..ec71547038 100644
--- a/java/bdbstore/pom.xml
+++ b/java/bdbstore/pom.xml
@@ -40,6 +40,13 @@
       <scope>compile</scope>
     </dependency>
 
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <dependency>
       <groupId>com.sleepycat</groupId>
       <artifactId>je</artifactId>
diff --git a/java/bdbstore/systests/pom.xml b/java/bdbstore/systests/pom.xml
index 9c4aaa1e21..e095765ea1 100644
--- a/java/bdbstore/systests/pom.xml
+++ b/java/bdbstore/systests/pom.xml
@@ -48,6 +48,20 @@
       <scope>compile</scope>
     </dependency>
 
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -102,6 +116,9 @@
           <!-- Skip the default test phase, bind to the
                integration-test phase below instead -->
           <skip>true</skip>
+          <systemPropertyVariables>
+            <log4j.configuration.file>${project.basedir}${file.separator}..${file.separator}..${file.separator}test-profiles${file.separator}log4j-test.xml</log4j.configuration.file>
+          </systemPropertyVariables>
         </configuration>
         <executions>
           <execution>
diff --git a/java/broker-core/pom.xml b/java/broker-core/pom.xml
index a872bf565a..7254de0251 100644
--- a/java/broker-core/pom.xml
+++ b/java/broker-core/pom.xml
@@ -47,21 +47,21 @@
 	<dependency>
 	  <groupId>log4j</groupId>
 	  <artifactId>log4j</artifactId>
-	  <version>1.2.16</version>
+	  <version>${log4j-version}</version>
 	  <scope>compile</scope>
 	</dependency>
 
 	<dependency>
 	  <groupId>org.slf4j</groupId>
 	  <artifactId>slf4j-api</artifactId>
-	  <version>1.6.4</version>
+	  <version>${slf4j-version}</version>
 	  <scope>compile</scope>
 	</dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.4</version>
+      <version>${slf4j-version}</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/java/broker-plugins/access-control/pom.xml b/java/broker-plugins/access-control/pom.xml
index c4b966d9ae..c63618380c 100644
--- a/java/broker-plugins/access-control/pom.xml
+++ b/java/broker-plugins/access-control/pom.xml
@@ -38,6 +38,13 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.qpid</groupId>
diff --git a/java/broker-plugins/amqp-0-10-protocol/pom.xml b/java/broker-plugins/amqp-0-10-protocol/pom.xml
index c24dd918e0..6bfce64240 100644
--- a/java/broker-plugins/amqp-0-10-protocol/pom.xml
+++ b/java/broker-plugins/amqp-0-10-protocol/pom.xml
@@ -34,6 +34,20 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.qpid</groupId>
diff --git a/java/broker-plugins/amqp-0-8-protocol/pom.xml b/java/broker-plugins/amqp-0-8-protocol/pom.xml
index 2e9954bc46..0d8c8be3dd 100644
--- a/java/broker-plugins/amqp-0-8-protocol/pom.xml
+++ b/java/broker-plugins/amqp-0-8-protocol/pom.xml
@@ -34,6 +34,13 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.qpid</groupId>
diff --git a/java/broker-plugins/amqp-1-0-protocol/pom.xml b/java/broker-plugins/amqp-1-0-protocol/pom.xml
index 31b42ef0e2..97db18011d 100644
--- a/java/broker-plugins/amqp-1-0-protocol/pom.xml
+++ b/java/broker-plugins/amqp-1-0-protocol/pom.xml
@@ -40,6 +40,14 @@
       <version>0.26-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
diff --git a/java/broker-plugins/derby-store/pom.xml b/java/broker-plugins/derby-store/pom.xml
index 51578a5db6..9b55875aa8 100644
--- a/java/broker-plugins/derby-store/pom.xml
+++ b/java/broker-plugins/derby-store/pom.xml
@@ -41,6 +41,13 @@
       <scope>compile</scope>
     </dependency>
 
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.qpid</groupId>
diff --git a/java/broker-plugins/jdbc-store/pom.xml b/java/broker-plugins/jdbc-store/pom.xml
index 1cc75d8465..ca861a42f3 100644
--- a/java/broker-plugins/jdbc-store/pom.xml
+++ b/java/broker-plugins/jdbc-store/pom.xml
@@ -34,6 +34,13 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.qpid</groupId>
diff --git a/java/broker-plugins/management-http/pom.xml b/java/broker-plugins/management-http/pom.xml
index 36925369fe..abc754902a 100644
--- a/java/broker-plugins/management-http/pom.xml
+++ b/java/broker-plugins/management-http/pom.xml
@@ -34,6 +34,20 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-servlet_2.5_spec</artifactId>
diff --git a/java/broker-plugins/management-jmx/pom.xml b/java/broker-plugins/management-jmx/pom.xml
index 8fd525e7d6..8a06fcf185 100644
--- a/java/broker-plugins/management-jmx/pom.xml
+++ b/java/broker-plugins/management-jmx/pom.xml
@@ -41,6 +41,13 @@
       <scope>compile</scope>
     </dependency>
 
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.qpid</groupId>
diff --git a/java/broker/pom.xml b/java/broker/pom.xml
index 7f09d5c046..6eb51a4b2e 100644
--- a/java/broker/pom.xml
+++ b/java/broker/pom.xml
@@ -40,12 +40,12 @@
       <scope>compile</scope>
     </dependency>
 
-	<dependency>
-	  <groupId>log4j</groupId>
-	  <artifactId>log4j</artifactId>
-	  <version>1.2.16</version>
-	  <scope>compile</scope>
-	</dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
 
     <dependency>
       <groupId>commons-cli</groupId>
diff --git a/java/client/pom.xml b/java/client/pom.xml
index e97b5b7a0d..3d9508eb16 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.6.4</version>
+      <version>${slf4j-version}</version>
       <scope>compile</scope>
     </dependency>
 
@@ -54,13 +54,6 @@
       <version>0.26-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
-
-	<dependency>
-	  <groupId>log4j</groupId>
-	  <artifactId>log4j</artifactId>
-	  <version>1.2.16</version>
-	  <scope>test</scope>
-	</dependency>
   </dependencies>
 
   <build>
diff --git a/java/common/pom.xml b/java/common/pom.xml
index 7aa4cd2a0c..d931c799a3 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -34,12 +34,12 @@
   </properties>
 
   <dependencies>
-	<dependency>
-	  <groupId>org.slf4j</groupId>
-	  <artifactId>slf4j-api</artifactId>
-	  <version>1.6.4</version>
-	  <scope>compile</scope>
-	</dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
 
     <!-- test dependencies -->
     <dependency>
@@ -49,12 +49,6 @@
       <scope>test</scope>
     </dependency>
 
-	<dependency>
-	  <groupId>log4j</groupId>
-	  <artifactId>log4j</artifactId>
-	  <version>1.2.16</version>
-	  <scope>test</scope>
-	</dependency>
   </dependencies>
    
   <build>
diff --git a/java/jca/pom.xml b/java/jca/pom.xml
index 467175db90..859b8aabac 100644
--- a/java/jca/pom.xml
+++ b/java/jca/pom.xml
@@ -33,6 +33,13 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
@@ -104,6 +111,14 @@
         </exclusion>
       </exclusions>
     </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.apache.qpid</groupId>
+      <artifactId>qpid-test-utils</artifactId>
+      <version>0.26-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
    
   <build>
diff --git a/java/perftests/pom.xml b/java/perftests/pom.xml
index 566f92828e..2a1dbd4350 100644
--- a/java/perftests/pom.xml
+++ b/java/perftests/pom.xml
@@ -42,34 +42,26 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jms_1.1_spec</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
     </dependency>
 
-    <!-- logging deps -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.6.4</version>
+      <version>${slf4j-version}</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.4</version>
-      <scope>compile</scope>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
+      <version>1.0</version>
+      <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.16</version>
-      <scope>compile</scope>
-    </dependency> 
-
     <!-- other deps -->
     <dependency>
       <groupId>commons-lang</groupId>
@@ -262,6 +254,9 @@
           <excludes>
             <exclude>**/org/apache/qpid/systest/**/*.java</exclude>
           </excludes>
+          <systemPropertyVariables>
+            <log4j.configuration.file>${project.basedir}${file.separator}..${file.separator}test-profiles${file.separator}log4j-test.xml</log4j.configuration.file>
+          </systemPropertyVariables>
         </configuration>
         <executions>
           <execution>
diff --git a/java/perftests/visualisation-jfc/pom.xml b/java/perftests/visualisation-jfc/pom.xml
index da84df1d2e..d677491a03 100644
--- a/java/perftests/visualisation-jfc/pom.xml
+++ b/java/perftests/visualisation-jfc/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.6.4</version>
+      <version>${slf4j-version}</version>
       <scope>compile</scope>
     </dependency>
 
diff --git a/java/pom.xml b/java/pom.xml
index a9f9a835eb..c8875fb39b 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -31,8 +31,8 @@
   <!-- ###### TODO ######
     - Add the Excludes files, log4j config, etc test resources to a module (qpid-test-utils?) which can be
       used (extracted?) by the others to prevent them having to reference outside their directly for the files.
-      - Fix what the systests/perftests do to copy the test-profiles dir to the necessary location.
-      - Fix the log4j configuration property to work with all the modules, resolve the currently generated log4j exceptions during test runs.
+        - Fix what the systests/perftests do to copy the test-profiles dir to the necessary location.
+        - Fix the log4j configuration property to work with all the modules.
     - Fix the version numbers in all the modules.
     - Decide on a final name for this parent module, qpid-project isnt necessarily appropriate given it doesnt encompass the whole project.
     - Test deploying the modules to a local Nexus instance (by overriding the repo properties locally).
@@ -68,6 +68,8 @@
     <!-- test dependency version numbers -->
     <junit-version>3.8.1</junit-version>
     <mockito-version>1.9.0</mockito-version>
+    <log4j-version>1.2.16</log4j-version>
+    <slf4j-version>1.6.4</slf4j-version>
 
     <!-- plugin version numbers -->
     <maven-antrun-plugin-version>1.7</maven-antrun-plugin-version>
@@ -132,6 +134,27 @@
       <version>${mockito-version}</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <modules>
@@ -409,7 +432,7 @@
             <java.naming.factory.initial>org.apache.qpid.jndi.PropertiesFileInitialContextFactory</java.naming.factory.initial>
             <java.naming.provider.url>test-profiles${file.separator}test-provider.properties</java.naming.provider.url>
 
-            <broker.config>${qpid.home}/etc/config-systests.json</broker.config>
+            <broker.config>${qpid.home}${file.separator}etc${file.separator}config-systests.json</broker.config>
             <messagestore.class.name>org.apache.qpid.server.store.MemoryMessageStore</messagestore.class.name>
             <broker.protocol.excludes></broker.protocol.excludes>
             <broker.persistent>false</broker.persistent>
@@ -422,8 +445,8 @@
             <amqj.protocol.logging.level>debug</amqj.protocol.logging.level>
             <root.logging.level>warn</root.logging.level>
 
-            <log4j.configuration.file>test-profiles${file.separator}log4j-test.xml</log4j.configuration.file>
-            <log4j.configuration>file://${basedir}${file.separator}..${file.separator}test-profiles${file.separator}log4j-test.xml</log4j.configuration>
+            <log4j.configuration.file>${project.basedir}${file.separator}test-profiles${file.separator}log4j-test.xml</log4j.configuration.file>
+            <log4j.configuration>log4j-test.xml</log4j.configuration>
 
             <log4j.debug>false</log4j.debug>
 
@@ -456,8 +479,7 @@
             <broker.ready>BRK-1004</broker.ready>
             <profile>${profile}</profile>
 
-            <!-- This must be a child of qpid home currently
-                 due to the horrible mechanics of QBTC  -->
+            <!-- This must be a child of qpid home currently due to the horrible mechanics of QBTC  -->
             <test.output>${qpid.home.qbtc.output}</test.output>
           </systemPropertyVariables>
         </configuration>
@@ -502,6 +524,11 @@
 
   <url>http://qpid.apache.org</url>
 
+  <issueManagement>
+    <system>JIRA</system>
+    <url>https://issues.apache.org/jira/browse/QPID</url>
+  </issueManagement>
+
   <mailingLists>
     <mailingList>
       <name>Apache Qpid Users</name>
@@ -525,19 +552,6 @@
     <url>http://svn.apache.org/viewvc/qpid/</url>
   </scm>
 
-  <distributionManagement>
-    <repository>
-      <id>qpid.releases.https</id>
-      <name>Qpid Release Distribution Repository</name>
-      <url>https://repository.apache.org/content/repositories/releases/org/apache/qpid</url>
-    </repository>
-    <snapshotRepository>
-      <id>qpid.snapshots.https</id>
-      <name>Qpid Development Snapshot Repository</name>
-      <url>https://repository.apache.org/content/repositories/snapshots/org/apache/qpid</url>
-    </snapshotRepository>
-  </distributionManagement>
-
   <reporting>
     <plugins>
       <plugin>
diff --git a/java/qpid-test-utils/pom.xml b/java/qpid-test-utils/pom.xml
index 4e90eb334c..17422d5378 100644
--- a/java/qpid-test-utils/pom.xml
+++ b/java/qpid-test-utils/pom.xml
@@ -33,12 +33,12 @@
       <scope>compile</scope>
     </dependency>
 
-	<dependency>
-	  <groupId>log4j</groupId>
-	  <artifactId>log4j</artifactId>
-	  <version>1.2.16</version>
-	  <scope>provided</scope>
-	</dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
diff --git a/java/qpid-test-utils/src/main/resources/log4j-test.xml b/java/qpid-test-utils/src/main/resources/log4j-test.xml
new file mode 100644
index 0000000000..58205752e1
--- /dev/null
+++ b/java/qpid-test-utils/src/main/resources/log4j-test.xml
@@ -0,0 +1,67 @@
+<?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">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j configuration for unit tests                                   -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+  <appender name="console" class="org.apache.log4j.ConsoleAppender">
+    <param name="Target" value="System.out"/>
+    <param name="ImmediateFlush" value="true"/>
+    <param name="Follow" value="true"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%t %d %p [%c{4}] %m%n"/>
+    </layout>
+  </appender>
+
+  <logger name="org.apache.qpid">
+    <level value="${amqj.logging.level}"/>
+  </logger>
+
+  <logger name="qpid.message">
+    <level value="INFO"/>
+  </logger>
+
+  <logger name="qpid.protocol">
+    <level value="${amqj.protocol.logging.level}"/>
+  </logger>
+
+  <logger name="org.apache.qpid.test.utils.QpidTestCase">
+    <level value="ALL"/>
+  </logger>
+
+  <logger name="org.apache.commons">
+    <level value="WARN"/>
+  </logger>
+
+  <logger name="apache.commons.configuration.ConfigurationFactory">
+    <level value="ERROR"/>
+  </logger>
+
+  <root>
+    <level value="${root.logging.level}"/>
+    <appender-ref ref="console" />
+  </root>
+</log4j:configuration>
diff --git a/java/systests/pom.xml b/java/systests/pom.xml
index a732c9a00c..98086bbe9e 100644
--- a/java/systests/pom.xml
+++ b/java/systests/pom.xml
@@ -55,6 +55,20 @@
       <scope>compile</scope>
     </dependency>
 
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <!-- client deps -->
     <dependency>
       <groupId>org.apache.qpid</groupId>
@@ -242,6 +256,9 @@
           <!-- Skip the default test phase, bind to the
                integration-test phase below instead -->
           <skip>true</skip>
+          <systemPropertyVariables>
+            <log4j.configuration.file>${project.basedir}${file.separator}..${file.separator}test-profiles${file.separator}log4j-test.xml</log4j.configuration.file>
+          </systemPropertyVariables>
         </configuration>
         <executions>
           <execution>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index edc800a172..0afaa1d274 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -33,19 +33,26 @@
       <scope>compile</scope>
     </dependency>
 
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
       <version>1.0</version>
       <scope>compile</scope>
     </dependency>
-
-	<dependency>
-	  <groupId>log4j</groupId>
-	  <artifactId>log4j</artifactId>
-	  <version>1.2.16</version>
-	  <scope>compile</scope>
-	</dependency>
   </dependencies>
    
   <build>
-- 
cgit v1.2.1