Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java Tue May 13 19:33:08 2014 @@ -31,7 +31,7 @@ import org.apache.logging.log4j.LogManag import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.appender.AppenderLoggingException; import org.apache.logging.log4j.core.config.ConfigurationFactory; -import org.apache.logging.log4j.core.helpers.Constants; +import org.apache.logging.log4j.core.util.Constants; import org.junit.BeforeClass; import org.junit.Test;
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java Tue May 13 19:33:08 2014 @@ -22,9 +22,8 @@ import org.apache.logging.log4j.MarkerMa import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.Logger; - -import org.apache.logging.log4j.core.helpers.Constants; import org.apache.logging.log4j.core.impl.Log4jLogEvent; +import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.message.SimpleMessage; import org.junit.Before; import org.junit.Test; Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverterTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverterTest.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverterTest.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementConverterTest.java Tue May 13 19:33:08 2014 @@ -21,8 +21,8 @@ import org.apache.logging.log4j.LogManag import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.helpers.Constants; import org.apache.logging.log4j.core.impl.Log4jLogEvent; +import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.message.SimpleMessage; import org.junit.Test; Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java Tue May 13 19:33:08 2014 @@ -29,7 +29,7 @@ import org.apache.logging.log4j.core.App import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; -import org.apache.logging.log4j.core.helpers.Constants; +import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.test.appender.ListAppender; import org.junit.AfterClass; Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java Tue May 13 19:33:08 2014 @@ -22,7 +22,7 @@ import static org.junit.Assert.assertTru import java.util.List; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.helpers.Constants; +import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.junit.InitialLoggerContext; import org.apache.logging.log4j.test.appender.ListAppender; import org.junit.*; Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java Tue May 13 19:33:08 2014 @@ -17,7 +17,7 @@ package org.apache.logging.log4j.core.util; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.helpers.Loader; +import org.apache.logging.log4j.core.util.Loader; import org.apache.logging.log4j.status.StatusLogger; /** Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/test/layout/BasicLayout.java Tue May 13 19:33:08 2014 @@ -19,9 +19,9 @@ package org.apache.logging.log4j.test.la import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginFactory; -import org.apache.logging.log4j.core.helpers.Charsets; -import org.apache.logging.log4j.core.helpers.Constants; import org.apache.logging.log4j.core.layout.AbstractStringLayout; +import org.apache.logging.log4j.core.util.Charsets; +import org.apache.logging.log4j.core.util.Constants; import java.nio.charset.Charset; import java.util.HashMap; Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java (original) +++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/Agent.java Tue May 13 19:33:08 2014 @@ -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.PluginAttribute; import org.apache.logging.log4j.core.config.plugins.PluginFactory; -import org.apache.logging.log4j.core.helpers.Integers; +import org.apache.logging.log4j.core.util.Integers; import org.apache.logging.log4j.status.StatusLogger; /** Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java (original) +++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java Tue May 13 19:33:08 2014 @@ -28,9 +28,9 @@ import org.apache.logging.log4j.core.con import org.apache.logging.log4j.core.config.plugins.PluginAttribute; import org.apache.logging.log4j.core.config.plugins.PluginElement; import org.apache.logging.log4j.core.config.plugins.PluginFactory; -import org.apache.logging.log4j.core.helpers.Booleans; -import org.apache.logging.log4j.core.helpers.Integers; import org.apache.logging.log4j.core.layout.RFC5424Layout; +import org.apache.logging.log4j.core.util.Booleans; +import org.apache.logging.log4j.core.util.Integers; /** * An Appender that uses the Avro protocol to route events to Flume. Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java (original) +++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedManager.java Tue May 13 19:33:08 2014 @@ -27,7 +27,7 @@ import org.apache.logging.log4j.LoggingE import org.apache.logging.log4j.core.appender.ManagerFactory; import org.apache.logging.log4j.core.config.ConfigurationException; import org.apache.logging.log4j.core.config.Property; -import org.apache.logging.log4j.core.helpers.NameUtil; +import org.apache.logging.log4j.core.util.NameUtil; import org.apache.logging.log4j.util.PropertiesUtil; import org.apache.logging.log4j.util.Strings; Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java (original) +++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java Tue May 13 19:33:08 2014 @@ -30,9 +30,9 @@ import org.apache.logging.log4j.LoggingE import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.core.LogEvent; -import org.apache.logging.log4j.core.helpers.Patterns; -import org.apache.logging.log4j.core.helpers.UUIDUtil; import org.apache.logging.log4j.core.impl.ThrowableProxy; +import org.apache.logging.log4j.core.util.Patterns; +import org.apache.logging.log4j.core.util.UUIDUtil; import org.apache.logging.log4j.message.MapMessage; import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.StructuredDataId; Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java (original) +++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java Tue May 13 19:33:08 2014 @@ -43,8 +43,8 @@ import org.apache.logging.log4j.core.app import org.apache.logging.log4j.core.config.Property; import org.apache.logging.log4j.core.config.plugins.util.PluginManager; import org.apache.logging.log4j.core.config.plugins.util.PluginType; -import org.apache.logging.log4j.core.helpers.FileUtils; -import org.apache.logging.log4j.core.helpers.SecretKeyProvider; +import org.apache.logging.log4j.core.util.FileUtils; +import org.apache.logging.log4j.core.util.SecretKeyProvider; import org.apache.logging.log4j.util.Strings; import com.sleepycat.je.Cursor; Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/test/FlumeKeyProvider.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/test/FlumeKeyProvider.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/test/FlumeKeyProvider.java (original) +++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/test/FlumeKeyProvider.java Tue May 13 19:33:08 2014 @@ -17,7 +17,7 @@ package org.apache.logging.log4j.flume.test; import org.apache.logging.log4j.core.config.plugins.Plugin; -import org.apache.logging.log4j.core.helpers.SecretKeyProvider; +import org.apache.logging.log4j.core.util.SecretKeyProvider; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; Modified: logging/log4j/log4j2/trunk/log4j-jcl/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-jcl/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-jcl/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java (original) +++ logging/log4j/log4j2/trunk/log4j-jcl/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java Tue May 13 19:33:08 2014 @@ -29,7 +29,7 @@ import org.apache.logging.log4j.LogManag import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; -import org.apache.logging.log4j.core.helpers.Constants; +import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.test.appender.ListAppender; import org.junit.AfterClass; Modified: logging/log4j/log4j2/trunk/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java (original) +++ logging/log4j/log4j2/trunk/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java Tue May 13 19:33:08 2014 @@ -28,10 +28,10 @@ import javax.management.MalformedObjectN import javax.management.ObjectName; import javax.management.remote.JMXConnector; -import org.apache.logging.log4j.core.helpers.Assert; import org.apache.logging.log4j.core.jmx.LoggerContextAdminMBean; import org.apache.logging.log4j.core.jmx.Server; import org.apache.logging.log4j.core.jmx.StatusLoggerAdminMBean; +import org.apache.logging.log4j.core.util.Assert; /** * This class allows client-side code to perform operations on remote Modified: logging/log4j/log4j2/trunk/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java (original) +++ logging/log4j/log4j2/trunk/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java Tue May 13 19:33:08 2014 @@ -53,10 +53,10 @@ import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.UIManager.LookAndFeelInfo; -import org.apache.logging.log4j.core.helpers.Assert; import org.apache.logging.log4j.core.jmx.LoggerContextAdminMBean; import org.apache.logging.log4j.core.jmx.Server; import org.apache.logging.log4j.core.jmx.StatusLoggerAdminMBean; +import org.apache.logging.log4j.core.util.Assert; /** * Swing GUI that connects to a Java process via JMX and allows the user to view Modified: logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java (original) +++ logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java Tue May 13 19:33:08 2014 @@ -17,7 +17,7 @@ package org.apache.logging.log4j.samples.dto; import org.apache.logging.log4j.ThreadContext; -import org.apache.logging.log4j.core.helpers.UUIDUtil; +import org.apache.logging.log4j.core.util.UUIDUtil; /** * Modified: logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java (original) +++ logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java Tue May 13 19:33:08 2014 @@ -28,7 +28,7 @@ import org.apache.logging.log4j.LogManag import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; -import org.apache.logging.log4j.core.helpers.Constants; +import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.test.appender.ListAppender; import org.junit.AfterClass; Modified: logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java?rev=1594342&r1=1594341&r2=1594342&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java (original) +++ logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java Tue May 13 19:33:08 2014 @@ -27,7 +27,7 @@ import org.apache.logging.log4j.LogManag import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; -import org.apache.logging.log4j.core.helpers.Constants; +import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.test.appender.ListAppender; import org.junit.AfterClass;
