Author: ggregory
Date: Fri May 9 15:44:50 2014
New Revision: 1593566
URL: http://svn.apache.org/r1593566
Log:
Rename org.apache.logging.log4j.core.LogEvent.getMillis to getTimeMillis
because “millis” is just a scale, but of what? Of the time stamp on the given
event is what. The name makes sense compared to System.currentTimeMillis and
org.apache.logging.log4j.core.helpers.Clock.currentTimeMillis() for example.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCDatabaseManager.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/TestRewritePolicy.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSQLDatabaseManager.java
logging/log4j/log4j2/trunk/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSQLDatabaseManagerTest.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
Fri May 9 15:44:50 2014
@@ -85,7 +85,7 @@ public interface LogEvent extends Serial
* @return milliseconds since midnight, January 1, 1970 UTC.
* @see java.lang.System#currentTimeMillis()
*/
- long getMillis();
+ long getTimeMillis();
/**
* Gets the source of logging request.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCDatabaseManager.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCDatabaseManager.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCDatabaseManager.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCDatabaseManager.java
Fri May 9 15:44:50 2014
@@ -90,7 +90,7 @@ public final class JDBCDatabaseManager e
int i = 1;
for (final Column column : this.columns) {
if (column.isEventTimestamp) {
- this.statement.setTimestamp(i++, new
Timestamp(event.getMillis()));
+ this.statement.setTimestamp(i++, new
Timestamp(event.getTimeMillis()));
} else {
if (column.isClob) {
reader = new
StringReader(column.layout.toSerializable(event));
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractLogEventWrapperEntity.java
Fri May 9 15:44:50 2014
@@ -171,7 +171,7 @@ public abstract class AbstractLogEventWr
* @param millis Ignored.
*/
@SuppressWarnings("unused")
- public void setMillis(final long millis) {
+ public void setTimeMillis(final long millis) {
// this entity is write-only
}
@@ -287,7 +287,7 @@ public abstract class AbstractLogEventWr
}
@Override
- public long getMillis() {
+ public long getTimeMillis() {
return 0;
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/BasicLogEventEntity.java
Fri May 9 15:44:50 2014
@@ -162,8 +162,8 @@ public abstract class BasicLogEventEntit
*/
@Override
@Basic
- public long getMillis() {
- return this.getWrappedEvent().getMillis();
+ public long getTimeMillis() {
+ return this.getWrappedEvent().getTimeMillis();
}
/**
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
Fri May 9 15:44:50 2014
@@ -82,11 +82,11 @@ public final class MapRewritePolicy impl
Log4jLogEvent event = (Log4jLogEvent) source;
return Log4jLogEvent.createEvent(event.getLoggerName(),
event.getMarker(), event.getFQCN(),
event.getLevel(), message, event.getThrownProxy(),
event.getContextMap(), event.getContextStack(),
- event.getThreadName(), event.getSource(), event.getMillis());
+ event.getThreadName(), event.getSource(),
event.getTimeMillis());
}
return new Log4jLogEvent(source.getLoggerName(), source.getMarker(),
source.getFQCN(), source.getLevel(),
message, source.getThrown(), source.getContextMap(),
source.getContextStack(), source.getThreadName(),
- source.getSource(), source.getMillis());
+ source.getSource(), source.getTimeMillis());
}
/**
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
Fri May 9 15:44:50 2014
@@ -72,7 +72,7 @@ public final class PropertiesRewritePoli
return new Log4jLogEvent(source.getLoggerName(), source.getMarker(),
source.getFQCN(), source.getLevel(),
source.getMessage(), source.getThrown(), props,
source.getContextStack(), source.getThreadName(),
- source.getSource(), source.getMillis());
+ source.getSource(), source.getTimeMillis());
}
@Override
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
Fri May 9 15:44:50 2014
@@ -63,7 +63,7 @@ public final class TimeBasedTriggeringPo
if (manager.getFileSize() == 0) {
return false;
}
- final long now = event.getMillis();
+ final long now = event.getTimeMillis();
if (now > nextRollover) {
nextRollover = manager.getPatternProcessor().getNextTime(now,
interval, modulate);
return true;
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
Fri May 9 15:44:50 2014
@@ -183,7 +183,7 @@ public class RingBufferLogEvent implemen
}
@Override
- public long getMillis() {
+ public long getTimeMillis() {
Message msg = getMessage();
if (msg instanceof TimestampMessage) { // LOG4J2-455
return ((TimestampMessage) msg).getTimestamp();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/TimeFilter.java
Fri May 9 15:44:50 2014
@@ -71,7 +71,7 @@ public final class TimeFilter extends Ab
@Override
public Result filter(final LogEvent event) {
final Calendar calendar = Calendar.getInstance(timezone);
- calendar.setTimeInMillis(event.getMillis());
+ calendar.setTimeInMillis(event.getTimeMillis());
//
// get apparent number of milliseconds since midnight
// (ignores extra or missing hour on daylight time changes).
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java
Fri May 9 15:44:50 2014
@@ -235,7 +235,7 @@ public class Log4jLogEvent implements Lo
* @return The time the event occurred.
*/
@Override
- public long getMillis() {
+ public long getTimeMillis() {
return timestamp;
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HTMLLayout.java
Fri May 9 15:44:50 2014
@@ -122,7 +122,7 @@ public final class HTMLLayout extends Ab
sbuf.append(Constants.LINE_SEP).append("<tr>").append(Constants.LINE_SEP);
sbuf.append("<td>");
- sbuf.append(event.getMillis() - jvmStartTime);
+ sbuf.append(event.getTimeMillis() - jvmStartTime);
sbuf.append("</td>").append(Constants.LINE_SEP);
final String escapedThread =
Transform.escapeHtmlTags(event.getThreadName());
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java
Fri May 9 15:44:50 2014
@@ -160,7 +160,7 @@ public class JSONLayout extends Abstract
buf.append(this.eol);
buf.append(this.indent2);
buf.append("\"timestamp\":\"");
- buf.append(event.getMillis());
+ buf.append(event.getTimeMillis());
buf.append("\",");
buf.append(this.eol);
buf.append(this.indent2);
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
Fri May 9 15:44:50 2014
@@ -261,7 +261,7 @@ public class RFC5424Layout extends Abstr
public String toSerializable(final LogEvent event) {
final StringBuilder buf = new StringBuilder();
appendPriority(buf, event.getLevel());
- appendTimestamp(buf, event.getMillis());
+ appendTimestamp(buf, event.getTimeMillis());
appendSpace(buf);
appendHostName(buf);
appendSpace(buf);
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
Fri May 9 15:44:50 2014
@@ -81,7 +81,7 @@ public class SyslogLayout extends Abstra
buf.append('<');
buf.append(Priority.getPriority(facility, event.getLevel()));
buf.append('>');
- addDate(event.getMillis(), buf);
+ addDate(event.getTimeMillis(), buf);
buf.append(' ');
buf.append(localHostname);
buf.append(' ');
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
Fri May 9 15:44:50 2014
@@ -137,7 +137,7 @@ public class XMLLayout extends AbstractS
}
buf.append(Transform.escapeHtmlTags(name));
buf.append("\" timestamp=\"");
- buf.append(event.getMillis());
+ buf.append(event.getTimeMillis());
buf.append("\" level=\"");
buf.append(Transform.escapeHtmlTags(String.valueOf(event.getLevel())));
buf.append("\" thread=\"");
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java
Fri May 9 15:44:50 2014
@@ -50,7 +50,7 @@ public class DateLookup implements StrLo
*/
@Override
public String lookup(final LogEvent event, final String key) {
- return formatDate(event.getMillis(), key);
+ return formatDate(event.getTimeMillis(), key);
}
private String formatDate(final long date, final String format) {
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
Fri May 9 15:44:50 2014
@@ -228,7 +228,7 @@ public final class DatePatternConverter
*/
@Override
public void format(final LogEvent event, final StringBuilder output) {
- final long timestamp = event.getMillis();
+ final long timestamp = event.getTimeMillis();
synchronized (this) {
if (timestamp != lastTimestamp) {
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RelativeTimePatternConverter.java
Fri May 9 15:44:50 2014
@@ -57,7 +57,7 @@ public class RelativeTimePatternConverte
*/
@Override
public void format(final LogEvent event, final StringBuilder toAppendTo) {
- final long timestamp = event.getMillis();
+ final long timestamp = event.getTimeMillis();
synchronized (this) {
if (timestamp != lastTimestamp) {
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
Fri May 9 15:44:50 2014
@@ -175,7 +175,7 @@ public abstract class AbstractJpaAppende
assertTrue("There should be at least one row.", resultSet.next());
- long date = resultSet.getLong("millis");
+ long date = resultSet.getLong("timemillis");
assertTrue("The date should be later than pre-logging (1).", date
>= millis);
assertTrue("The date should be earlier than now (1).", date <=
System.currentTimeMillis());
assertEquals("The level column is not correct (1).", "DEBUG",
resultSet.getString("level"));
@@ -186,7 +186,7 @@ public abstract class AbstractJpaAppende
assertTrue("There should be at least two rows.", resultSet.next());
- date = resultSet.getLong("millis");
+ date = resultSet.getLong("timemillis");
assertTrue("The date should be later than pre-logging (2).", date
>= millis);
assertTrue("The date should be earlier than now (2).", date <=
System.currentTimeMillis());
assertEquals("The level column is not correct (2).", "WARN",
resultSet.getString("level"));
@@ -197,7 +197,7 @@ public abstract class AbstractJpaAppende
assertTrue("There should be three rows.", resultSet.next());
- date = resultSet.getLong("millis");
+ date = resultSet.getLong("timemillis");
assertTrue("The date should be later than pre-logging (3).", date
>= millis);
assertTrue("The date should be earlier than now (3).", date <=
System.currentTimeMillis());
assertEquals("The level column is not correct (3).", "FATAL",
resultSet.getString("level"));
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaH2AppenderTest.java
Fri May 9 15:44:50 2014
@@ -42,7 +42,7 @@ public class JpaH2AppenderTest extends A
statement = connection.createStatement();
statement.executeUpdate("CREATE TABLE jpaBasicLogEntry ( " +
- "id INTEGER IDENTITY, millis BIGINT, level NVARCHAR(10),
loggerName NVARCHAR(255), " +
+ "id INTEGER IDENTITY, timemillis BIGINT, level NVARCHAR(10),
loggerName NVARCHAR(255), " +
"message NVARCHAR(1024), thrown NVARCHAR(1048576),
contextMapJson NVARCHAR(1048576)," +
"fqcn NVARCHAR(1024), contextStack NVARCHAR(1048576), marker
NVARCHAR(255), source NVARCHAR(2048)," +
"threadName NVARCHAR(255)" +
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JpaHyperSqlAppenderTest.java
Fri May 9 15:44:50 2014
@@ -47,7 +47,7 @@ public class JpaHyperSqlAppenderTest ext
statement = connection.createStatement();
statement.executeUpdate("CREATE TABLE jpaBasicLogEntry ( " +
- "id INTEGER IDENTITY, millis BIGINT, level VARCHAR(10),
loggerName VARCHAR(255), " +
+ "id INTEGER IDENTITY, timemillis BIGINT, level VARCHAR(10),
loggerName VARCHAR(255), " +
"message VARCHAR(1024), thrown VARCHAR(1048576),
contextMapJson VARCHAR(1048576)," +
"fqcn VARCHAR(1024), contextStack VARCHAR(1048576), marker
VARCHAR(255), source VARCHAR(2048)," +
"threadName VARCHAR(255)" +
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
Fri May 9 15:44:50 2014
@@ -69,7 +69,7 @@ public class TestBaseEntity extends Abst
@Temporal(TemporalType.TIMESTAMP)
@Column(name = "eventDate")
public Date getEventDate() {
- return new Date(this.getMillis());
+ return new Date(this.getTimeMillis());
}
public void setEventDate(final Date date) {
@@ -117,8 +117,8 @@ public class TestBaseEntity extends Abst
@Override
@Transient
- public long getMillis() {
- return this.getWrappedEvent().getMillis();
+ public long getTimeMillis() {
+ return this.getWrappedEvent().getTimeMillis();
}
@Override
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicyTest.java
Fri May 9 15:44:50 2014
@@ -150,6 +150,6 @@ public class MapRewritePolicyTest {
Assert.assertEquals("ContextStack changed", orig.getContextStack(),
changed.getContextStack());
Assert.assertEquals("ThreadName changed", orig.getThreadName(),
changed.getThreadName());
Assert.assertEquals("Source changed", orig.getSource(),
changed.getSource());
- Assert.assertEquals("Millis changed", orig.getMillis(),
changed.getMillis());
+ Assert.assertEquals("Millis changed", orig.getTimeMillis(),
changed.getTimeMillis());
}
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/TestRewritePolicy.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/TestRewritePolicy.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/TestRewritePolicy.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/TestRewritePolicy.java
Fri May 9 15:44:50 2014
@@ -32,7 +32,7 @@ public class TestRewritePolicy implement
return new Log4jLogEvent(source.getLoggerName(), source.getMarker(),
source.getFQCN(), source.getLevel(),
source.getMessage(), source.getThrown(), source.getContextMap(),
source.getContextStack(),
- source.getThreadName(), source.getSource(), source.getMillis());
+ source.getThreadName(), source.getSource(),
source.getTimeMillis());
}
@PluginFactory
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/async/RingBufferLogEventTest.java
Fri May 9 15:44:50 2014
@@ -87,7 +87,7 @@ public class RingBufferLogEventTest {
long currentTimeMillis = 123;
evt.setValues(null, loggerName, marker, fqcn, level, data, t, map,
contextStack, threadName, location, currentTimeMillis);
- assertEquals(123, evt.getMillis());
+ assertEquals(123, evt.getTimeMillis());
}
static class TimeMsg implements Message, TimestampMessage {
@@ -142,7 +142,7 @@ public class RingBufferLogEventTest {
long currentTimeMillis = 123;
evt.setValues(null, loggerName, marker, fqcn, level, data, t, map,
contextStack, threadName, location, currentTimeMillis);
- assertEquals(567, evt.getMillis());
+ assertEquals(567, evt.getTimeMillis());
}
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
Fri May 9 15:44:50 2014
@@ -68,7 +68,7 @@ public class Log4jLogEventTest {
final ObjectInputStream in = new ObjectInputStream(inArr);
final Log4jLogEvent evt2 = (Log4jLogEvent) in.readObject();
- assertEquals(evt.getMillis(), evt2.getMillis());
+ assertEquals(evt.getTimeMillis(), evt2.getTimeMillis());
assertEquals(evt.getFQCN(), evt2.getFQCN());
assertEquals(evt.getLevel(), evt2.getLevel());
assertEquals(evt.getLoggerName(), evt2.getLoggerName());
@@ -100,7 +100,7 @@ public class Log4jLogEventTest {
final Level NULL_LEVEL = null;
final Log4jLogEvent evt = new Log4jLogEvent("some.test", marker, "",
NULL_LEVEL, new SimpleMessage("abc"), t);
- assertEquals(FixedTimeClock.FIXED_TIME, evt.getMillis());
+ assertEquals(FixedTimeClock.FIXED_TIME, evt.getTimeMillis());
}
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
Fri May 9 15:44:50 2014
@@ -168,12 +168,12 @@ public class PatternLayoutTest {
final LogEvent event1 = new Log4jLogEvent(this.getClass().getName(),
null,
"org.apache.logging.log4j.core.Logger", Level.INFO, new
SimpleMessage("Hello, world 1!"), null);
final byte[] result1 = layout.toByteArray(event1);
- assertEquals(event1.getMillis() + " Hello, world 1!", new
String(result1));
+ assertEquals(event1.getTimeMillis() + " Hello, world 1!", new
String(result1));
// System.out.println("event1=" + event1.getMillis());
final LogEvent event2 = new Log4jLogEvent(this.getClass().getName(),
null,
"org.apache.logging.log4j.core.Logger", Level.INFO, new
SimpleMessage("Hello, world 2!"), null);
final byte[] result2 = layout.toByteArray(event2);
- assertEquals(event2.getMillis() + " Hello, world 2!", new
String(result2));
+ assertEquals(event2.getTimeMillis() + " Hello, world 2!", new
String(result2));
// System.out.println("event2=" + event2.getMillis());
}
@@ -185,13 +185,13 @@ public class PatternLayoutTest {
final LogEvent event1 = new Log4jLogEvent(this.getClass().getName(),
null,
"org.apache.logging.log4j.core.Logger", Level.INFO, new
SimpleMessage("Hello, world 1!"), null);
final byte[] result1 = layout.toByteArray(event1);
- assertEquals(event1.getMillis() / 1000 + " Hello, world 1!", new
String(result1));
- System.out.println("event1=" + event1.getMillis() / 1000);
+ assertEquals(event1.getTimeMillis() / 1000 + " Hello, world 1!", new
String(result1));
+ System.out.println("event1=" + event1.getTimeMillis() / 1000);
final LogEvent event2 = new Log4jLogEvent(this.getClass().getName(),
null,
"org.apache.logging.log4j.core.Logger", Level.INFO, new
SimpleMessage("Hello, world 2!"), null);
final byte[] result2 = layout.toByteArray(event2);
- assertEquals(event2.getMillis() / 1000 + " Hello, world 2!", new
String(result2));
- System.out.println("event2=" + event2.getMillis() / 1000);
+ assertEquals(event2.getTimeMillis() / 1000 + " Hello, world 2!", new
String(result2));
+ System.out.println("event2=" + event2.getTimeMillis() / 1000);
}
@Test
@@ -202,13 +202,13 @@ public class PatternLayoutTest {
final LogEvent event1 = new Log4jLogEvent(this.getClass().getName(),
null,
"org.apache.logging.log4j.core.Logger", Level.INFO, new
SimpleMessage("Hello, world 1!"), null);
final byte[] result1 = layout.toByteArray(event1);
- assertEquals(event1.getMillis() + " Hello, world 1!", new
String(result1));
- System.out.println("event1=" + event1.getMillis());
+ assertEquals(event1.getTimeMillis() + " Hello, world 1!", new
String(result1));
+ System.out.println("event1=" + event1.getTimeMillis());
final LogEvent event2 = new Log4jLogEvent(this.getClass().getName(),
null,
"org.apache.logging.log4j.core.Logger", Level.INFO, new
SimpleMessage("Hello, world 2!"), null);
final byte[] result2 = layout.toByteArray(event2);
- assertEquals(event2.getMillis() + " Hello, world 2!", new
String(result2));
- System.out.println("event2=" + event2.getMillis());
+ assertEquals(event2.getTimeMillis() + " Hello, world 2!", new
String(result2));
+ System.out.println("event2=" + event2.getTimeMillis());
}
@Test
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java
Fri May 9 15:44:50 2014
@@ -80,7 +80,7 @@ public class DateLookupTest {
}
@Override
- public long getMillis() {
+ public long getTimeMillis() {
final Calendar cal = Calendar.getInstance();
cal.set(2011, 11, 30, 10, 56, 35);
return cal.getTimeInMillis();
Modified:
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
Fri May 9 15:44:50 2014
@@ -79,7 +79,7 @@ public class FlumeEvent extends SimpleEv
this.event = event;
this.compress = compress;
final Map<String, String> headers = getHeaders();
- headers.put(TIMESTAMP, Long.toString(event.getMillis()));
+ headers.put(TIMESTAMP, Long.toString(event.getTimeMillis()));
if (mdcPrefix == null) {
mdcPrefix = DEFAULT_MDC_PREFIX;
}
@@ -261,8 +261,8 @@ public class FlumeEvent extends SimpleEv
* @return the event timestamp.
*/
@Override
- public long getMillis() {
- return event.getMillis();
+ public long getTimeMillis() {
+ return event.getTimeMillis();
}
/**
Modified:
logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSQLDatabaseManager.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSQLDatabaseManager.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSQLDatabaseManager.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/NoSQLDatabaseManager.java
Fri May 9 15:44:50 2014
@@ -101,8 +101,8 @@ public final class NoSQLDatabaseManager<
}
entity.set("threadName", event.getThreadName());
- entity.set("millis", event.getMillis());
- entity.set("date", new java.util.Date(event.getMillis()));
+ entity.set("millis", event.getTimeMillis());
+ entity.set("date", new java.util.Date(event.getTimeMillis()));
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
Throwable thrown = event.getThrown();
Modified:
logging/log4j/log4j2/trunk/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSQLDatabaseManagerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSQLDatabaseManagerTest.java?rev=1593566&r1=1593565&r2=1593566&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSQLDatabaseManagerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/NoSQLDatabaseManagerTest.java
Fri May 9 15:44:50 2014
@@ -201,7 +201,7 @@ public class NoSQLDatabaseManagerTest {
expect(event.getSource()).andReturn(new
StackTraceElement("com.foo.Bar", "testMethod01", "Bar.java", 15));
expect(event.getMarker()).andReturn(null);
expect(event.getThreadName()).andReturn("MyThread-A");
- expect(event.getMillis()).andReturn(1234567890123L).times(2);
+ expect(event.getTimeMillis()).andReturn(1234567890123L).times(2);
expect(event.getThrown()).andReturn(null);
expect(event.getContextMap()).andReturn(null);
expect(event.getContextStack()).andReturn(null);
@@ -314,7 +314,7 @@ public class NoSQLDatabaseManagerTest {
expect(event.getSource()).andReturn(new
StackTraceElement("com.bar.Foo", "anotherMethod03", "Foo.java", 9));
expect(event.getMarker()).andReturn(MarkerManager.getMarker("LoneMarker"));
expect(event.getThreadName()).andReturn("AnotherThread-B");
- expect(event.getMillis()).andReturn(987654321564L).times(2);
+ expect(event.getTimeMillis()).andReturn(987654321564L).times(2);
expect(event.getThrown()).andReturn(exception);
expect(event.getContextMap()).andReturn(context);
expect(event.getContextStack()).andReturn(stack);
@@ -469,7 +469,7 @@ public class NoSQLDatabaseManagerTest {
MarkerManager.getMarker("AnotherMarker",
MarkerManager.getMarker("Parent1",
MarkerManager.getMarker("Grandparent2"))));
expect(event.getThreadName()).andReturn("AnotherThread-B");
- expect(event.getMillis()).andReturn(987654321564L).times(2);
+ expect(event.getTimeMillis()).andReturn(987654321564L).times(2);
expect(event.getThrown()).andReturn(exception2);
expect(event.getContextMap()).andReturn(context);
expect(event.getContextStack()).andReturn(stack);
