From 74f25dd6384b2a1f3154229c53cce16203a4bc72 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Mon, 20 Nov 2006 15:07:02 +0000
Subject: broker/pom.xml - removed test scope from junit to remove warning in
 build log. TransportConnection.java/AMQQueue.java - change log level on a
 print statement from warn to info log4j.properties - updated threashold to be
 'all' so we can set the logging level with amqj.logging.level client/pom.xml
 - fixed mvn test run output. It wasn't using our log4.properties file.
 systests/pom.xml - added log4j.properties configuration broker/pom.xml -
 added log4j.properties configuration common/pom.xml - skipped tests as there
 are none, and it caused the build to fail

Also adjusted spaceing to be 4 space per tab (and no tabs)


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@477214 13f79535-47bb-0310-9956-ffa450edef68
---
 java/systests/pom.xml                        | 149 ++++++++++++++-------------
 java/systests/src/test/java/log4j.properties |  28 +++++
 2 files changed, 108 insertions(+), 69 deletions(-)
 create mode 100644 java/systests/src/test/java/log4j.properties

(limited to 'java/systests')

diff --git a/java/systests/pom.xml b/java/systests/pom.xml
index 3df69ce4ac..ae6558340f 100644
--- a/java/systests/pom.xml
+++ b/java/systests/pom.xml
@@ -18,78 +18,89 @@
 -->
 <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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.qpid</groupId>
-  <artifactId>qpid-systests</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-incubating-M2-SNAPSHOT</version>
-  <name>Qpid System Tests</name>
-  <url>http://cwiki.apache.org/confluence/display/qpid</url>
-
-  <parent>
+    <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.qpid</groupId>
-    <artifactId>qpid</artifactId>
+    <artifactId>qpid-systests</artifactId>
+    <packaging>jar</packaging>
     <version>1.0-incubating-M2-SNAPSHOT</version>
-  </parent>
+    <name>Qpid System Tests</name>
+    <url>http://cwiki.apache.org/confluence/display/qpid</url>
+
+    <parent>
+        <groupId>org.apache.qpid</groupId>
+        <artifactId>qpid</artifactId>
+        <version>1.0-incubating-M2-SNAPSHOT</version>
+    </parent>
 
-  <properties>
-    <topDirectoryLocation>..</topDirectoryLocation>
-  </properties>
+    <properties>
+        <topDirectoryLocation>..</topDirectoryLocation>
+        <amqj.logging.level>warn</amqj.logging.level>
+    </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.qpid</groupId>
-      <artifactId>qpid-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.qpid</groupId>
-      <artifactId>qpid-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.qpid</groupId>
-      <artifactId>qpid-broker</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>ant</groupId>
-      <artifactId>ant-junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.qpid</groupId>
+            <artifactId>qpid-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.qpid</groupId>
+            <artifactId>qpid-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.qpid</groupId>
+            <artifactId>qpid-broker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant-junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemProperties>
-            <property>
-              <name>amqj.noAutoCreateVMBroker</name>
-              <value>true</value>
-            </property>
-          </systemProperties>
-          <includes>
-            <include>**/server/**/*Test.java</include>
-            <include>**/test/unit/ack/DisconnectAndRedeliver.java</include>
-          </includes>
-          <excludes>
-            <exclude>**/Abstract*Test*</exclude>
-            <exclude>**/*PerfTest*</exclude>
-            <exclude>**/*PerformanceTest*</exclude>
-            <exclude>**/server/util/ConcurrentTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <property>
+                            <name>amqj.noAutoCreateVMBroker</name>
+                            <value>true</value>
+                        </property>
+                        <property>
+                            <name>amqj.logging.level</name>
+                            <value>${amqj.logging.level}</value>
+                        </property>
+                        <property>
+                            <name>log4j.debug</name>
+                            <value>true</value>
+                        </property>
+                         <property>
+                            <name>log4j.configuration</name>
+                            <value>file:///${basedir}/src/test/java/log4j.properties</value>
+                        </property>
+                    </systemProperties>
+                    <includes>
+                        <include>**/server/**/*Test.java</include>
+                        <include>**/test/unit/ack/DisconnectAndRedeliver.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/Abstract*Test*</exclude>
+                        <exclude>**/*PerfTest*</exclude>
+                        <exclude>**/*PerformanceTest*</exclude>
+                        <exclude>**/server/util/ConcurrentTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/java/systests/src/test/java/log4j.properties b/java/systests/src/test/java/log4j.properties
new file mode 100644
index 0000000000..6d596d1d19
--- /dev/null
+++ b/java/systests/src/test/java/log4j.properties
@@ -0,0 +1,28 @@
+#
+# 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.
+#
+log4j.rootLogger=${root.logging.level}
+
+
+log4j.logger.org.apache.qpid=${amqj.logging.level}, console
+log4j.additivity.org.apache.qpid=false
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.Threshold=all
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n
-- 
cgit v1.2.1