You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2011/09/06 16:27:48 UTC
svn commit: r1165682 [2/3] - in
/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers: ./ log4j12-api/
log4j12-api/src/main/java/org/apache/log4j/ log4j12-api/src/site/
log4j2-api/ log4j2-api/src/main/java/org/apache/logging/log4j/
log4j2-api/src/main...
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/message/StructuredDataMessage.java Tue Sep 6 14:27:43 2011
@@ -19,10 +19,8 @@ package org.apache.logging.log4j.message
import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.SortedMap;
-import java.util.StringTokenizer;
import java.util.TreeMap;
/**
@@ -31,6 +29,9 @@ import java.util.TreeMap;
public class StructuredDataMessage implements FormattedMessage, Serializable {
private static final long serialVersionUID = 1703221292892071920L;
+ /**
+ * Full message format includes the type and message.
+ */
public static final String FULL = "full";
private Map<String, String> data = new HashMap<String, String>();
@@ -43,57 +44,107 @@ public class StructuredDataMessage imple
private String format = null;
+ private static final int MAX_LENGTH = 32;
+ private static final int HASHVAL = 31;
+
+ /**
+ * Constructor based on a String id.
+ * @param id The String id.
+ * @param msg The message.
+ * @param type The message type.
+ */
public StructuredDataMessage(final String id, final String msg, final String type) {
this.id = new StructuredDataId(id, null, null);
this.message = msg;
this.type = type;
}
+ /**
+ * Constructor based on a StructuredDataId.
+ * @param id The StructuredDataId.
+ * @param msg The message.
+ * @param type The message type.
+ */
public StructuredDataMessage(final StructuredDataId id, final String msg, final String type) {
this.id = id;
this.message = msg;
this.type = type;
}
+ /**
+ * Basic constructor.
+ */
protected StructuredDataMessage() {
}
+ /**
+ * The format String. Specifying "full" will cause the type and message to be included.
+ * @param format The message format.
+ */
public void setFormat(String format) {
this.format = format;
}
+ /**
+ * Return the format String.
+ * @return the format String.
+ */
public String getFormat() {
return this.format;
}
+ /**
+ * Return the id.
+ * @return the StructuredDataId.
+ */
public StructuredDataId getId() {
return id;
}
+ /**
+ * Set the id from a String.
+ * @param id The String id.
+ */
protected void setId(String id) {
this.id = new StructuredDataId(id, null, null);
}
+ /**
+ * Set the id.
+ * @param id The StructuredDataId.
+ */
protected void setId(StructuredDataId id) {
this.id = id;
}
+ /**
+ * Set the type.
+ * @return the type.
+ */
public String getType() {
return type;
}
protected void setType(String type) {
- if (type.length() > 32) {
+ if (type.length() > MAX_LENGTH) {
throw new IllegalArgumentException("Structured data type exceeds maximum length of 32 characters: " + type);
}
this.type = type;
}
+ /**
+ * Return the data elements as if they were parameters on the logging event.
+ * @return the data elements.
+ */
public Object[] getParameters() {
return data.values().toArray();
}
+ /**
+ * Return the message.
+ * @return the message.
+ */
public String getMessageFormat() {
return message;
}
@@ -102,33 +153,59 @@ public class StructuredDataMessage imple
this.message = msg;
}
+ /**
+ * Return the message data as an unmodifiable Map.
+ * @return the message data as an unmodifiable map.
+ */
public Map<String, String> getData() {
return Collections.unmodifiableMap(data);
}
+ /**
+ * Clear the data.
+ */
public void clear() {
data.clear();
}
+ /**
+ * Add an item to the data Map.
+ * @param key The name of the data item.
+ * @param value The value of the data item.
+ */
public void put(String key, String value) {
if (value == null) {
throw new IllegalArgumentException("No value provided for key " + key);
}
- if (value.length() > 32) {
+ if (value.length() > MAX_LENGTH) {
throw new IllegalArgumentException("Structured data values are limited to 32 characters. key: " + key +
" value: " + value);
}
data.put(key, value);
}
+ /**
+ * Add all the elements from the specified Map.
+ * @param map The Map to add.
+ */
public void putAll(Map map) {
data.putAll(map);
}
+ /**
+ * Retrieve the value of the element with the specified key or null if the key is not present.
+ * @param key The name of the element.
+ * @return The value of the element or null if the key is not present.
+ */
public String get(String key) {
return data.get(key);
}
+ /**
+ * Remove the element with the specified name.
+ * @param key The name of the element.
+ * @return The previous value of the element.
+ */
public String remove(String key) {
return data.remove(key);
}
@@ -193,6 +270,10 @@ public class StructuredDataMessage imple
return sb.toString();
}
+ /**
+ * Format the message and return it.
+ * @return the formatted message.
+ */
public String getFormattedMessage() {
return asString(FULL, null);
}
@@ -237,9 +318,9 @@ public class StructuredDataMessage imple
public int hashCode() {
int result = data != null ? data.hashCode() : 0;
- result = 31 * result + (type != null ? type.hashCode() : 0);
- result = 31 * result + (id != null ? id.hashCode() : 0);
- result = 31 * result + (message != null ? message.hashCode() : 0);
+ result = HASHVAL * result + (type != null ? type.hashCode() : 0);
+ result = HASHVAL * result + (id != null ? id.hashCode() : 0);
+ result = HASHVAL * result + (message != null ? message.hashCode() : 0);
return result;
}
}
Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/message/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/message/package-info.java?rev=1165682&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/message/package-info.java (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/message/package-info.java Tue Sep 6 14:27:43 2011
@@ -0,0 +1,2 @@
+/** Public Message Types used for Log4j 2.0. User's may implement their own Messages. */
+package org.apache.logging.log4j.message;
\ No newline at end of file
Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/package-info.java?rev=1165682&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/package-info.java (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/package-info.java Tue Sep 6 14:27:43 2011
@@ -0,0 +1,2 @@
+/** Public API for Log4j 2.0. */
+package org.apache.logging.log4j;
\ No newline at end of file
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java Tue Sep 6 14:27:43 2011
@@ -26,6 +26,9 @@ import org.apache.logging.log4j.message.
import org.apache.logging.log4j.message.SimpleMessage;
/**
+ * Base implementation of a Logger. While this class is large and contains many methods, it makes implementing an
+ * actually Logger relatively easy.
+ *
* @doubt See Jira LOG4J2-39.
*/
public abstract class AbstractLogger implements Logger {
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerWrapper.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerWrapper.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerWrapper.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerWrapper.java Tue Sep 6 14:27:43 2011
@@ -28,52 +28,134 @@ public class AbstractLoggerWrapper exten
protected final AbstractLogger logger;
protected final String name;
+ /**
+ * Constructor that wraps and existing Logger.
+ * @param logger The Logger to wrap.
+ * @param name The name of the Logger.
+ */
public AbstractLoggerWrapper(AbstractLogger logger, String name) {
this.logger = logger;
this.name = name;
}
+ /**
+ * Log an event.
+ * @param marker The Marker
+ * @param fqcn The fully qualified class name of the <b>caller</b>
+ * @param level The logging level
+ * @param data The Message.
+ * @param t A Throwable or null.
+ */
@Override
public void log(Marker marker, String fqcn, Level level, Message data, Throwable t) {
logger.log(marker, fqcn, level, data, t);
}
+ /**
+ * Detect if the event would be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param data The message.
+ * @return true if the event would be logged for the Level, Marker and data, false otherwise.
+ */
@Override
public boolean isEnabled(Level level, Marker marker, String data) {
return logger.isEnabled(level, marker, data);
}
+ /**
+ * Detect if the event would be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param data The message.
+ * @param t A Throwable.
+ * @return true if the event would be logged for the Level, Marker, data and Throwable, false otherwise.
+ */
@Override
public boolean isEnabled(Level level, Marker marker, String data, Throwable t) {
return logger.isEnabled(level, marker, data, t);
}
+ /**
+ * Detect if the event would be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param data The message.
+ * @param p1 The first parameter.
+ * @return true if the event would be logged for the Level, Marker, data and parameter.
+ */
@Override
public boolean isEnabled(Level level, Marker marker, String data, Object p1) {
return logger.isEnabled(level, marker, data, p1);
}
+ /**
+ * Detect if the event would be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param data The message.
+ * @param p1 The first parameter.
+ * @param p2 The second parameter.
+ * @return true if the event would be logged for the Level, Marker, data and parameters.
+ */
@Override
public boolean isEnabled(Level level, Marker marker, String data, Object p1, Object p2) {
return logger.isEnabled(level, marker, data, p1, p2);
}
+ /**
+ * Detect if the event would be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param data The message.
+ * @param p1 The first parameter.
+ * @param p2 The second parameter.
+ * @param p3 The third parameter.
+ * @return true if the event would be logged for the Level, Marker, data and parameters.
+ */
@Override
public boolean isEnabled(Level level, Marker marker, String data, Object p1, Object p2, Object p3) {
return logger.isEnabled(level, marker, data, p1, p2, p3);
}
+ /**
+ * Detect if the event would be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param data The message.
+ * @param p1 The first parameter.
+ * @param p2 The second parameter.
+ * @param p3 The third parameter.
+ * @param params More message parameters.
+ * @return true if the event would be logged for the Level, Marker, data and parameters.
+ */
@Override
public boolean isEnabled(Level level, Marker marker, String data, Object p1, Object p2, Object p3,
Object... params) {
return logger.isEnabled(level, marker, data, p2, p2, p3, params);
}
+ /**
+ * Detect if the event would be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param data The message.
+ * @param t A Throwable.
+ * @return true if the event would be logged for the Level, Marker, Object and Throwable, false otherwise.
+ */
@Override
public boolean isEnabled(Level level, Marker marker, Object data, Throwable t) {
return logger.isEnabled(level, marker, data, t);
}
+ /**
+ * Detect if the event would be logged.
+ * @param level The logging Level to check.
+ * @param marker A Marker or null.
+ * @param data The Message.
+ * @param t A Throwable.
+ * @return true if the event would be logged for the Level, Marker, Message and Throwable, false otherwise.
+ */
@Override
public boolean isEnabled(Level level, Marker marker, Message data, Throwable t) {
return logger.isEnabled(level, marker, data, t);
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/LoggerContext.java Tue Sep 6 14:27:43 2011
@@ -1,17 +1,53 @@
+/*
+ * 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.logging.log4j.spi;
import org.apache.logging.log4j.Logger;
/**
- *
+ * Anchor point for logging implementations.
*/
public interface LoggerContext {
+ /**
+ * Return a Logger.
+ * @param name The name of the Logger to return.
+ * @return The logger with the specified name.
+ */
Logger getLogger(String name);
+ /**
+ * Return a Logger using the specified factory to create it.
+ * @param factory The LoggerFactory.
+ * @param name The name of the Logger.
+ * @return The Logger with the specified name.
+ */
Logger getLogger(LoggerFactory factory, String name);
+ /**
+ * Detect if a Logger with the specified name exists.
+ * @param name The Logger name to search for.
+ * @return true if the Logger exists, false otherwise.
+ */
boolean hasLogger(String name);
+ /**
+ * An anchor for some other context, such as a ServletContext.
+ * @return The external context.
+ */
Object getExternalContext();
}
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextFactory.java Tue Sep 6 14:27:43 2011
@@ -1,7 +1,23 @@
+/*
+ * 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.logging.log4j.spi;
/**
- *
+ * Interface implemented by factories that create LoggerContext objects.
*/
public interface LoggerContextFactory {
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/LoggerFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/LoggerFactory.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/LoggerFactory.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/LoggerFactory.java Tue Sep 6 14:27:43 2011
@@ -1,11 +1,33 @@
+/*
+ * 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.logging.log4j.spi;
import org.apache.logging.log4j.Logger;
/**
- *
+ * Interface implemented by factories that create Logger objects.
*/
public interface LoggerFactory<C extends LoggerContext> {
+ /**
+ * Create a new Logger.
+ * @param ctx The LoggerContext.
+ * @param name The name of the Logger.
+ * @return The created Logger.
+ */
Logger newInstance(C ctx, String name);
}
Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/package-info.java?rev=1165682&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/package-info.java (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/spi/package-info.java Tue Sep 6 14:27:43 2011
@@ -0,0 +1,2 @@
+/** Internal interfaces and classes to be used by authors of logging implementations. */
+package org.apache.logging.log4j.spi;
\ No newline at end of file
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java?rev=1165682&r1=1147720&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java Tue Sep 6 14:27:43 2011
@@ -14,12 +14,12 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.internal;
+package org.apache.logging.log4j.status;
import org.apache.logging.log4j.Level;
/**
- *
+ * StatusListener that writes to the Console
*/
public class StatusConsoleListener implements StatusListener {
@@ -29,6 +29,11 @@ public class StatusConsoleListener imple
private String[] filters = null;
+ /**
+ * Creates the StatusConsoleListener using either the level configured by the
+ * "org.apache.logging.log4j.StatusLevel" system property if it is set or to a
+ * default value of FATAL.
+ */
public StatusConsoleListener() {
String str = System.getProperty(STATUS_LEVEL);
if (str != null) {
@@ -36,20 +41,36 @@ public class StatusConsoleListener imple
}
}
+ /**
+ * Creates the StatusConsoleListener using the supplied Level.
+ * @param level The Level of status messages that should appear on the console.
+ */
public StatusConsoleListener(Level level) {
this.level = level;
}
+ /**
+ * Sets the level to a new value.
+ * @param level The new Level.
+ */
public void setLevel(Level level) {
this.level = level;
}
+ /**
+ * Writes status messages to the console.
+ * @param data The StatusData.
+ */
public void log(StatusData data) {
if (data.getLevel().isAtLeastAsSpecificAs(level) && !filtered(data)) {
System.out.println(data.getFormattedStatus());
}
}
+ /**
+ * Adds package name filters to exclude.
+ * @param filters An array of package names to exclude.
+ */
public void setFilters(String[] filters) {
this.filters = filters;
}
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusData.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusData.java?rev=1165682&r1=1147720&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusData.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusData.java Tue Sep 6 14:27:43 2011
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.internal;
+package org.apache.logging.log4j.status;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.message.Message;
@@ -25,7 +25,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
/**
- *
+ * The Status data.
*/
public class StatusData {
@@ -39,7 +39,13 @@ public class StatusData {
private final Throwable throwable;
-
+ /**
+ * Creates the StatusData object.
+ * @param caller The method that created the event.
+ * @param level The logging level.
+ * @param msg The message String.
+ * @param t The Error or Exception that occurred.
+ */
public StatusData(StackTraceElement caller, Level level, Message msg, Throwable t) {
this.timestamp = System.currentTimeMillis();
this.caller = caller;
@@ -48,31 +54,54 @@ public class StatusData {
this.throwable = t;
}
-
+ /**
+ * Return the event's timestamp.
+ * @return The event's timestamp.
+ */
public long getTimestamp() {
return timestamp;
}
+ /**
+ * Returns the StackTraceElement for the method that created the event.
+ * @return The StackTraceElement.
+ */
public StackTraceElement getStackTraceElement() {
return caller;
}
+ /**
+ * Returns the logging level for the event.
+ * @return The logging level.
+ */
public Level getLevel() {
return level;
}
+ /**
+ * Returns the message associated with the event.
+ * @return The message associated with the event.
+ */
public Message getMessage() {
return msg;
}
+ /**
+ * Returns the Throwable associated with the event.
+ * @return The Throwable associated with the event.
+ */
public Throwable getThrowable() {
return throwable;
}
+ /**
+ * Formats the StatusData for viewing.
+ * @return The formatted status data as a String.
+ */
public String getFormattedStatus() {
StringBuilder sb = new StringBuilder();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss,SSS");
- sb.append(format.format(new Date(timestamp)));
+ sb.append(format.format(new Date(timestamp)));
sb.append(" ");
sb.append(level.toString());
sb.append(" ");
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusListener.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusListener.java?rev=1165682&r1=1147720&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusListener.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusListener.java Tue Sep 6 14:27:43 2011
@@ -1,9 +1,13 @@
-package org.apache.logging.log4j.internal;
+package org.apache.logging.log4j.status;
/**
- *
+ * Interface that allows implementors to be notified of events in the logging system.
*/
public interface StatusListener {
- void log(StatusData data);
+ /**
+ * Called as events occur to process the StatusData.
+ * @param data The StatusData for the event.
+ */
+ void log(StatusData data);
}
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java?rev=1165682&r1=1147720&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java Tue Sep 6 14:27:43 2011
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.internal;
+package org.apache.logging.log4j.status;
import org.apache.logging.log4j.spi.AbstractLogger;
import org.apache.logging.log4j.Level;
@@ -32,12 +32,16 @@ import java.util.concurrent.locks.Reentr
import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
- *
+ * Mechanism to record events that occur in the logging system.
*/
public class StatusLogger extends AbstractLogger {
private static final String NOT_AVAIL = "?";
+ /**
+ * System property that can be configured with the number of entries in the queue. Once the limit
+ * is reached older entries will be removed as new entries are added.
+ */
public static final String MAX_STATUS_ENTRIES = "log4j2.status.entries";
private static final int maxEntries = Integer.getInteger(MAX_STATUS_ENTRIES, 200);
@@ -57,10 +61,18 @@ public class StatusLogger extends Abstra
private StatusLogger() {
}
+ /**
+ * Retrieve the StatusLogger.
+ * @return The StatusLogger.
+ */
public static StatusLogger getLogger() {
return statusLogger;
}
+ /**
+ * Register a new listener.
+ * @param listener The StatusListener to register.
+ */
public void registerListener(StatusListener listener) {
listenersLock.writeLock().lock();
try {
@@ -70,6 +82,10 @@ public class StatusLogger extends Abstra
}
}
+ /**
+ * Remove a StatusListener.
+ * @param listener The StatusListener to remove.
+ */
public void removeListener(StatusListener listener) {
listenersLock.writeLock().lock();
try {
@@ -79,15 +95,26 @@ public class StatusLogger extends Abstra
}
}
+ /**
+ * Returns a thread safe Iterator for the StatusListener.
+ * @return An Iterator for the list of StatusListeners.
+ */
public Iterator<StatusListener> getListeners() {
return listeners.iterator();
}
+ /**
+ * Clears the list of status events and listeners.
+ */
public void reset() {
listeners.clear();
clear();
}
+ /**
+ * Returns a List of all events as StatusData objects.
+ * @return The list of StatusData objects.
+ */
public List<StatusData> getStatusData() {
msgLock.lock();
try {
@@ -97,6 +124,9 @@ public class StatusLogger extends Abstra
}
}
+ /**
+ * Clears the list of status events.
+ */
public void clear() {
msgLock.lock();
try {
@@ -106,12 +136,15 @@ public class StatusLogger extends Abstra
}
}
- /*
- @Override
- protected String getFQCN() {
- return FQCN;
- } */
+ /**
+ * Add an event.
+ * @param marker The Marker
+ * @param fqcn The fully qualified class name of the <b>caller</b>
+ * @param level The logging level
+ * @param msg The message associated with the event.
+ * @param t A Throwable or null.
+ */
@Override
public void log(Marker marker, String fqcn, Level level, Message msg, Throwable t) {
StackTraceElement element = null;
Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/package-info.java?rev=1165682&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/package-info.java (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/main/java/org/apache/logging/log4j/status/package-info.java Tue Sep 6 14:27:43 2011
@@ -0,0 +1,4 @@
+/** Status API for Log4j 2.0. Should not be used by typical applications performing logging but may be
+ * used by applications reporting on the status of the logging system
+ */
+package org.apache.logging.log4j.status;
\ No newline at end of file
Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/site/site.xml?rev=1165682&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/site/site.xml (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-api/src/site/site.xml Tue Sep 6 14:27:43 2011
@@ -0,0 +1,35 @@
+<!--
+ 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.
+
+-->
+<project name="Component">
+ <bannerLeft>
+ <name>Logging Services</name>
+ <src>../images/ls-logo.jpg</src>
+ <href>../index.html</href>
+ </bannerLeft>
+ <bannerRight>
+ <src>../images/logo.jpg</src>
+ </bannerRight>
+ <body>
+ <links>
+ <item name="Apache" href="http://www.apache.org/" />
+ <item name="Logging Services" href="http://logging.apache.org/"/>
+ <item name="Log4j" href="../index.html"/>
+ </links>
+ <menu ref="reports"/>
+ </body>
+</project>
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/pom.xml?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/pom.xml (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/pom.xml Tue Sep 6 14:27:43 2011
@@ -27,13 +27,14 @@
<artifactId>log4j2-core</artifactId>
<packaging>jar</packaging>
<name>Log4J2 Core</name>
- <description>Experiments on Pattern Layout.</description>
- <url>http://logging.apache.org/log4j/experimental</url>
+ <description>Log4j 2.0 Implementation.</description>
+ <properties>
+ <log4j.parent.dir>${basedir}/..</log4j.parent.dir>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.logging</groupId>
<artifactId>log4j2-api</artifactId>
- <version>1.99.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>oro</groupId>
@@ -121,6 +122,121 @@
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.6</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+ <issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation> -->
+ <configLocation>${log4j.parent.dir}/checkstyle.xml</configLocation>
+ <suppressionsLocation>${log4j.parent.dir}/checkstyle-suppressions.xml</suppressionsLocation>
+ <enableRulesSummary>false</enableRulesSummary>
+ <propertyExpansion>basedir=${basedir}</propertyExpansion>
+ <propertyExpansion>licensedir=${log4j.parent.dir}/checkstyle-header.txt</propertyExpansion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <!-- module link generation is completely broken in the javadoc plugin for a multi-module non-aggregating
+ project -->
+ <detectOfflineLinks>false</detectOfflineLinks>
+ <linksource>true</linksource>
+ <tags>
+ <tag>
+ <name>issue</name>
+ <placement>a</placement>
+ <head>JIRA issue:</head>
+ </tag>
+ <tag>
+ <name>doubt</name>
+ <placement>a</placement>
+ <head>Troublesome:</head>
+ </tag>
+ <tag>
+ <name>compare</name>
+ <placement>a</placement>
+ <head>Compare with:</head>
+ </tag>
+ </tags>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <id>non-aggregate</id>
+ <reports>
+ <report>javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <threshold>Normal</threshold>
+ <effort>Default</effort>
+ <excludeFilterFile>findbugs-exclude-filter.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.3</version>
+ <reportSets>
+ <reportSet>
+ <id>non-aggregate</id>
+ <reports>
+ <report>jxr</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>aggregate</id>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.2</version>
+ <reportSets>
+ <reportSet>
+ <!-- Disabled at it kills the site generation via a NoClassDefFoundError -->
+ <reports/>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
<profiles>
<profile>
<!-- http://www.yourkit.com/docs/80/help/agent.jsp -->
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Appender.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Appender.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Appender.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Appender.java Tue Sep 6 14:27:43 2011
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.core;
-import java.util.List;
-
/**
* @issue LOG4J2-36: Appender interface should be refactored
*/
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/ErrorHandler.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/ErrorHandler.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/ErrorHandler.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/ErrorHandler.java Tue Sep 6 14:27:43 2011
@@ -16,8 +16,6 @@
*/
package org.apache.logging.log4j.core;
-import org.apache.logging.log4j.core.LogEvent;
-
/**
* Appenders may delegate their error handling to <code>ErrorHandlers</code>.
* @doubt if the appender interface is simplified, then error handling could just be done by wrapping
@@ -45,5 +43,5 @@ public interface ErrorHandler {
* @param event The LogEvent.
* @param t The Throwable.
*/
- public void error(String msg, LogEvent event, Throwable t);
+ void error(String msg, LogEvent event, Throwable t);
}
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Filter.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Filter.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Filter.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Filter.java Tue Sep 6 14:27:43 2011
@@ -1,3 +1,20 @@
+/*
+ * 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.logging.log4j.core;
import org.apache.logging.log4j.Level;
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Layout.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Layout.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Layout.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Layout.java Tue Sep 6 14:27:43 2011
@@ -1,3 +1,19 @@
+/*
+ * 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.logging.log4j.core;
import java.io.Serializable;
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Lifecycle.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Lifecycle.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Lifecycle.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Lifecycle.java Tue Sep 6 14:27:43 2011
@@ -1,3 +1,20 @@
+/*
+ * 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.logging.log4j.core;
/**
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Log4jContextFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Log4jContextFactory.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Log4jContextFactory.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Log4jContextFactory.java Tue Sep 6 14:27:43 2011
@@ -20,7 +20,7 @@ import org.apache.logging.log4j.core.hel
import org.apache.logging.log4j.core.helpers.Loader;
import org.apache.logging.log4j.core.selector.ClassLoaderContextSelector;
import org.apache.logging.log4j.core.selector.ContextSelector;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.spi.LoggerContextFactory;
/**
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Log4jLogEvent.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Log4jLogEvent.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Log4jLogEvent.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Log4jLogEvent.java Tue Sep 6 14:27:43 2011
@@ -54,7 +54,7 @@ public class Log4jLogEvent implements Lo
public Log4jLogEvent(String loggerName, Marker marker, String fqcn, Level level, Message message, Throwable t,
- Map<String, Object> mdc, Stack<String>ndc, String threadName, StackTraceElement location,
+ Map<String, Object> mdc, Stack<String> ndc, String threadName, StackTraceElement location,
long timestamp) {
name = loggerName;
this.marker = marker;
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LogEvent.java Tue Sep 6 14:27:43 2011
@@ -1,3 +1,20 @@
+/*
+ * 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.logging.log4j.core;
import org.apache.logging.log4j.Level;
@@ -68,7 +85,7 @@ public interface LogEvent extends Serial
/**
- * Get the MDC data;
+ * Get the MDC data.
*
* @return A copy of the Mapped Diagnostic Context or null.
* @doubt as mentioned elsewhere, think MDC and NDC should be combined into a thread context object.
@@ -77,7 +94,7 @@ public interface LogEvent extends Serial
Map<String, Object> getContextMap();
/**
- * Get the NDC data;
+ * Get the NDC data.
*
* @return A copy of the Nested Diagnostic Context of null;
* @doubt as mentioned elsewhere, think MDC and NDC should be combined into a thread context object.
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LogEventFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LogEventFactory.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LogEventFactory.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LogEventFactory.java Tue Sep 6 14:27:43 2011
@@ -1,3 +1,20 @@
+/*
+ * 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.logging.log4j.core;
import org.apache.logging.log4j.Level;
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Logger.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Logger.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Logger.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/Logger.java Tue Sep 6 14:27:43 2011
@@ -21,11 +21,9 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.message.SimpleMessage;
import org.apache.logging.log4j.spi.AbstractLogger;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
/**
@@ -43,7 +41,7 @@ public class Logger extends AbstractLogg
/**
* config should be consistent across threads.
*/
- protected volatile PrivateConfig config;
+ volatile protected PrivateConfig config;
protected Logger(LoggerContext context, String name) {
this.context = context;
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java Tue Sep 6 14:27:43 2011
@@ -20,7 +20,7 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.core.config.ConfigurationListener;
import org.apache.logging.log4j.core.config.NullConfiguration;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.spi.LoggerFactory;
import java.io.File;
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LoggingException.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LoggingException.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LoggingException.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/LoggingException.java Tue Sep 6 14:27:43 2011
@@ -1,18 +1,18 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
+ * 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 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,
+ * 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.
+ * limitations under the license.
*/
package org.apache.logging.log4j.core;
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractManager.java Tue Sep 6 14:27:43 2011
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.appender;
import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
import java.util.HashMap;
import java.util.Map;
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderBase.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderBase.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderBase.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderBase.java Tue Sep 6 14:27:43 2011
@@ -20,18 +20,12 @@ import org.apache.logging.log4j.core.App
import org.apache.logging.log4j.core.ErrorHandler;
import org.apache.logging.log4j.core.Lifecycle;
import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.config.Node;
-import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
-import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.filter.Filterable;
import org.apache.logging.log4j.core.filter.Filters;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.Logger;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
/**
* @doubt Appender should be refactored as mentioned elsewhere
*/
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java Tue Sep 6 14:27:43 2011
@@ -20,8 +20,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.ErrorHandler;
import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.appender.AppenderRuntimeException;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
/**
*
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java Tue Sep 6 14:27:43 2011
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.appender;
import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
import java.io.BufferedOutputStream;
import java.io.File;
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/Agent.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/Agent.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/Agent.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/Agent.java Tue Sep 6 14:27:43 2011
@@ -20,7 +20,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttr;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
/**
*
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/FlumeAvroManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/FlumeAvroManager.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/FlumeAvroManager.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/FlumeAvroManager.java Tue Sep 6 14:27:43 2011
@@ -26,7 +26,7 @@ import org.apache.logging.log4j.core.app
import com.cloudera.flume.handlers.avro.FlumeEventAvroServer;
import com.cloudera.flume.handlers.avro.AvroEventConvertUtil;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
import java.io.IOException;
import java.net.MalformedURLException;
Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/package-info.java?rev=1165682&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/package-info.java (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/flume/package-info.java Tue Sep 6 14:27:43 2011
@@ -0,0 +1,2 @@
+/** Apache Flume Appender. Requires the user specifically include Flume and its dependencies */
+package org.apache.logging.log4j.core.appender.flume;
\ No newline at end of file
Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/package-info.java?rev=1165682&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/package-info.java (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/package-info.java Tue Sep 6 14:27:43 2011
@@ -0,0 +1,2 @@
+/** Log4j 2.0 Appenders */
+package org.apache.logging.log4j.core.appender;
\ No newline at end of file
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java Tue Sep 6 14:27:43 2011
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.app
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttr;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
import java.io.File;
import java.util.ArrayList;
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java Tue Sep 6 14:27:43 2011
@@ -22,7 +22,7 @@ import org.apache.logging.log4j.core.app
import org.apache.logging.log4j.core.appender.ManagerFactory;
import org.apache.logging.log4j.core.appender.rolling.helper.Action;
import org.apache.logging.log4j.core.appender.rolling.helper.ActionBase;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
import java.io.BufferedOutputStream;
import java.io.File;
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverStrategyBase.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverStrategyBase.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverStrategyBase.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RolloverStrategyBase.java Tue Sep 6 14:27:43 2011
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.appender.rolling;
import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
/**
*
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java Tue Sep 6 14:27:43 2011
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.core.Log
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttr;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
import java.text.NumberFormat;
import java.text.ParseException;
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/ActionBase.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/ActionBase.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/ActionBase.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/ActionBase.java Tue Sep 6 14:27:43 2011
@@ -18,7 +18,7 @@
package org.apache.logging.log4j.core.appender.rolling.helper;
import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
import java.io.IOException;
Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/package-info.java?rev=1165682&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/package-info.java (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/helper/package-info.java Tue Sep 6 14:27:43 2011
@@ -0,0 +1,2 @@
+/** Support classes for the Rolling File Appender*/
+package org.apache.logging.log4j.core.appender.rolling.helper;
\ No newline at end of file
Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/package-info.java?rev=1165682&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/package-info.java (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/package-info.java Tue Sep 6 14:27:43 2011
@@ -0,0 +1,2 @@
+/** Rolling File Appender and support classes*/
+package org.apache.logging.log4j.core.appender.rolling;
\ No newline at end of file
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java Tue Sep 6 14:27:43 2011
@@ -29,25 +29,20 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.filter.Filterable;
import org.apache.logging.log4j.core.filter.Filters;
import org.apache.logging.log4j.core.helpers.NameUtil;
-import org.apache.logging.log4j.core.lookup.Interpolator;
-import org.apache.logging.log4j.core.lookup.MapLookup;
import org.apache.logging.log4j.core.lookup.StrSubstitutor;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
-import java.io.File;
import java.lang.annotation.Annotation;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.atomic.AtomicReference;
/**
*
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java Tue Sep 6 14:27:43 2011
@@ -3,7 +3,7 @@ package org.apache.logging.log4j.core.co
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.plugins.PluginManager;
import org.apache.logging.log4j.core.config.plugins.PluginType;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
import java.net.URI;
import java.util.ArrayList;
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java Tue Sep 6 14:27:43 2011
@@ -20,7 +20,6 @@ import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Log4jLogEvent;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventFactory;
@@ -30,18 +29,15 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.filter.Filterable;
import org.apache.logging.log4j.core.filter.Filters;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.message.Message;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.atomic.AtomicReference;
/**
*
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/Property.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/Property.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/Property.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/Property.java Tue Sep 6 14:27:43 2011
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.plugins.PluginAttr;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
import org.apache.logging.log4j.core.config.plugins.PluginValue;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
/**
*
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java Tue Sep 6 14:27:43 2011
@@ -20,9 +20,9 @@ import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.config.plugins.PluginManager;
import org.apache.logging.log4j.core.config.plugins.PluginType;
import org.apache.logging.log4j.core.config.plugins.ResolverUtil;
-import org.apache.logging.log4j.internal.StatusConsoleListener;
-import org.apache.logging.log4j.internal.StatusListener;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusConsoleListener;
+import org.apache.logging.log4j.status.StatusListener;
+import org.apache.logging.log4j.status.StatusLogger;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/XMLConfigurationFactory.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/XMLConfigurationFactory.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/XMLConfigurationFactory.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/XMLConfigurationFactory.java Tue Sep 6 14:27:43 2011
@@ -20,7 +20,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.helpers.FileUtils;
import org.apache.logging.log4j.core.helpers.Loader;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
import org.xml.sax.InputSource;
import java.io.File;
Added: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/package-info.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/package-info.java?rev=1165682&view=auto
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/package-info.java (added)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/package-info.java Tue Sep 6 14:27:43 2011
@@ -0,0 +1,2 @@
+/** Configuration of Log4j 2.0*/
+package org.apache.logging.log4j.core.config;
\ No newline at end of file
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppenderRefPlugin.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppenderRefPlugin.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppenderRefPlugin.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppenderRefPlugin.java Tue Sep 6 14:27:43 2011
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.core.config.plugins;
import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.internal.StatusLogger;
+import org.apache.logging.log4j.status.StatusLogger;
/**
*
Modified: logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java
URL: http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java?rev=1165682&r1=1165681&r2=1165682&view=diff
==============================================================================
--- logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java (original)
+++ logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java Tue Sep 6 14:27:43 2011
@@ -32,13 +32,15 @@ public class PropertiesPlugin {
@PluginFactory
public static StrSubstitutor configureSubstitutor(@PluginElement("properties") Property[] properties) {
+ if (properties == null) {
+ return new StrSubstitutor(new Interpolator(null));
+ }
Map<String, String> map = new HashMap<String, String>();
-
+
for (Property prop : properties) {
map.put(prop.getName(), prop.getValue());
}
- Interpolator inter = new Interpolator(properties == null ? null : new MapLookup(map));
- return new StrSubstitutor(inter);
+ return new StrSubstitutor(new Interpolator(new MapLookup(map)));
}
}