logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sde...@apache.org
Subject svn commit: r1361489 - in /logging/log4j/companions/extras/trunk: ./ src/test/resources/org/apache/log4j/receivers/rewrite/
Date Sat, 14 Jul 2012 07:51:10 GMT
Author: sdeboy
Date: Sat Jul 14 07:51:09 2012
New Revision: 1361489

URL: http://svn.apache.org/viewvc?rev=1361489&view=rev
Log:
Fix FormattingInfoTest (https://issues.apache.org/bugzilla/show_bug.cgi?id=53548)
 - Updated test log files to include receivers package in class name
 - Updated RewriteAppender appender definitions to correct package (log4j.receivers.rewrite)
 - Updated test-compile target in extras build.xml to put companion.jar before log4j.jar (both
contain FormattingInfo but they are different)

Modified:
    logging/log4j/companions/extras/trunk/build.xml
    logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/map.log
    logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/map.xml
    logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/property.log
    logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/property.xml
    logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/reflection.log
    logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/reflection.xml

Modified: logging/log4j/companions/extras/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/build.xml?rev=1361489&r1=1361488&r2=1361489&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/build.xml (original)
+++ logging/log4j/companions/extras/trunk/build.xml Sat Jul 14 07:51:09 2012
@@ -102,7 +102,7 @@ Specify -Dcompanion.jar=foo.jar to test 
     	   debug="${javac.debug}"
     	   target="${javac.target}"
     	   source="${javac.source}"
-    	   classpath="${log4j.jar}:${junit.jar}:${companion.jar}"/>
+    	   classpath="${companion.jar}:${log4j.jar}:${junit.jar}"/>
     	<copy todir="target/test-classes">
     		<fileset dir="src/test/resources"/>
     	</copy>

Modified: logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/map.log
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/map.log?rev=1361489&r1=1361488&r2=1361489&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/map.log
(original)
+++ logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/map.log
Sat Jul 14 07:51:09 2012
@@ -1,3 +1,3 @@
-INFO org.apache.log4j.rewrite.RewriteAppenderTest - p1: p2: Message 0
-INFO org.apache.log4j.rewrite.RewriteAppenderTest - p1:Hello p2:World {p1=Hello, p2=World,
x1=Mundo}
-INFO org.apache.log4j.rewrite.RewriteAppenderTest - p1:Hello p2:World Message 1
+INFO org.apache.log4j.receivers.rewrite.RewriteAppenderTest - p1: p2: Message 0
+INFO org.apache.log4j.receivers.rewrite.RewriteAppenderTest - p1:Hello p2:World {p1=Hello,
p2=World, x1=Mundo}
+INFO org.apache.log4j.receivers.rewrite.RewriteAppenderTest - p1:Hello p2:World Message 1

Modified: logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/map.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/map.xml?rev=1361489&r1=1361488&r2=1361489&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/map.xml
(original)
+++ logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/map.xml
Sat Jul 14 07:51:09 2012
@@ -25,9 +25,9 @@
     </appender>
 
 
-  <appender name="A1" class="org.apache.log4j.rewrite.RewriteAppender">
+  <appender name="A1" class="org.apache.log4j.receivers.rewrite.RewriteAppender">
       <appender-ref ref="F1"/>
-      <rewritePolicy class="org.apache.log4j.rewrite.MapRewritePolicy"/>
+      <rewritePolicy class="org.apache.log4j.receivers.rewrite.MapRewritePolicy"/>
   </appender>
 
   <root>

Modified: logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/property.log
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/property.log?rev=1361489&r1=1361488&r2=1361489&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/property.log
(original)
+++ logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/property.log
Sat Jul 14 07:51:09 2012
@@ -1,2 +1,2 @@
-INFO org.apache.log4j.rewrite.RewriteAppenderTest - p1:Hello p2:World Message 0
-INFO org.apache.log4j.rewrite.RewriteAppenderTest - p1:Hola p2:World Message 1
+INFO org.apache.log4j.receivers.rewrite.RewriteAppenderTest - p1:Hello p2:World Message 0
+INFO org.apache.log4j.receivers.rewrite.RewriteAppenderTest - p1:Hola p2:World Message 1

Modified: logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/property.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/property.xml?rev=1361489&r1=1361488&r2=1361489&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/property.xml
(original)
+++ logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/property.xml
Sat Jul 14 07:51:09 2012
@@ -25,9 +25,9 @@
     </appender>
 
 
-  <appender name="A1" class="org.apache.log4j.rewrite.RewriteAppender">
+  <appender name="A1" class="org.apache.log4j.receivers.rewrite.RewriteAppender">
       <appender-ref ref="F1"/>
-      <rewritePolicy class="org.apache.log4j.rewrite.PropertyRewritePolicy">
+      <rewritePolicy class="org.apache.log4j.receivers.rewrite.PropertyRewritePolicy">
           <param name="properties" value="p1=Hello,p2=World,x1=3.1415"/>
       </rewritePolicy>
   </appender>

Modified: logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/reflection.log
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/reflection.log?rev=1361489&r1=1361488&r2=1361489&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/reflection.log
(original)
+++ logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/reflection.log
Sat Jul 14 07:51:09 2012
@@ -1,3 +1,3 @@
-INFO org.apache.log4j.rewrite.RewriteAppenderTest - p1: p2: Message 0
-INFO org.apache.log4j.rewrite.RewriteAppenderTest - p1: p2:Hello I am bean.
-INFO org.apache.log4j.rewrite.RewriteAppenderTest - p1:Hola p2:Hello Welcome to The Hub
+INFO org.apache.log4j.receivers.rewrite.RewriteAppenderTest - p1: p2: Message 0
+INFO org.apache.log4j.receivers.rewrite.RewriteAppenderTest - p1: p2:Hello I am bean.
+INFO org.apache.log4j.receivers.rewrite.RewriteAppenderTest - p1:Hola p2:Hello Welcome to
The Hub

Modified: logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/reflection.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/reflection.xml?rev=1361489&r1=1361488&r2=1361489&view=diff
==============================================================================
--- logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/reflection.xml
(original)
+++ logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/receivers/rewrite/reflection.xml
Sat Jul 14 07:51:09 2012
@@ -25,9 +25,9 @@
     </appender>
 
 
-  <appender name="A1" class="org.apache.log4j.rewrite.RewriteAppender">
+  <appender name="A1" class="org.apache.log4j.receivers.rewrite.RewriteAppender">
       <appender-ref ref="F1"/>
-      <rewritePolicy class="org.apache.log4j.rewrite.ReflectionRewritePolicy"/>
+      <rewritePolicy class="org.apache.log4j.receivers.rewrite.ReflectionRewritePolicy"/>
   </appender>
 
   <root>



Mime
View raw message