You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2005/12/30 22:52:39 UTC
svn commit: r360171 - in /logging/log4j/trunk: src/java/org/apache/log4j/db/
src/java/org/apache/log4j/filter/ src/java/org/apache/log4j/lbel/comparator/
src/java/org/apache/log4j/pattern/ src/java/org/apache/log4j/spi/
src/java/org/apache/log4j/spi/lo...
Author: carnold
Date: Fri Dec 30 13:52:22 2005
New Revision: 360171
URL: http://svn.apache.org/viewcvs?rev=360171&view=rev
Log:
Bug 35452: Move LocationInfo back to o.a.l.spi
Added:
logging/log4j/trunk/src/java/org/apache/log4j/spi/LocationInfo.java
- copied, changed from r360148, logging/log4j/trunk/src/java/org/apache/log4j/spi/location/LocationInfo.java
Removed:
logging/log4j/trunk/src/java/org/apache/log4j/spi/location/LocationInfo.java
Modified:
logging/log4j/trunk/src/java/org/apache/log4j/db/CustomSQLDBReceiver.java
logging/log4j/trunk/src/java/org/apache/log4j/db/DBAppender.java
logging/log4j/trunk/src/java/org/apache/log4j/db/DBReceiverJob.java
logging/log4j/trunk/src/java/org/apache/log4j/filter/LocationInfoFilter.java
logging/log4j/trunk/src/java/org/apache/log4j/lbel/comparator/ClassComparator.java
logging/log4j/trunk/src/java/org/apache/log4j/lbel/comparator/MethodComparator.java
logging/log4j/trunk/src/java/org/apache/log4j/pattern/ClassNamePatternConverter.java
logging/log4j/trunk/src/java/org/apache/log4j/pattern/FileLocationPatternConverter.java
logging/log4j/trunk/src/java/org/apache/log4j/pattern/FullLocationPatternConverter.java
logging/log4j/trunk/src/java/org/apache/log4j/pattern/LineLocationPatternConverter.java
logging/log4j/trunk/src/java/org/apache/log4j/pattern/MethodLocationPatternConverter.java
logging/log4j/trunk/src/java/org/apache/log4j/spi/LoggingEvent.java
logging/log4j/trunk/src/java/org/apache/log4j/spi/LoggingEventFieldResolver.java
logging/log4j/trunk/src/java/org/apache/log4j/spi/location/LegacyExtractor.java
logging/log4j/trunk/src/java/org/apache/log4j/spi/location/StackTraceElementExtractor.java
logging/log4j/trunk/src/java/org/apache/log4j/varia/LogFilePatternReceiver.java
logging/log4j/trunk/src/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
logging/log4j/trunk/src/java/org/apache/log4j/xml/XMLDecoder.java
logging/log4j/trunk/src/java/org/apache/log4j/xml/XMLLayout.java
logging/log4j/trunk/tests/src/java/org/apache/log4j/lbel/EventEvaluationTest.java
logging/log4j/trunk/tests/src/java/org/apache/log4j/spi/LoggingEventTest.java
logging/log4j/trunk/tests/src/java/org/apache/log4j/spi/location/LocationInfoTest.java
logging/log4j/trunk/tests/witness/serialization/exception.bin
logging/log4j/trunk/tests/witness/serialization/location.bin
logging/log4j/trunk/tests/witness/serialization/mdc.bin
logging/log4j/trunk/tests/witness/serialization/ndc.bin
logging/log4j/trunk/tests/witness/serialization/simple.bin
Modified: logging/log4j/trunk/src/java/org/apache/log4j/db/CustomSQLDBReceiver.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/db/CustomSQLDBReceiver.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/db/CustomSQLDBReceiver.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/db/CustomSQLDBReceiver.java Fri Dec 30 13:52:22 2005
@@ -31,7 +31,7 @@
import org.apache.log4j.scheduler.Scheduler;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.ThrowableInformation;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
/**
* Converts log data stored in a database into LoggingEvents.
Modified: logging/log4j/trunk/src/java/org/apache/log4j/db/DBAppender.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/db/DBAppender.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/db/DBAppender.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/db/DBAppender.java Fri Dec 30 13:52:22 2005
@@ -20,7 +20,7 @@
import org.apache.log4j.db.dialect.SQLDialect;
import org.apache.log4j.db.dialect.Util;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
import java.sql.Connection;
import java.sql.PreparedStatement;
Modified: logging/log4j/trunk/src/java/org/apache/log4j/db/DBReceiverJob.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/db/DBReceiverJob.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/db/DBReceiverJob.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/db/DBReceiverJob.java Fri Dec 30 13:52:22 2005
@@ -24,7 +24,7 @@
import org.apache.log4j.spi.LoggerRepository;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.ThrowableInformation;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
import java.sql.Connection;
import java.sql.ResultSet;
Modified: logging/log4j/trunk/src/java/org/apache/log4j/filter/LocationInfoFilter.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/filter/LocationInfoFilter.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/filter/LocationInfoFilter.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/filter/LocationInfoFilter.java Fri Dec 30 13:52:22 2005
@@ -20,7 +20,7 @@
import org.apache.log4j.rule.Rule;
import org.apache.log4j.spi.Filter;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
/**
Modified: logging/log4j/trunk/src/java/org/apache/log4j/lbel/comparator/ClassComparator.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/lbel/comparator/ClassComparator.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/lbel/comparator/ClassComparator.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/lbel/comparator/ClassComparator.java Fri Dec 30 13:52:22 2005
@@ -19,7 +19,7 @@
import org.apache.log4j.lbel.Operator;
import org.apache.log4j.lbel.ScanError;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
/**
Modified: logging/log4j/trunk/src/java/org/apache/log4j/lbel/comparator/MethodComparator.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/lbel/comparator/MethodComparator.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/lbel/comparator/MethodComparator.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/lbel/comparator/MethodComparator.java Fri Dec 30 13:52:22 2005
@@ -19,7 +19,7 @@
import org.apache.log4j.lbel.Operator;
import org.apache.log4j.lbel.ScanError;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
/**
Modified: logging/log4j/trunk/src/java/org/apache/log4j/pattern/ClassNamePatternConverter.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/pattern/ClassNamePatternConverter.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/pattern/ClassNamePatternConverter.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/pattern/ClassNamePatternConverter.java Fri Dec 30 13:52:22 2005
@@ -18,7 +18,7 @@
import org.apache.log4j.ULogger;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
/**
Modified: logging/log4j/trunk/src/java/org/apache/log4j/pattern/FileLocationPatternConverter.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/pattern/FileLocationPatternConverter.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/pattern/FileLocationPatternConverter.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/pattern/FileLocationPatternConverter.java Fri Dec 30 13:52:22 2005
@@ -18,7 +18,7 @@
import org.apache.log4j.ULogger;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
/**
Modified: logging/log4j/trunk/src/java/org/apache/log4j/pattern/FullLocationPatternConverter.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/pattern/FullLocationPatternConverter.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/pattern/FullLocationPatternConverter.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/pattern/FullLocationPatternConverter.java Fri Dec 30 13:52:22 2005
@@ -18,7 +18,7 @@
import org.apache.log4j.ULogger;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
/**
Modified: logging/log4j/trunk/src/java/org/apache/log4j/pattern/LineLocationPatternConverter.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/pattern/LineLocationPatternConverter.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/pattern/LineLocationPatternConverter.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/pattern/LineLocationPatternConverter.java Fri Dec 30 13:52:22 2005
@@ -18,7 +18,7 @@
import org.apache.log4j.ULogger;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
/**
Modified: logging/log4j/trunk/src/java/org/apache/log4j/pattern/MethodLocationPatternConverter.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/pattern/MethodLocationPatternConverter.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/pattern/MethodLocationPatternConverter.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/pattern/MethodLocationPatternConverter.java Fri Dec 30 13:52:22 2005
@@ -18,7 +18,7 @@
import org.apache.log4j.ULogger;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
/**
Copied: logging/log4j/trunk/src/java/org/apache/log4j/spi/LocationInfo.java (from r360148, logging/log4j/trunk/src/java/org/apache/log4j/spi/location/LocationInfo.java)
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/spi/LocationInfo.java?p2=logging/log4j/trunk/src/java/org/apache/log4j/spi/LocationInfo.java&p1=logging/log4j/trunk/src/java/org/apache/log4j/spi/location/LocationInfo.java&r1=360148&r2=360171&rev=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/spi/location/LocationInfo.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/spi/LocationInfo.java Fri Dec 30 13:52:22 2005
@@ -16,9 +16,10 @@
// Contributors: Mathias Rupprecht <mm...@fja.com>
-package org.apache.log4j.spi.location;
-
+package org.apache.log4j.spi;
import org.apache.log4j.helpers.PlatformInfo;
+import org.apache.log4j.spi.location.LegacyExtractor;
+import org.apache.log4j.spi.location.StackTraceElementExtractor;
/**
@@ -48,28 +49,28 @@
/**
Caller's line number.
*/
- String lineNumber;
+ public String lineNumber;
/**
Caller's file name.
*/
- String fileName;
+ public String fileName;
/**
Caller's fully qualified class name.
*/
- String className;
+ public String className;
/**
Caller's method name.
*/
- String methodName;
+ public String methodName;
/**
All available caller information, in the format
<code>fully.qualified.classname.of.caller.methodName(Filename.java:line)</code>
*/
- transient String fullInfo;
+ public transient String fullInfo;
public LocationInfo(
String fileName, String className, String methodName, String lineNumber) {
Modified: logging/log4j/trunk/src/java/org/apache/log4j/spi/LoggingEvent.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/spi/LoggingEvent.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/spi/LoggingEvent.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/spi/LoggingEvent.java Fri Dec 30 13:52:22 2005
@@ -31,7 +31,7 @@
import org.apache.log4j.MDC;
import org.apache.log4j.NDC;
import org.apache.log4j.helpers.Loader;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
// Contributors: Nelson Minar <ne...@monkey.org>
@@ -56,7 +56,7 @@
* <p>Moreover, in the absence of certain fields, receivers must set the
* values of null fields to a default non-null value. For example, in the
* absence of the locationInfo data, the locationInfo field should be
- * set to {@link org.apache.log4j.spi.location.LocationInfo#NA_LOCATION_INFO
+ * set to {@link org.apache.log4j.spi.LocationInfo#NA_LOCATION_INFO
* LocationInfo.NA_LOCATION_INFO}.
*
*
Modified: logging/log4j/trunk/src/java/org/apache/log4j/spi/LoggingEventFieldResolver.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/spi/LoggingEventFieldResolver.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/spi/LoggingEventFieldResolver.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/spi/LoggingEventFieldResolver.java Fri Dec 30 13:52:22 2005
@@ -20,7 +20,7 @@
import java.util.List;
import java.util.StringTokenizer;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
Modified: logging/log4j/trunk/src/java/org/apache/log4j/spi/location/LegacyExtractor.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/spi/location/LegacyExtractor.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/spi/location/LegacyExtractor.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/spi/location/LegacyExtractor.java Fri Dec 30 13:52:22 2005
@@ -22,6 +22,7 @@
import java.io.PrintWriter;
import java.io.StringWriter;
+import org.apache.log4j.spi.LocationInfo;
/**
@@ -40,7 +41,7 @@
private LegacyExtractor() {
}
- static void extract(LocationInfo li, Throwable t, String fqnOfInvokingClass) {
+ static public void extract(LocationInfo li, Throwable t, String fqnOfInvokingClass) {
// on AS400, package path separator in stack trace is not dot '.',
// but slash '/'
if (PlatformInfo.isOnAS400()) {
Modified: logging/log4j/trunk/src/java/org/apache/log4j/spi/location/StackTraceElementExtractor.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/spi/location/StackTraceElementExtractor.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/spi/location/StackTraceElementExtractor.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/spi/location/StackTraceElementExtractor.java Fri Dec 30 13:52:22 2005
@@ -15,6 +15,7 @@
*/
package org.apache.log4j.spi.location;
+import org.apache.log4j.spi.LocationInfo;
import java.lang.reflect.Method;
@@ -57,7 +58,7 @@
}
}
- static void extract(LocationInfo li, Throwable t, String fqnOfInvokingClass) {
+ static public void extract(LocationInfo li, Throwable t, String fqnOfInvokingClass) {
if (t == null) {
return;
}
Modified: logging/log4j/trunk/src/java/org/apache/log4j/varia/LogFilePatternReceiver.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/varia/LogFilePatternReceiver.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/varia/LogFilePatternReceiver.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/varia/LogFilePatternReceiver.java Fri Dec 30 13:52:22 2005
@@ -42,7 +42,7 @@
import org.apache.log4j.rule.Rule;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.ThrowableInformation;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
import org.apache.oro.text.perl.Perl5Util;
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.MatchResult;
Modified: logging/log4j/trunk/src/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/xml/UtilLoggingXMLDecoder.java Fri Dec 30 13:52:22 2005
@@ -40,7 +40,7 @@
import org.apache.log4j.spi.Decoder;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.ThrowableInformation;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: logging/log4j/trunk/src/java/org/apache/log4j/xml/XMLDecoder.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/xml/XMLDecoder.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/xml/XMLDecoder.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/xml/XMLDecoder.java Fri Dec 30 13:52:22 2005
@@ -38,7 +38,7 @@
import org.apache.log4j.spi.Decoder;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.ThrowableInformation;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: logging/log4j/trunk/src/java/org/apache/log4j/xml/XMLLayout.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/src/java/org/apache/log4j/xml/XMLLayout.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/xml/XMLLayout.java (original)
+++ logging/log4j/trunk/src/java/org/apache/log4j/xml/XMLLayout.java Fri Dec 30 13:52:22 2005
@@ -19,7 +19,7 @@
import org.apache.log4j.Layout;
import org.apache.log4j.helpers.Transform;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
import java.io.IOException;
import java.io.Writer;
Modified: logging/log4j/trunk/tests/src/java/org/apache/log4j/lbel/EventEvaluationTest.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/tests/src/java/org/apache/log4j/lbel/EventEvaluationTest.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/tests/src/java/org/apache/log4j/lbel/EventEvaluationTest.java (original)
+++ logging/log4j/trunk/tests/src/java/org/apache/log4j/lbel/EventEvaluationTest.java Fri Dec 30 13:52:22 2005
@@ -23,7 +23,7 @@
import org.apache.log4j.Level;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
Modified: logging/log4j/trunk/tests/src/java/org/apache/log4j/spi/LoggingEventTest.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/tests/src/java/org/apache/log4j/spi/LoggingEventTest.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/tests/src/java/org/apache/log4j/spi/LoggingEventTest.java (original)
+++ logging/log4j/trunk/tests/src/java/org/apache/log4j/spi/LoggingEventTest.java Fri Dec 30 13:52:22 2005
@@ -21,7 +21,7 @@
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.apache.log4j.NDC;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
import org.apache.log4j.util.SerializationTestHelper;
@@ -53,7 +53,7 @@
root.getClass().getName(), root, Level.INFO, "Hello, world.", null);
event.prepareForDeferredProcessing();
- int[] skip = new int[] { 354, 355, 356, 357, 358, 359, 360, 361, 362 };
+ int[] skip = new int[] { 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362 };
SerializationTestHelper.assertSerializationEquals(
"witness/serialization/simple.bin", event, skip, Integer.MAX_VALUE);
}
@@ -72,7 +72,7 @@
root.getClass().getName(), root, Level.INFO, "Hello, world.", ex);
event.prepareForDeferredProcessing();
- int[] skip = new int[] { 354, 355, 356, 357, 358, 359, 360, 361, 362, 600, 734, 735, 1511 };
+ int[] skip = new int[] { 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 600, 734, 735, 1511 };
SerializationTestHelper.assertSerializationEquals(
"witness/serialization/exception.bin", event, skip, 1089);
}
@@ -91,7 +91,7 @@
LocationInfo info = event.getLocationInformation();
event.prepareForDeferredProcessing();
- int[] skip = new int[] { 354, 355, 356, 357, 358, 359, 360, 361, 362 };
+ int[] skip = new int[] { 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362 };
SerializationTestHelper.assertSerializationEquals(
"witness/serialization/location.bin", event, skip, Integer.MAX_VALUE);
}
@@ -110,7 +110,7 @@
root.getClass().getName(), root, Level.INFO, "Hello, world.", null);
event.prepareForDeferredProcessing();
- int[] skip = new int[] { 354, 355, 356, 357, 358, 359, 360, 361, 362 };
+ int[] skip = new int[] { 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353,354, 355, 356, 357, 358, 359, 360, 361, 362 };
SerializationTestHelper.assertSerializationEquals(
"witness/serialization/ndc.bin", event, skip, Integer.MAX_VALUE);
}
@@ -129,7 +129,7 @@
root.getClass().getName(), root, Level.INFO, "Hello, world.", null);
event.prepareForDeferredProcessing();
- int[] skip = new int[] { 354, 355, 356, 357, 358, 359, 360, 361, 362 };
+ int[] skip = new int[] { 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353,354, 355, 356, 357, 358, 359, 360, 361, 362 };
SerializationTestHelper.assertSerializationEquals(
"witness/serialization/mdc.bin", event, skip, Integer.MAX_VALUE);
}
Modified: logging/log4j/trunk/tests/src/java/org/apache/log4j/spi/location/LocationInfoTest.java
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/tests/src/java/org/apache/log4j/spi/location/LocationInfoTest.java?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
--- logging/log4j/trunk/tests/src/java/org/apache/log4j/spi/location/LocationInfoTest.java (original)
+++ logging/log4j/trunk/tests/src/java/org/apache/log4j/spi/location/LocationInfoTest.java Fri Dec 30 13:52:22 2005
@@ -21,7 +21,7 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.location.LocationInfo;
+import org.apache.log4j.spi.LocationInfo;
import junit.framework.TestCase;
Modified: logging/log4j/trunk/tests/witness/serialization/exception.bin
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/tests/witness/serialization/exception.bin?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
Binary files - no diff available.
Modified: logging/log4j/trunk/tests/witness/serialization/location.bin
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/tests/witness/serialization/location.bin?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
Binary files - no diff available.
Modified: logging/log4j/trunk/tests/witness/serialization/mdc.bin
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/tests/witness/serialization/mdc.bin?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
Binary files - no diff available.
Modified: logging/log4j/trunk/tests/witness/serialization/ndc.bin
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/tests/witness/serialization/ndc.bin?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
Binary files - no diff available.
Modified: logging/log4j/trunk/tests/witness/serialization/simple.bin
URL: http://svn.apache.org/viewcvs/logging/log4j/trunk/tests/witness/serialization/simple.bin?rev=360171&r1=360170&r2=360171&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org