Moved BasicMarker.java, BasicMarkerTest.java, BasicMarkerFactory.java, MarkerIgnoringBase.java, MessageFormatter.java and Util.java to the org.slf4j.helpers package.
Updated other modules classes accordingly
diff --git a/slf4j-api/src/main/java/org/slf4j/impl/BasicMarker.java b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java
similarity index 99%
rename from slf4j-api/src/main/java/org/slf4j/impl/BasicMarker.java
rename to slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java
index 6a2a9d9..356c27f 100644
--- a/slf4j-api/src/main/java/org/slf4j/impl/BasicMarker.java
+++ b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarker.java
@@ -31,7 +31,7 @@
*
*/
-package org.slf4j.impl;
+package org.slf4j.helpers;
import java.util.Collections;
import java.util.Iterator;
diff --git a/slf4j-api/src/main/java/org/slf4j/impl/BasicMarkerFactory.java b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarkerFactory.java
similarity index 98%
rename from slf4j-api/src/main/java/org/slf4j/impl/BasicMarkerFactory.java
rename to slf4j-api/src/main/java/org/slf4j/helpers/BasicMarkerFactory.java
index a5aacd7..b5c9f29 100644
--- a/slf4j-api/src/main/java/org/slf4j/impl/BasicMarkerFactory.java
+++ b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMarkerFactory.java
@@ -31,7 +31,7 @@
*
*/
-package org.slf4j.impl;
+package org.slf4j.helpers;
import java.util.HashMap;
import java.util.Map;
diff --git a/slf4j-api/src/main/java/org/slf4j/impl/MarkerIgnoringBase.java b/slf4j-api/src/main/java/org/slf4j/helpers/MarkerIgnoringBase.java
similarity index 99%
rename from slf4j-api/src/main/java/org/slf4j/impl/MarkerIgnoringBase.java
rename to slf4j-api/src/main/java/org/slf4j/helpers/MarkerIgnoringBase.java
index 3330415..4af9ae0 100644
--- a/slf4j-api/src/main/java/org/slf4j/impl/MarkerIgnoringBase.java
+++ b/slf4j-api/src/main/java/org/slf4j/helpers/MarkerIgnoringBase.java
@@ -31,7 +31,7 @@
*
*/
-package org.slf4j.impl;
+package org.slf4j.helpers;
import org.slf4j.Logger;
import org.slf4j.Marker;
diff --git a/slf4j-api/src/main/java/org/slf4j/impl/MessageFormatter.java b/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
similarity index 99%
rename from slf4j-api/src/main/java/org/slf4j/impl/MessageFormatter.java
rename to slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
index 12a49b8..a0775f0 100644
--- a/slf4j-api/src/main/java/org/slf4j/impl/MessageFormatter.java
+++ b/slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java
@@ -31,7 +31,7 @@
*
*/
-package org.slf4j.impl;
+package org.slf4j.helpers;
/**
diff --git a/slf4j-api/src/main/java/org/slf4j/impl/Util.java b/slf4j-api/src/main/java/org/slf4j/helpers/Util.java
similarity index 98%
rename from slf4j-api/src/main/java/org/slf4j/impl/Util.java
rename to slf4j-api/src/main/java/org/slf4j/helpers/Util.java
index 10dff93..7b9d8d8 100644
--- a/slf4j-api/src/main/java/org/slf4j/impl/Util.java
+++ b/slf4j-api/src/main/java/org/slf4j/helpers/Util.java
@@ -31,7 +31,7 @@
*
*/
-package org.slf4j.impl;
+package org.slf4j.helpers;
/**
diff --git a/slf4j-api/src/main/java/org/slf4j/impl/package.html b/slf4j-api/src/main/java/org/slf4j/helpers/package.html
similarity index 100%
rename from slf4j-api/src/main/java/org/slf4j/impl/package.html
rename to slf4j-api/src/main/java/org/slf4j/helpers/package.html
diff --git a/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java b/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java
index bb72f5c..6cda886 100644
--- a/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java
+++ b/slf4j-api/src/test/java/org/slf4j/BasicMarkerTest.java
@@ -34,7 +34,7 @@
import junit.framework.TestCase;
-import org.slf4j.impl.BasicMarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
/**
diff --git a/slf4j-api/src/test/java/org/slf4j/impl/MessageFormatterTest.java b/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java
similarity index 98%
rename from slf4j-api/src/test/java/org/slf4j/impl/MessageFormatterTest.java
rename to slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java
index a240233..7eeaffb 100644
--- a/slf4j-api/src/test/java/org/slf4j/impl/MessageFormatterTest.java
+++ b/slf4j-api/src/test/java/org/slf4j/helpers/MessageFormatterTest.java
@@ -31,9 +31,9 @@
*
*/
-package org.slf4j.impl;
+package org.slf4j.helpers;
-import org.slf4j.impl.MessageFormatter;
+import org.slf4j.helpers.MessageFormatter;
import junit.framework.TestCase;
diff --git a/slf4j-jcl/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-jcl/src/main/java/org/slf4j/LoggerFactory.java
index 1257f79..cf81ed9 100644
--- a/slf4j-jcl/src/main/java/org/slf4j/LoggerFactory.java
+++ b/slf4j-jcl/src/main/java/org/slf4j/LoggerFactory.java
@@ -32,8 +32,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticLoggerBinder;
-import org.slf4j.impl.Util;
/**
* The <code>LoggerFactory</code> is a utility class producing Loggers for
diff --git a/slf4j-jcl/src/main/java/org/slf4j/MarkerFactory.java b/slf4j-jcl/src/main/java/org/slf4j/MarkerFactory.java
index 36b6778..ab0ed2c 100644
--- a/slf4j-jcl/src/main/java/org/slf4j/MarkerFactory.java
+++ b/slf4j-jcl/src/main/java/org/slf4j/MarkerFactory.java
@@ -31,8 +31,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticMarkerBinder;
-import org.slf4j.impl.Util;
/**
* MarkerFactory is a utility class producing {@link Marker} instances as
diff --git a/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerAdapter.java b/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerAdapter.java
index 320cf5d..528bb30 100644
--- a/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerAdapter.java
+++ b/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerAdapter.java
@@ -35,6 +35,8 @@
import org.apache.commons.logging.Log;
import org.slf4j.Logger;
+import org.slf4j.helpers.MarkerIgnoringBase;
+import org.slf4j.helpers.MessageFormatter;
/**
* A wrapper over {@link org.apache.commons.logging.Log
diff --git a/slf4j-jcl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/slf4j-jcl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
index 9a4534c..b37c364 100644
--- a/slf4j-jcl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
+++ b/slf4j-jcl/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
@@ -35,6 +35,7 @@
import org.slf4j.IMarkerFactory;
import org.slf4j.MarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
import org.slf4j.spi.MarkerFactoryBinder;
/**
diff --git a/slf4j-jdk14/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-jdk14/src/main/java/org/slf4j/LoggerFactory.java
index 1257f79..cf81ed9 100644
--- a/slf4j-jdk14/src/main/java/org/slf4j/LoggerFactory.java
+++ b/slf4j-jdk14/src/main/java/org/slf4j/LoggerFactory.java
@@ -32,8 +32,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticLoggerBinder;
-import org.slf4j.impl.Util;
/**
* The <code>LoggerFactory</code> is a utility class producing Loggers for
diff --git a/slf4j-jdk14/src/main/java/org/slf4j/MarkerFactory.java b/slf4j-jdk14/src/main/java/org/slf4j/MarkerFactory.java
index 36b6778..ab0ed2c 100644
--- a/slf4j-jdk14/src/main/java/org/slf4j/MarkerFactory.java
+++ b/slf4j-jdk14/src/main/java/org/slf4j/MarkerFactory.java
@@ -31,8 +31,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticMarkerBinder;
-import org.slf4j.impl.Util;
/**
* MarkerFactory is a utility class producing {@link Marker} instances as
diff --git a/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java b/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java
index 0254cfa..586e7b7 100644
--- a/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java
+++ b/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java
@@ -38,6 +38,8 @@
import org.slf4j.Logger;
import org.slf4j.Marker;
+import org.slf4j.helpers.MarkerIgnoringBase;
+import org.slf4j.helpers.MessageFormatter;
import org.slf4j.spi.LocationAwareLogger;
/**
diff --git a/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
index 9a4534c..b37c364 100644
--- a/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
+++ b/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
@@ -35,6 +35,7 @@
import org.slf4j.IMarkerFactory;
import org.slf4j.MarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
import org.slf4j.spi.MarkerFactoryBinder;
/**
diff --git a/slf4j-log4j12/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-log4j12/src/main/java/org/slf4j/LoggerFactory.java
index 1257f79..cf81ed9 100644
--- a/slf4j-log4j12/src/main/java/org/slf4j/LoggerFactory.java
+++ b/slf4j-log4j12/src/main/java/org/slf4j/LoggerFactory.java
@@ -32,8 +32,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticLoggerBinder;
-import org.slf4j.impl.Util;
/**
* The <code>LoggerFactory</code> is a utility class producing Loggers for
diff --git a/slf4j-log4j12/src/main/java/org/slf4j/MarkerFactory.java b/slf4j-log4j12/src/main/java/org/slf4j/MarkerFactory.java
index 36b6778..ab0ed2c 100644
--- a/slf4j-log4j12/src/main/java/org/slf4j/MarkerFactory.java
+++ b/slf4j-log4j12/src/main/java/org/slf4j/MarkerFactory.java
@@ -31,8 +31,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticMarkerBinder;
-import org.slf4j.impl.Util;
/**
* MarkerFactory is a utility class producing {@link Marker} instances as
diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java
index cc30a0b..c43a890 100644
--- a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java
+++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java
@@ -37,6 +37,8 @@
import org.apache.log4j.Level;
import org.slf4j.Logger;
import org.slf4j.Marker;
+import org.slf4j.helpers.MarkerIgnoringBase;
+import org.slf4j.helpers.MessageFormatter;
import org.slf4j.spi.LocationAwareLogger;
diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
index 9a4534c..b37c364 100644
--- a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
+++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
@@ -35,6 +35,7 @@
import org.slf4j.IMarkerFactory;
import org.slf4j.MarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
import org.slf4j.spi.MarkerFactoryBinder;
/**
diff --git a/slf4j-nop/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-nop/src/main/java/org/slf4j/LoggerFactory.java
index 1257f79..cf81ed9 100644
--- a/slf4j-nop/src/main/java/org/slf4j/LoggerFactory.java
+++ b/slf4j-nop/src/main/java/org/slf4j/LoggerFactory.java
@@ -32,8 +32,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticLoggerBinder;
-import org.slf4j.impl.Util;
/**
* The <code>LoggerFactory</code> is a utility class producing Loggers for
diff --git a/slf4j-nop/src/main/java/org/slf4j/MarkerFactory.java b/slf4j-nop/src/main/java/org/slf4j/MarkerFactory.java
index 36b6778..ab0ed2c 100644
--- a/slf4j-nop/src/main/java/org/slf4j/MarkerFactory.java
+++ b/slf4j-nop/src/main/java/org/slf4j/MarkerFactory.java
@@ -31,8 +31,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticMarkerBinder;
-import org.slf4j.impl.Util;
/**
* MarkerFactory is a utility class producing {@link Marker} instances as
diff --git a/slf4j-nop/src/main/java/org/slf4j/impl/NOPLogger.java b/slf4j-nop/src/main/java/org/slf4j/impl/NOPLogger.java
index d2061a1..abd1cd6 100644
--- a/slf4j-nop/src/main/java/org/slf4j/impl/NOPLogger.java
+++ b/slf4j-nop/src/main/java/org/slf4j/impl/NOPLogger.java
@@ -34,6 +34,7 @@
package org.slf4j.impl;
import org.slf4j.Logger;
+import org.slf4j.helpers.MarkerIgnoringBase;
/**
diff --git a/slf4j-nop/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/slf4j-nop/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
index 9a4534c..b37c364 100644
--- a/slf4j-nop/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
+++ b/slf4j-nop/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
@@ -35,6 +35,7 @@
import org.slf4j.IMarkerFactory;
import org.slf4j.MarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
import org.slf4j.spi.MarkerFactoryBinder;
/**
diff --git a/slf4j-simple/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-simple/src/main/java/org/slf4j/LoggerFactory.java
index 1257f79..cf81ed9 100644
--- a/slf4j-simple/src/main/java/org/slf4j/LoggerFactory.java
+++ b/slf4j-simple/src/main/java/org/slf4j/LoggerFactory.java
@@ -32,8 +32,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticLoggerBinder;
-import org.slf4j.impl.Util;
/**
* The <code>LoggerFactory</code> is a utility class producing Loggers for
diff --git a/slf4j-simple/src/main/java/org/slf4j/MarkerFactory.java b/slf4j-simple/src/main/java/org/slf4j/MarkerFactory.java
index 36b6778..ab0ed2c 100644
--- a/slf4j-simple/src/main/java/org/slf4j/MarkerFactory.java
+++ b/slf4j-simple/src/main/java/org/slf4j/MarkerFactory.java
@@ -31,8 +31,8 @@
*/
package org.slf4j;
+import org.slf4j.helpers.Util;
import org.slf4j.impl.StaticMarkerBinder;
-import org.slf4j.impl.Util;
/**
* MarkerFactory is a utility class producing {@link Marker} instances as
diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java
index 89f18f8..6655b01 100644
--- a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java
+++ b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java
@@ -33,6 +33,9 @@
package org.slf4j.impl;
+import org.slf4j.helpers.MarkerIgnoringBase;
+import org.slf4j.helpers.MessageFormatter;
+
/**
* A simple (and direct) implementation that logs messages of level
* INFO or higher on the console (<code>System.err<code>).
diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/StaticMarkerBinder.java b/slf4j-simple/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
index 9a4534c..b37c364 100644
--- a/slf4j-simple/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
+++ b/slf4j-simple/src/main/java/org/slf4j/impl/StaticMarkerBinder.java
@@ -35,6 +35,7 @@
import org.slf4j.IMarkerFactory;
import org.slf4j.MarkerFactory;
+import org.slf4j.helpers.BasicMarkerFactory;
import org.slf4j.spi.MarkerFactoryBinder;
/**
