Author: rpopma
Date: Sun Apr 28 20:39:58 2013
New Revision: 1476831
URL: http://svn.apache.org/r1476831
Log:
moved Clock interface, ClockFactory and Clock impl classes from async to
helpers, moved Assert from jmx to helpers
Added:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Assert.java
- copied, changed from r1476797,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Assert.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CachedClock.java
- copied, changed from r1476755,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/CachedClock.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Clock.java
- copied, changed from r1476755,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/Clock.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/ClockFactory.java
- copied, changed from r1476755,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/ClockFactory.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CoarseCachedClock.java
- copied, changed from r1476755,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/CoarseCachedClock.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/SystemClock.java
- copied, changed from r1476755,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/SystemClock.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/CachedClockTest.java
- copied, changed from r1476755,
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/CachedClockTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/ClockFactoryTest.java
- copied, changed from r1476755,
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/ClockFactoryTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/SystemClockTest.java
- copied, changed from r1476755,
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/SystemClockTest.java
Removed:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/CachedClock.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/Clock.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/ClockFactory.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/CoarseCachedClock.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/SystemClock.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Assert.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/CachedClockTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/ClockFactoryTest.java
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/SystemClockTest.java
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Client.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientGUI.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdmin.java
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java
logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java?rev=1476831&r1=1476830&r2=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
Sun Apr 28 20:39:58 2013
@@ -34,8 +34,8 @@ import org.apache.logging.log4j.core.con
import org.apache.logging.log4j.core.config.DefaultConfiguration;
import org.apache.logging.log4j.core.config.NullConfiguration;
import org.apache.logging.log4j.core.config.Reconfigurable;
+import org.apache.logging.log4j.core.helpers.Assert;
import org.apache.logging.log4j.core.helpers.NetUtils;
-import org.apache.logging.log4j.core.jmx.Assert;
import org.apache.logging.log4j.message.MessageFactory;
import org.apache.logging.log4j.spi.AbstractLogger;
import org.apache.logging.log4j.status.StatusLogger;
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java?rev=1476831&r1=1476830&r2=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
Sun Apr 28 20:39:58 2013
@@ -26,6 +26,8 @@ import org.apache.logging.log4j.ThreadCo
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Property;
+import org.apache.logging.log4j.core.helpers.Clock;
+import org.apache.logging.log4j.core.helpers.ClockFactory;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.message.MessageFactory;
Copied:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Assert.java
(from r1476797,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Assert.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Assert.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Assert.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Assert.java&r1=1476797&r2=1476831&rev=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Assert.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Assert.java
Sun Apr 28 20:39:58 2013
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.core.jmx;
+package org.apache.logging.log4j.core.helpers;
/**
* Utility class providing common validation logic.
Copied:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CachedClock.java
(from r1476755,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/CachedClock.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CachedClock.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CachedClock.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/CachedClock.java&r1=1476755&r2=1476831&rev=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/CachedClock.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CachedClock.java
Sun Apr 28 20:39:58 2013
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.core.async;
+package org.apache.logging.log4j.core.helpers;
import com.lmax.disruptor.util.Util;
Copied:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Clock.java
(from r1476755,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/Clock.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Clock.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Clock.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/Clock.java&r1=1476755&r2=1476831&rev=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/Clock.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/Clock.java
Sun Apr 28 20:39:58 2013
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.core.async;
+package org.apache.logging.log4j.core.helpers;
/**
* Interface for classes that can provide the time stamp used in log events.
Copied:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/ClockFactory.java
(from r1476755,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/ClockFactory.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/ClockFactory.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/ClockFactory.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/ClockFactory.java&r1=1476755&r2=1476831&rev=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/ClockFactory.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/ClockFactory.java
Sun Apr 28 20:39:58 2013
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.core.async;
+package org.apache.logging.log4j.core.helpers;
import org.apache.logging.log4j.status.StatusLogger;
@@ -27,7 +27,7 @@ public final class ClockFactory {
* Name of the system property that can be used to specify a {@code Clock}
* implementation class.
*/
- public static final String PROPERTY_NAME = "AsyncLogger.Clock";
+ public static final String PROPERTY_NAME = "log4j.Clock";
private static final StatusLogger LOGGER = StatusLogger.getLogger();
// private static final Clock clock = createClock();
Copied:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CoarseCachedClock.java
(from r1476755,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/CoarseCachedClock.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CoarseCachedClock.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CoarseCachedClock.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/CoarseCachedClock.java&r1=1476755&r2=1476831&rev=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/CoarseCachedClock.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/CoarseCachedClock.java
Sun Apr 28 20:39:58 2013
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.core.async;
+package org.apache.logging.log4j.core.helpers;
import com.lmax.disruptor.util.Util;
Copied:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/SystemClock.java
(from r1476755,
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/SystemClock.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/SystemClock.java?p2=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/SystemClock.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/SystemClock.java&r1=1476755&r2=1476831&rev=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/SystemClock.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/helpers/SystemClock.java
Sun Apr 28 20:39:58 2013
@@ -14,7 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.core.async;
+package org.apache.logging.log4j.core.helpers;
/**
* Implementation of the {@code Clock} interface that returns the system time.
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java?rev=1476831&r1=1476830&r2=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java
Sun Apr 28 20:39:58 2013
@@ -19,6 +19,7 @@ package org.apache.logging.log4j.core.jm
import javax.management.ObjectName;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.helpers.Assert;
/**
* Implementation of the {@code AppenderAdminMBean} interface.
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Client.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Client.java?rev=1476831&r1=1476830&r2=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Client.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Client.java
Sun Apr 28 20:39:58 2013
@@ -27,6 +27,8 @@ import javax.management.MalformedObjectN
import javax.management.ObjectName;
import javax.management.remote.JMXConnector;
+import org.apache.logging.log4j.core.helpers.Assert;
+
/**
* This class allows client-side code to perform operations on remote
* (server-side) MBeans via proxies.
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientGUI.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientGUI.java?rev=1476831&r1=1476830&r2=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientGUI.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientGUI.java
Sun Apr 28 20:39:58 2013
@@ -44,6 +44,8 @@ import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.UIManager.LookAndFeelInfo;
+import org.apache.logging.log4j.core.helpers.Assert;
+
/**
* GUI that connects to a Java process via JMX and allows the user to view and
* modify the log4j2 configuration, as well as monitor status logs.
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java?rev=1476831&r1=1476830&r2=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java
Sun Apr 28 20:39:58 2013
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.jm
import javax.management.ObjectName;
+import org.apache.logging.log4j.core.helpers.Assert;
import org.apache.logging.log4j.core.selector.ContextSelector;
/**
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdmin.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdmin.java?rev=1476831&r1=1476830&r2=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdmin.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerConfigAdmin.java
Sun Apr 28 20:39:58 2013
@@ -23,6 +23,7 @@ import javax.management.ObjectName;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.config.AppenderRef;
import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.apache.logging.log4j.core.helpers.Assert;
/**
* Implementation of the {@code LoggerConfigAdminMBean} interface.
Modified:
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java?rev=1476831&r1=1476830&r2=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java
Sun Apr 28 20:39:58 2013
@@ -41,6 +41,7 @@ import org.apache.logging.log4j.core.Log
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import
org.apache.logging.log4j.core.config.ConfigurationFactory.ConfigurationSource;
+import org.apache.logging.log4j.core.helpers.Assert;
import org.apache.logging.log4j.status.StatusLogger;
/**
Copied:
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/CachedClockTest.java
(from r1476755,
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/CachedClockTest.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/CachedClockTest.java?p2=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/CachedClockTest.java&p1=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/CachedClockTest.java&r1=1476755&r2=1476831&rev=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/CachedClockTest.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/CachedClockTest.java
Sun Apr 28 20:39:58 2013
@@ -14,11 +14,11 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.core.async;
+package org.apache.logging.log4j.core.helpers;
import static org.junit.Assert.*;
-import org.apache.logging.log4j.core.async.CachedClock;
+import org.apache.logging.log4j.core.helpers.CachedClock;
import org.junit.Test;
public class CachedClockTest {
Copied:
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/ClockFactoryTest.java
(from r1476755,
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/ClockFactoryTest.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/ClockFactoryTest.java?p2=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/ClockFactoryTest.java&p1=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/ClockFactoryTest.java&r1=1476755&r2=1476831&rev=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/ClockFactoryTest.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/ClockFactoryTest.java
Sun Apr 28 20:39:58 2013
@@ -14,15 +14,15 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.core.async;
+package org.apache.logging.log4j.core.helpers;
import static org.junit.Assert.*;
-import org.apache.logging.log4j.core.async.CachedClock;
-import org.apache.logging.log4j.core.async.Clock;
-import org.apache.logging.log4j.core.async.ClockFactory;
-import org.apache.logging.log4j.core.async.CoarseCachedClock;
-import org.apache.logging.log4j.core.async.SystemClock;
+import org.apache.logging.log4j.core.helpers.CachedClock;
+import org.apache.logging.log4j.core.helpers.Clock;
+import org.apache.logging.log4j.core.helpers.ClockFactory;
+import org.apache.logging.log4j.core.helpers.CoarseCachedClock;
+import org.apache.logging.log4j.core.helpers.SystemClock;
import org.junit.Test;
public class ClockFactoryTest {
Copied:
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/SystemClockTest.java
(from r1476755,
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/SystemClockTest.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/SystemClockTest.java?p2=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/SystemClockTest.java&p1=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/SystemClockTest.java&r1=1476755&r2=1476831&rev=1476831&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/SystemClockTest.java
(original)
+++
logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/helpers/SystemClockTest.java
Sun Apr 28 20:39:58 2013
@@ -14,11 +14,11 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.logging.log4j.core.async;
+package org.apache.logging.log4j.core.helpers;
import static org.junit.Assert.*;
-import org.apache.logging.log4j.core.async.SystemClock;
+import org.apache.logging.log4j.core.helpers.SystemClock;
import org.junit.Test;
public class SystemClockTest {
Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml?rev=1476831&r1=1476830&r2=1476831&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/async.xml Sun Apr 28
20:39:58 2013
@@ -274,13 +274,13 @@
</td>
</tr>
<tr>
- <td>AsyncLogger.Clock</td>
+ <td>log4j.Clock</td>
<td>
<tt>SystemClock</tt>
</td>
<td>
Implementation of the
-
<tt>org.apache.logging.log4j.core.async.Clock</tt>
+
<tt>org.apache.logging.log4j.core.helpers.Clock</tt>
interface that is used
for timestamping the log
events when all loggers
are asynchronous.
<br />
