Author: carnold
Date: Mon May 31 03:05:04 2010
New Revision: 949657

URL: http://svn.apache.org/viewvc?rev=949657&view=rev
Log:
Committing before thunderstorm gets too bad

Added:
    
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/AcceptAllFilter.java
    
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/ChainedFilter.java
    
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Connection.java
      - copied, changed from r949567, 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Destination.java
    
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/DenyAllFilter.java
    
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/LevelRangeFilter.java
Removed:
    
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Destination.java
    
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Logger.java
Modified:
    
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Appender.java
    
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Filter.java
    
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Level.java
    
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/LogEvent.java

Added: 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/AcceptAllFilter.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/AcceptAllFilter.java?rev=949657&view=auto
==============================================================================
--- 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/AcceptAllFilter.java
 (added)
+++ 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/AcceptAllFilter.java
 Mon May 31 03:05:04 2010
@@ -0,0 +1,76 @@
+package org.apache.logging.core;
+
+/*
+* 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.
+*/
+
+/**
+ *   This class implements  a filter that will deny all requests..
+ *
+ *  Immutable
+ */
+public final class AcceptAllFilter implements Filter {
+
+    /**
+     *  Single instance.
+     */
+    public static final AcceptAllFilter INSTANCE = new AcceptAllFilter();
+    /**
+     *  Construct new instance;
+     */
+    private AcceptAllFilter() {
+    }
+    /**
+     *  {...@inheritdoc}
+     */
+    public Result filter(Level level) {
+        return Result.ACCEPT;
+    }
+    /**
+     *  {...@inheritdoc}
+     */
+    public Result filter(Level level, Object userContext) {
+        return Result.ACCEPT;
+    }
+
+    /**
+     *  {...@inheritdoc}
+     */
+    public Result filter(Level level, Object userContext, Object message) {
+        return Result.ACCEPT;
+    }
+
+   /**
+    *  {...@inheritdoc}
+     */
+    public Result filter(LogEvent event) {
+       return Result.ACCEPT;
+   }
+
+   /**
+    *  {...@inheritdoc}
+     */
+   public int getLowerLimit() {
+       return Integer.MIN_VALUE;
+   }
+    /**
+     *  {...@inheritdoc}
+      */
+   public int getUpperLimit() {
+        return Integer.MIN_VALUE;
+   }
+
+}

Modified: 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Appender.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Appender.java?rev=949657&r1=949656&r2=949657&view=diff
==============================================================================
--- 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Appender.java
 (original)
+++ 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Appender.java
 Mon May 31 03:05:04 2010
@@ -29,15 +29,15 @@ package org.apache.logging.core;
  */
 public final class Appender {
     private final Filter filter;
-    private final Destination  destination;
+    private final Connection connection;
 
-    public Appender(final Filter filter, final Destination destination) {
-        if (filter == null || destination == null)
+    public Appender(final Filter filter, final Connection connection) {
+        if (filter == null || connection == null)
         {
             throw new NullPointerException();
         }
         this.filter = filter;
-        this.destination = destination;
+        this.connection = connection;
     }
     /**
      *
@@ -56,17 +56,17 @@ public final class Appender {
 
     /**
      *
-     *  Gets the destination associated with this appender.  The destination
+     *  Gets the connection associated with this appender.  The connection
      * would be what would distinguish an "FileAppender" from a 
"NetworkAppender".
      *
      *  @doubt not set on the name, had thought of Transport, Channel, 
EventSink, etc.
      *
      *
-     * @return destination, may not be null but may be an instance of a 
NullDestination.
+     * @return connection, may not be null but may be an instance of a 
NullConnection.
      */
-    public Destination getDestination()
+    public Connection getDestination()
     {
-        return destination;
+        return connection;
     }
 
 

Added: 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/ChainedFilter.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/ChainedFilter.java?rev=949657&view=auto
==============================================================================
--- 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/ChainedFilter.java
 (added)
+++ 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/ChainedFilter.java
 Mon May 31 03:05:04 2010
@@ -0,0 +1,97 @@
+package org.apache.logging.core;
+
+/*
+* 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.
+*/
+
+/**
+ *   The class implements a chain of two filters.
+ *
+ *  Immutable
+ */
+public final class ChainedFilter implements Filter {
+    private final Filter head;
+    private final Filter tail;
+    private final int lowerLimit;
+    private final int upperLimit;
+
+    public ChainedFilter(Filter head, Filter tail) {
+        if(head == null || tail == null) {
+            throw new NullPointerException();
+        }
+        this.head = head;
+        this.tail = tail;
+        lowerLimit = Math.min(head.getLowerLimit(), tail.getLowerLimit());
+        upperLimit = Math.max(head.getUpperLimit(), tail.getUpperLimit());
+    }
+    /**
+     *  {...@inheritdoc}
+     */
+    public Result filter(Level level) {
+        Result headResult = head.filter(level);
+        if(headResult != Filter.Result.NEUTRAL) {
+            return headResult;
+        }
+        return tail.filter(level);
+    }
+    /**
+     *  {...@inheritdoc}
+     */
+    public Result filter(Level level, Object userContext) {
+        Result headResult = head.filter(level, userContext);
+        if(headResult != Filter.Result.NEUTRAL) {
+            return headResult;
+        }
+        return tail.filter(level, userContext);
+    }
+
+    /**
+     *  {...@inheritdoc}
+     */
+    public Result filter(Level level, Object userContext, Object message) {
+        Result headResult = head.filter(level, userContext, message);
+        if(headResult != Filter.Result.NEUTRAL) {
+            return headResult;
+        }
+        return tail.filter(level, userContext, message);
+    }
+
+   /**
+    *  {...@inheritdoc}
+     */
+    public Result filter(LogEvent event) {
+       Result headResult = head.filter(event);
+       if(headResult != Filter.Result.NEUTRAL) {
+           return headResult;
+       }
+       return tail.filter(event);
+
+   }
+
+   /**
+    *  {...@inheritdoc}
+     */
+   public int getLowerLimit() {
+       return lowerLimit;
+   }
+    /**
+     *  {...@inheritdoc}
+      */
+   public int getUpperLimit() {
+       return upperLimit;
+   }
+
+}

Copied: 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Connection.java
 (from r949567, 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Destination.java)
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Connection.java?p2=logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Connection.java&p1=logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Destination.java&r1=949567&r2=949657&rev=949657&view=diff
==============================================================================
--- 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Destination.java
 (original)
+++ 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Connection.java
 Mon May 31 03:05:04 2010
@@ -1,5 +1,7 @@
 package org.apache.logging.core;
 
+import java.util.concurrent.Callable;
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -23,20 +25,26 @@ package org.apache.logging.core;
  *
  *   Implementation should be thread-safe, would be mutable.
  */
-public interface Destination {
+public interface Connection {
     /**
      *  Appends a logging event to the destination either synchronously (in 
which case
      *  it returns null) or asynchronous in which case it returns a Runnable 
to be executed.
      *
      * @param record logging record, may not be null.
-     * @return a runnable to complete the append, or null if the action was 
completed.
+     * @return a callable to complete the append, or null if the action was 
completed.
      */
-    Runnable append(LogEvent record) throws LoggingException;
+    Callable<?> append(LogEvent record) throws LoggingException;
 
     /**
      *  Closes the destination.
-     * @return a runnable to complete the close, or null if the close was 
completed.
+     * @return a callable to complete the close, or null if the close was 
completed.
      */
-    Runnable close() throws LoggingException;
+    Callable<?> close() throws LoggingException;
     
+
+    /**
+     *  Flushes the destination.
+     * @return a callable to complete the close, or null if the close was 
completed.
+     */
+    Callable<?> flush() throws LoggingException;
 }

Added: 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/DenyAllFilter.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/DenyAllFilter.java?rev=949657&view=auto
==============================================================================
--- 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/DenyAllFilter.java
 (added)
+++ 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/DenyAllFilter.java
 Mon May 31 03:05:04 2010
@@ -0,0 +1,69 @@
+package org.apache.logging.core;
+
+/*
+* 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.
+*/
+
+/**
+ *   This class implements  a filter that will deny all requests..
+ *
+ *  Immutable
+ */
+public final class DenyAllFilter implements Filter {
+
+    private DenyAllFilter() {
+    }
+    /**
+     *  {...@inheritdoc}
+     */
+    public Result filter(Level level) {
+        return Result.DENY;
+    }
+    /**
+     *  {...@inheritdoc}
+     */
+    public Result filter(Level level, Object userContext) {
+        return Result.DENY;
+    }
+
+    /**
+     *  {...@inheritdoc}
+     */
+    public Result filter(Level level, Object userContext, Object message) {
+        return Result.DENY;
+    }
+
+   /**
+    *  {...@inheritdoc}
+     */
+    public Result filter(LogEvent event) {
+       return Result.DENY;
+   }
+
+   /**
+    *  {...@inheritdoc}
+     */
+   public int getLowerLimit() {
+       return Integer.MAX_VALUE;
+   }
+    /**
+     *  {...@inheritdoc}
+      */
+   public int getUpperLimit() {
+        return Integer.MAX_VALUE;
+   }
+
+}

Modified: 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Filter.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Filter.java?rev=949657&r1=949656&r2=949657&view=diff
==============================================================================
--- 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Filter.java
 (original)
+++ 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Filter.java
 Mon May 31 03:05:04 2010
@@ -37,11 +37,38 @@ public interface Filter {
      *  the eventless decide call with a filter that does depend on the event
      *  for a determination.
      */
-    enum Result { DENY, PASS, NEUTRAL, INDETERMINANT};
+    enum Result {
+        DENY,
+        ACCEPT,
+        NEUTRAL,
+        INDETERMINANT
+    }
 
-    Result filter(int level);
+    /**
+     *  Evaluate filter for level.
+     *
+     * @param level  level, may not be null.
+     * @return result, should return INDETERMINANT is unable to determine
+     *  without additional information.
+     */
     Result filter(Level level);
+    /**
+     *  Evaluate filter for level and user-supplied context.
+     *
+     * @param level  level, may not be null.
+     * @param userContext user-supplied context, may be null.
+     * @return result, should return NDETERMINANT is unable to determine
+     *  without additional information.
+     */
     Result filter(Level level, Object userContext);
+    /**
+     *  Evaluate filter for level , user-supplied context and message.
+     *
+     * @param level  level, may not be null.
+     * @param userContext user-supplied context, may be null.
+     * @return result, should return INDETERMINANT is unable to determine
+     *  without additional information.
+     */
     Result filter(Level level, Object userContext, Object message);
 
    /**
@@ -52,17 +79,17 @@ public interface Filter {
     Result filter(LogEvent event);
 
    /**
-     *  Level value below which filter will always return DENY.
+     *  Generic level value below which filter will always return DENY.
     *  Set to Integer.MIN_VALUE if does not consider level.
     *  This method allows for level calculus to determine composite threshold.
      * @return  lowest level that could result in something other than DENY.
      */
-    int GetLowerLimit();
+    int getLowerLimit();
     /**
-      *  Level value above which filter will always return PASS.
+      *  Generic level value above which filter will always return PASS.
      *  Set to Integer.MAX_VALUE if does not consider level.
      *  This method allows for level calculus to determine composite threshold.
       * @return  highest level that could result in something other than PASS.
       */
-    int GetUpperLimit();
+    int getUpperLimit();
 }

Modified: 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Level.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Level.java?rev=949657&r1=949656&r2=949657&view=diff
==============================================================================
--- 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Level.java
 (original)
+++ 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/Level.java
 Mon May 31 03:05:04 2010
@@ -16,11 +16,22 @@ package org.apache.logging.core;
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
+/**
+ *  This interface is supported by classes that represent levels.
+ *  Logging API's typically define level classes or constant
+ *  values and some frameworks allow user defined levels.
+ *  This interface is supported by classes that map logging api
+ *  levels to a generic level value space for integer range filtering.
+ *  Filters also have access to the level object so they can distinguish
+ *  between a log4j INFO and jul INFO if desired.
+ *
+ */
 public interface Level extends Localizable {
     /**
-     * Get integer value for this level.
+     * Get integer value for this level in the generic level value space.
      * @return integer value.
      */
-    int intValue();
+    int getGenericValue();
 
 }

Added: 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/LevelRangeFilter.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/LevelRangeFilter.java?rev=949657&view=auto
==============================================================================
--- 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/LevelRangeFilter.java
 (added)
+++ 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/LevelRangeFilter.java
 Mon May 31 03:05:04 2010
@@ -0,0 +1,107 @@
+package org.apache.logging.core;
+
+/*
+* 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.
+*/
+
+/**
+ *   This class implements  a filter that will reject levels outside of
+ *   a range.
+ *
+ *  Immutable
+ */
+public final class LevelRangeFilter implements Filter {
+
+   /**
+     * minimum level (inclusive) to pass.
+     */
+    private final int levelMin;
+
+    /**
+      * maximum level (inclusive) to pass.
+      */
+    private final int levelMax;
+
+    /**
+     *    Result to return if level is within range.
+     */
+    private final Result inRange;
+
+
+    /**
+     *  Construct new instance;
+     */
+    public LevelRangeFilter(final int levelMin,
+                         final int levelMax,
+                         final boolean acceptOnMatch) {
+        if(levelMin > levelMax) {
+            throw new IllegalArgumentException("Minimum cannot be greater than 
maximum level");
+        }
+        this.levelMin = levelMin;
+        this.levelMax = levelMax;
+        if(acceptOnMatch) {
+            inRange = Result.ACCEPT;
+        } else {
+            inRange = Result.NEUTRAL;
+        }
+    }
+    /**
+     *  {...@inheritdoc}
+     */
+    public Result filter(final Level level) {
+        if(level != null) {
+            final int genericValue = level.getGenericValue();
+            if(genericValue >= levelMin && genericValue <= levelMax) {
+                return inRange;
+            }
+        }
+        return Result.DENY;
+    }
+    /**
+     *  {...@inheritdoc}
+     */
+    public Result filter(Level level, Object userContext) {
+        return filter(level);
+    }
+
+    /**
+     *  {...@inheritdoc}
+     */
+    public Result filter(Level level, Object userContext, Object message) {
+        return filter(level);
+    }
+
+   /**
+    *  {...@inheritdoc}
+     */
+    public Result filter(LogEvent event) {
+       return filter(event.getLevel());
+   }
+
+   /**
+    *  {...@inheritdoc}
+     */
+   public int getLowerLimit() {
+       return levelMin;
+   }
+    /**
+     *  {...@inheritdoc}
+      */
+   public int getUpperLimit() {
+        return Integer.MAX_VALUE;
+   }
+
+}

Modified: 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/LogEvent.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/LogEvent.java?rev=949657&r1=949656&r2=949657&view=diff
==============================================================================
--- 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/LogEvent.java
 (original)
+++ 
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/carnold/log4j2-api/src/main/java/org/apache/logging/core/LogEvent.java
 Mon May 31 03:05:04 2010
@@ -35,10 +35,11 @@ public interface LogEvent {
     Level getLevel();
 
     /**
-     * Get logger name.
-     * @return logger name, may be null.
+     * Get log name.
+     * @return log name, may be null.
      */
-    String getLoggerName();
+    String getLogName();
+
 
     /**
      * Get source of logging request.
@@ -83,14 +84,30 @@ public interface LogEvent {
 
 
     /**
-     * Get information about the context of the logging request. 
+     * Get information about the user-supplied context of the logging request.
      *
      * @return context, may be null.
      */
-    Object getContext();
+    Object getUserContext();
 
-    
+    /**
+     * Get information about the thread-associated context of the logging 
request.
+     *
+     * @return context, may be null.
+     */
+    Object getThreadContext();
 
+    /**
+     * Get information about the calling context of the logging request.
+     *
+     * @return context, may be null.
+     */
+    Object getCallingContext();
 
-    
+    /**
+     * Get information about the application context of the logging request.
+     *
+     * @return context, may be null.
+     */
+    Object getApplicationContext();
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to