DO NOT REPLY [Bug 41483] - PropertyFilter is not a filter, MapFilter not a filter

2007-08-10 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=41483





--- Additional Comments From [EMAIL PROTECTED]  2007-08-10 09:02 ---
Actually, log4j1.2 does have this issue - locationInfo.

If you have multiple appenders handling an event, where the 1st appender does
not specify locationinfo=true, but the 2nd does, the 1st appender will see an
event without location info, but subsequent appenders will have location info.


-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 41483] - PropertyFilter is not a filter, MapFilter not a filter

2007-08-10 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=41483


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |ASSIGNED




--- Additional Comments From [EMAIL PROTECTED]  2007-08-10 08:06 ---
I also would not be surprised if these "Filters" might not also carry over 
their modifications into unrelated 
appenders.  For example, if you attached a filter to an appender attached to a 
specific logger, then the 
modification might be seen by an unrelated appender attached to the root logger.

log4j 1.2 did not provide the methods that allowed mutation on LoggingEvents so 
these "filters" were not 
backported to the extras companion.  Maybe the functional equivalent delegating 
appenders could be 
added to "extras".

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 42921] - DBReceiverJob queries with wrong datatype.

2007-08-10 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=42921


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution||FIXED




-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r564779 - in /logging/log4j/branches/v1_2-branch: src/changes/ src/main/java/org/apache/log4j/ src/main/java/org/apache/log4j/helpers/ src/main/java/org/apache/log4j/xml/ tests/src/java/or

2007-08-10 Thread carnold 
Author: carnold
Date: Fri Aug 10 15:05:16 2007
New Revision: 564779

URL: http://svn.apache.org/viewvc?view=rev&rev=564779
Log:
Bug 34875: XML and HTMLLayout do not always escape special characters

Modified:
logging/log4j/branches/v1_2-branch/src/changes/changes.xml

logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/HTMLLayout.java

logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/helpers/Transform.java

logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/XMLLayout.java

logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/HTMLLayoutTest.java

logging/log4j/branches/v1_2-branch/tests/src/java/org/apache/log4j/xml/XMLLayoutTest.java

Modified: logging/log4j/branches/v1_2-branch/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/changes/changes.xml?view=diff&rev=564779&r1=564778&r2=564779
==
--- logging/log4j/branches/v1_2-branch/src/changes/changes.xml (original)
+++ logging/log4j/branches/v1_2-branch/src/changes/changes.xml Fri Aug 10 
15:05:16 2007
@@ -22,6 +22,7 @@
   
   
 
+   XML and HTMLLayout do not always 
escape special characters.
Optionally render MDC content in 
XMLLayout
Typo in log4j.dtd concerning 
threshold.
ERFATestCase fails on some 
JDK's.

Modified: 
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/HTMLLayout.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/HTMLLayout.java?view=diff&rev=564779&r1=564778&r2=564779
==
--- 
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/HTMLLayout.java
 (original)
+++ 
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/HTMLLayout.java
 Fri Aug 10 15:05:16 2007
@@ -135,27 +135,29 @@
 sbuf.append(event.timeStamp - LoggingEvent.getStartTime());
 sbuf.append("" + Layout.LINE_SEP);
 
-sbuf.append("");
-sbuf.append(Transform.escapeTags(event.getThreadName()));
+String escapedThread = Transform.escapeTags(event.getThreadName());
+sbuf.append("");
+sbuf.append(escapedThread);
 sbuf.append("" + Layout.LINE_SEP);
 
 sbuf.append("");
 if (event.getLevel().equals(Level.DEBUG)) {
   sbuf.append("");
-  sbuf.append(event.getLevel());
+  sbuf.append(Transform.escapeTags(String.valueOf(event.getLevel(;
   sbuf.append("");
 }
 else if(event.getLevel().isGreaterOrEqual(Level.WARN)) {
   sbuf.append("");
-  sbuf.append(event.getLevel());
+  sbuf.append(Transform.escapeTags(String.valueOf(event.getLevel(;
   sbuf.append("");
 } else {
-  sbuf.append(event.getLevel());
+  sbuf.append(Transform.escapeTags(String.valueOf(event.getLevel(;
 }
 sbuf.append("" + Layout.LINE_SEP);
 
-sbuf.append("");
-sbuf.append(Transform.escapeTags(event.getLoggerName()));
+String escapedLogger = Transform.escapeTags(event.getLoggerName());
+sbuf.append("");
+sbuf.append(escapedLogger);
 sbuf.append("" + Layout.LINE_SEP);
 
 if(locationInfo) {

Modified: 
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/helpers/Transform.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/helpers/Transform.java?view=diff&rev=564779&r1=564778&r2=564779
==
--- 
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/helpers/Transform.java
 (original)
+++ 
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/helpers/Transform.java
 Fri Aug 10 15:05:16 2007
@@ -33,18 +33,23 @@
 
   /**
* This method takes a string which may contain HTML tags (ie,
-   * , , etc) and replaces any '<' and '>'
+   * , 
, etc) and replaces any
+   * '<',  '>' , '&' or '"'
* characters with respective predefined entity references.
*
* @param input The text to be converted.
-   * @return The input string with the characters '<' and '>' replaced with
-   *  < and > respectively.  
+   * @return The input string with the special characters replaced.
* */
-  static public String escapeTags(String input) {
-//Check if the string is null or zero length -- if so, return
-//what was sent in.
+  static public String escapeTags(final String input) {
+//Check if the string is null, zero length or devoid of special characters
+// if so, return what was sent in.
 
-if( input == null || input.length() == 0 ) {
+if(input == null
+   || input.length() == 0
+   || (input.indexOf('"') == -1 &&
+   input.indexOf('&') == -1 &&
+   input.indexOf('<') == -1 &&
+   input.indexOf('>') == -1)) {
   return input;
 }
 
@@ -57,12 +62,18 




DO NOT REPLY [Bug 34875]  - XML and HTMLLayout do not always escape special characters




2007-08-10

Thread
bugzilla



DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=34875


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution||FIXED
Summary|XMLLayout produces invalid  |XML and HTMLLayout do not
   |XML when "special"  |always escape special
   |characters appear in log|characters
   |name, etc   |




--- Additional Comments From [EMAIL PROTECTED]  2007-08-10 15:09 ---
Problem also affects HTMLLayout.   Committed tests and fixes (similar but not 
identical to submissions) in 
rev 564779 (on log4j 1.2 branch).

CDATA end sequence did appear to be properly escaped when it appeared in 
message text.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]









DO NOT REPLY [Bug 34874]  - XMLLayout and HTMLLayout do not detect use of incompatible encoding




2007-08-10

Thread
bugzilla



DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=34874


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX




--- Additional Comments From [EMAIL PROTECTED]  2007-08-10 15:19 ---
Added a notice to the javadoc for XMLLayout and HTMLLayout to use UTF-8 or 
UTF-16 encoding or risk 
corrupted documents (for log4j 1.2).  Will not fix in log4j 1.3.  log4j 2.0 
will have a distinct support for 
byte (as opposed to character) layouts, so should not be a problem for it.  The 
proposed solution was an 
attempt to work-around the lack of a direct byte layout mechanism. 

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]









svn commit: r564786 - in /logging/log4j/branches/v1_2-branch/src: changes/changes.xml main/java/org/apache/log4j/HTMLLayout.java main/java/org/apache/log4j/xml/XMLLayout.java




2007-08-10

Thread
carnold



Author: carnold
Date: Fri Aug 10 15:20:44 2007
New Revision: 564786

URL: http://svn.apache.org/viewvc?view=rev&rev=564786
Log:
Bug 34874: Added notice to use UTF-8 or UTF-16 with HTML and XMLLayout's

Modified:
logging/log4j/branches/v1_2-branch/src/changes/changes.xml

logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/HTMLLayout.java

logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/XMLLayout.java

Modified: logging/log4j/branches/v1_2-branch/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/changes/changes.xml?view=diff&rev=564786&r1=564785&r2=564786
==
--- logging/log4j/branches/v1_2-branch/src/changes/changes.xml (original)
+++ logging/log4j/branches/v1_2-branch/src/changes/changes.xml Fri Aug 10 
15:20:44 2007
@@ -22,6 +22,7 @@
   
   
 
+   Notice to use UTF-8 or UTF-16 
encoding added to XML and HTMLLayout javadoc.
XML and HTMLLayout do not always 
escape special characters.
Optionally render MDC content in 
XMLLayout
Typo in log4j.dtd concerning 
threshold.

Modified: 
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/HTMLLayout.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/HTMLLayout.java?view=diff&rev=564786&r1=564785&r2=564786
==
--- 
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/HTMLLayout.java
 (original)
+++ 
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/HTMLLayout.java
 Fri Aug 10 15:20:44 2007
@@ -22,9 +22,14 @@
 import org.apache.log4j.helpers.Transform;
 
 /**
-   This layout outputs events in a HTML table.
-
-   @author Ceki Gülcü
+ * This layout outputs events in a HTML table.
+ *
+ * Appenders using this layout should have their encoding
+ * set to UTF-8 or UTF-16, otherwise events containing
+ * non ASCII characters could result in corrupted
+ * log files.
+ *
+ *  @author Ceki Gülcü
  */
 public class HTMLLayout extends Layout {
 

Modified: 
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/XMLLayout.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/XMLLayout.java?view=diff&rev=564786&r1=564785&r2=564786
==
--- 
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/XMLLayout.java
 (original)
+++ 
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/XMLLayout.java
 Fri Aug 10 15:20:44 2007
@@ -57,6 +57,11 @@
  * prior to log4j 1.2 (final release) and "1.2" for relase 1.2 and
  * later.
  *
+ * Appenders using this layout should have their encoding
+ * set to UTF-8 or UTF-16, otherwise events containing
+ * non ASCII characters could result in corrupted
+ * log files. 
+ *
  * @author Ceki  Gülcü
  * @since 0.9.0 
  * */



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]









DO NOT REPLY [Bug 30709]  - Manual uses deprecated DOMConfigurator




2007-08-10

Thread
bugzilla



DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=30709


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX




--- Additional Comments From [EMAIL PROTECTED]  2007-08-10 15:30 ---
DOMConfigurator was marked as deprecated in log4j 1.3 development effort in 
favor of JoranConfigurator.  
However as log4j 1.3 has been abandoned, the deprecation warning is no longer 
significant.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]









DO NOT REPLY [Bug 32752]  - MDC.put and MDC.get signatures changed between 1.2 and 1.3




2007-08-10

Thread
bugzilla



DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=32752


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX




--- Additional Comments From [EMAIL PROTECTED]  2007-08-10 15:33 ---
log4j 1.3 development has been abandoned. 

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]









DO NOT REPLY [Bug 35159]  - Support serial compatibility of LoggingEvent between 1.2.x and 1.3




2007-08-10

Thread
bugzilla



DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=35159


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX




--- Additional Comments From [EMAIL PROTECTED]  2007-08-10 15:35 ---
log4j 1.3 development has been abandoned.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]









DO NOT REPLY [Bug 42773]  - Zeroconf companion for log4j




2007-08-10

Thread
bugzilla



DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=42773


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2007-08-10 15:37 ---
zeroconf companion lives at 
https://svn.apache.org/repos/asf/logging/log4j/companions/zeroconf

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]









DO NOT REPLY [Bug 42783]  - Create an "extras" companion for log4j 1.2




2007-08-10

Thread
bugzilla



DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=42783


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2007-08-10 15:37 ---
https://svn.apache.org/repos/asf/logging/log4j/companions/extras

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]









svn commit: r564830 - in /logging/log4j/branches/v1_2-branch: pom.xml src/main/java/org/apache/log4j/spi/LoggingEvent.java




2007-08-10

Thread
carnold



Author: carnold
Date: Fri Aug 10 21:10:11 2007
New Revision: 564830

URL: http://svn.apache.org/viewvc?view=rev&rev=564830
Log:
Bug 42108: Add event.getLogger to allow cloning events

Modified:
logging/log4j/branches/v1_2-branch/pom.xml

logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/spi/LoggingEvent.java

Modified: logging/log4j/branches/v1_2-branch/pom.xml
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/pom.xml?view=diff&rev=564830&r1=564829&r2=564830
==
--- logging/log4j/branches/v1_2-branch/pom.xml (original)
+++ logging/log4j/branches/v1_2-branch/pom.xml Fri Aug 10 21:10:11 2007
@@ -21,7 +21,7 @@
   log4j
   jar
   Apache Log4j
-  1.2.16-SNAPSHOT
+  1.2.15-SNAPSHOT
   
 1.2.15
 

Modified: 
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/spi/LoggingEvent.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/spi/LoggingEvent.java?view=diff&rev=564830&r1=564829&r2=564830
==
--- 
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/spi/LoggingEvent.java
 (original)
+++ 
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/spi/LoggingEvent.java
 Fri Aug 10 21:10:11 2007
@@ -203,7 +203,7 @@
@param properties MDC properties
  */
 public LoggingEvent(final String fqnOfCategoryClass,
-final Logger logger,
+final Category logger,
 final long timeStamp,
 final Level level,
 final Object message,
@@ -237,6 +237,7 @@
   }
 }
 
+
   /**
  Set the location information for this logging event. The collected
  information is cached for future use.
@@ -262,6 +263,15 @@
   public String getLoggerName() {
 return categoryName;
   }
+
+/**
+ * Gets the logger of the event.
+ * Use should be restricted to cloning events.
+ * @since 1.2.15
+ */
+public Category getLogger() {
+  return logger;
+}
 
   /**
  Return the message for this logging event.



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]









svn commit: r564831 - in /logging/log4j/companions/receivers/trunk: ./ src/main/java/org/apache/log4j/rewrite/ src/test/java/org/apache/log4j/rewrite/ src/test/java/org/apache/log4j/util/ src/test/res




2007-08-10

Thread
carnold



Author: carnold
Date: Fri Aug 10 21:11:27 2007
New Revision: 564831

URL: http://svn.apache.org/viewvc?view=rev&rev=564831
Log:
Bug 41483: Add RewriteAppender and policies to replace MapFilter, etc

Added:

logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/

logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java

logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java

logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/ReflectionRewritePolicy.java

logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/RewriteAppender.java

logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/RewritePolicy.java

logging/log4j/companions/receivers/trunk/src/test/java/org/apache/log4j/rewrite/

logging/log4j/companions/receivers/trunk/src/test/java/org/apache/log4j/rewrite/RewriteAppenderTest.java

logging/log4j/companions/receivers/trunk/src/test/java/org/apache/log4j/util/

logging/log4j/companions/receivers/trunk/src/test/java/org/apache/log4j/util/Compare.java
  - copied unchanged from r563225, 
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/Compare.java

logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/rewrite/

logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/rewrite/map.log

logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/rewrite/map.xml

logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/rewrite/property.log

logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/rewrite/property.xml

logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/rewrite/reflection.log

logging/log4j/companions/receivers/trunk/src/test/resources/org/apache/log4j/rewrite/reflection.xml
Modified:
logging/log4j/companions/receivers/trunk/pom.xml

Modified: logging/log4j/companions/receivers/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/pom.xml?view=diff&rev=564831&r1=564830&r2=564831
==
--- logging/log4j/companions/receivers/trunk/pom.xml (original)
+++ logging/log4j/companions/receivers/trunk/pom.xml Fri Aug 10 21:11:27 2007
@@ -216,7 +216,7 @@
 
   log4j
   log4j
-  1.2.15
+  1.2.15-SNAPSHOT
 
 
   log4j

Added: 
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java?view=auto&rev=564831
==
--- 
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
 (added)
+++ 
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
 Fri Aug 10 21:11:27 2007
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+package org.apache.log4j.rewrite;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.apache.log4j.rewrite.RewritePolicy;
+import org.apache.log4j.spi.LoggingEvent;
+
+/**
+ * This policy rewrites events where the message of the
+ * original event implementes java.util.Map.
+ * All other events are passed through unmodified.
+ * If the map contains a "message" entry, the value will be
+ * used as the message for the rewritten event.  The rewritten
+ * event will have a property set that is the combination of the
+ * original property set and the other members of the message map.
+ * If both the original property set and the message map
+ * contain the same entry, the value from the message map
+ * will overwrite the original property set.
+ *
+ * The combination of the RewriteAppender and this policy
+ * performs the same actions as the MapFilter from log4j 1.3. 
+ */
+public class Ma






DO NOT REPLY [Bug 41483]  - PropertyFilter is not a filter, MapFilter not a filter




2007-08-10

Thread
bugzilla



DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=41483





--- Additional Comments From [EMAIL PROTECTED]  2007-08-10 21:15 ---
Added RewriteAppender and corresponding policies to the receivers companion to 
replace the MapFilter et 
al functionality in rev 564831.  Requires LoggingEvent.getLogger() which was 
added to log4j 1.2 in rev 
564830.  Could not be in extras since it depends on LoggingEvent methods that 
are not in pre 1.2.15 
versions.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]









DO NOT REPLY [Bug 41483]  - PropertyFilter is not a filter, MapFilter not a filter




2007-08-10

Thread
bugzilla



DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=41483





--- Additional Comments From [EMAIL PROTECTED]  2007-08-10 22:03 ---
Great stuff! thanks Curt

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]