Merged revisions 550748-551121 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r550748 | ritchiem | 2007-06-26 10:20:17 +0100 (Tue, 26 Jun 2007) | 1 line
  
  Added xml file for logging during sustained tests
........
  r550773 | rupertlssmith | 2007-06-26 12:03:04 +0100 (Tue, 26 Jun 2007) | 1 line
  
  Immediate and mandatory flag tests added.
........
  r550849 | rupertlssmith | 2007-06-26 17:43:58 +0100 (Tue, 26 Jun 2007) | 1 line
  
  QPID-509 Mandatory messages not returned outside a transaction. They are now.
........
  r551117 | ritchiem | 2007-06-27 11:51:34 +0100 (Wed, 27 Jun 2007) | 2 lines
  
  Update to the sustained test to ensure late joining occurs correctly and improved stabilisation. Additional system properties now documented on wiki.
  http://cwiki.apache.org/qpid/sustained-tests.html
........
  r551118 | ritchiem | 2007-06-27 11:51:51 +0100 (Wed, 27 Jun 2007) | 1 line
  
  Added intelij files to ignore list
........
  r551119 | ritchiem | 2007-06-27 11:55:34 +0100 (Wed, 27 Jun 2007) | 1 line
  
  POM update to add Apache content to built jars
........
  r551120 | ritchiem | 2007-06-27 11:58:25 +0100 (Wed, 27 Jun 2007) | 1 line
  
  Updated default guest password as it was not correct.
........
  r551121 | ritchiem | 2007-06-27 12:00:48 +0100 (Wed, 27 Jun 2007) | 1 line
  
  Added additional information to log message when available to aid the explination of a failed connection
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@551207 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 69 insertions, 0 deletions

diff --git a/java/integrationtests/src/resources/sustained-log4j.xml b/java/integrationtests/src/resources/sustained-log4j.xml
new file mode 100644
index 0000000000..c5ab3137bf
--- /dev/null
+++ b/java/integrationtests/src/resources/sustained-log4j.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+ -
+ - 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 xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+
+    <appender name="FileAppender" class="org.apache.log4j.FileAppender">
+        <param name="File" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
+        <param name="Append" value="false"/>
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+        </layout>
+    </appender>
+
+    <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p (%F:%L) - %m%n"/>
+            <!--param name="ConversionPattern" value="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/-->
+        </layout>
+    </appender>
+
+    <category name="SustainedTest">
+        <priority value="${sustained.level}"/>
+    </category>
+
+    <category name="org.apache">
+        <priority value="warn"/>
+    </category>
+
+    <category name="org.apache.qpid.interop">
+        <priority value="${interop.logging.level}"/>
+    </category>
+
+
+    <category name="org.apache.qpid.sustained">
+        <priority value="${amqj.logging.level}"/>
+    </category>
+
+    <!--category name="org.apache.qpid.server.txn">
+        <priority value="debug"/>
+    </category>-->
+
+    <root>
+        <priority value="all"/>
+        <appender-ref ref="STDOUT"/>
+        <!--appender-ref ref="ArchivingFileAppender"/-->
+    </root>
+</log4j:configuration>