LOG4J2-2621 - Initial commit

Author: rgoers

log4j-1.2-api/src/main/java/org/apache/log4j/Category.java

@@ -27,7 +27,7 @@
 import org.apache.log4j.spi.LoggerFactory;
 import org.apache.log4j.spi.LoggingEvent;
 import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.util.NameUtil;
+import org.apache.logging.log4j.util.NameUtil;
 import org.apache.logging.log4j.message.LocalizedMessage;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.ObjectMessage;

log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java

@@ -23,13 +23,13 @@
 
 import org.apache.logging.log4j.core.Layout;
 import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.config.Node;
-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.layout.AbstractStringLayout;
 import org.apache.logging.log4j.core.layout.ByteBufferDestination;
 import org.apache.logging.log4j.core.util.Transform;
+import org.apache.logging.log4j.plugins.Node;
+import org.apache.logging.log4j.plugins.Plugin;
+import org.apache.logging.log4j.plugins.PluginAttribute;
+import org.apache.logging.log4j.plugins.PluginFactory;
 import org.apache.logging.log4j.util.BiConsumer;
 import org.apache.logging.log4j.util.ReadOnlyStringMap;
 import org.apache.logging.log4j.util.Strings;

log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1MdcPatternConverter.java

@@ -17,7 +17,7 @@
 package org.apache.log4j.pattern;
 
 import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.plugins.Plugin;
 import org.apache.logging.log4j.core.pattern.ConverterKeys;
 import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
 import org.apache.logging.log4j.core.pattern.PatternConverter;

log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java

@@ -17,7 +17,7 @@
 package org.apache.log4j.pattern;
 
 import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.plugins.Plugin;
 import org.apache.logging.log4j.core.pattern.ConverterKeys;
 import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
 import org.apache.logging.log4j.core.pattern.PatternConverter;

log4j-api/src/main/java/org/apache/logging/log4j/util/Assert.java

@@ -14,7 +14,7 @@
  * See the license for the specific language governing permissions and
  * limitations under the license.
  */
-package org.apache.logging.log4j.core.util;
+package org.apache.logging.log4j.util;
 
 import java.util.Collection;
 import java.util.Map;

log4j-api/src/main/java/org/apache/logging/log4j/util/InternalException.java

@@ -14,15 +14,13 @@
  * See the license for the specific language governing permissions and
  * limitations under the license.
  */
-package org.apache.logging.log4j;
+package org.apache.logging.log4j.util;
 
 /**
- * Exception thrown when an error occurs while logging.  In most cases exceptions will be handled
- * within Log4j but certain Appenders may be configured to allow exceptions to propagate to the
- * application. This is a RuntimeException so that the exception may be thrown in those cases without
- * requiring all Logger methods be contained with try/catch blocks.
+ * Exception thrown when an error occurs while accessing internal resources. This is generally used to
+ * convert checked exceptions to runtime exceptions.
  */
-public class LoggingException extends RuntimeException {
+public class InternalException extends RuntimeException {
 
     private static final long serialVersionUID = 6366395965071580537L;
 
@@ -31,7 +29,7 @@ public class LoggingException extends RuntimeException {
      *
      * @param message The reason for the exception
      */
-    public LoggingException(final String message) {
+    public InternalException(final String message) {
         super(message);
     }
 
@@ -41,7 +39,7 @@ public LoggingException(final String message) {
      * @param message The reason for the exception
      * @param cause The underlying cause of the exception
      */
-    public LoggingException(final String message, final Throwable cause) {
+    public InternalException(final String message, final Throwable cause) {
         super(message, cause);
     }
 
@@ -50,7 +48,7 @@ public LoggingException(final String message, final Throwable cause) {
      *
      * @param cause The underlying cause of the exception
      */
-    public LoggingException(final Throwable cause) {
+    public InternalException(final Throwable cause) {
         super(cause);
     }
 }

log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java

@@ -76,6 +76,26 @@ public final class LoaderUtil {
     private LoaderUtil() {
     }
 
+    /**
+     * Returns the ClassLoader to use.
+     * @return the ClassLoader.
+     */
+    public static ClassLoader getClassLoader() {
+        return getClassLoader(LoaderUtil.class, null);
+    }
+
+    // TODO: this method could use some explanation
+    public static ClassLoader getClassLoader(final Class<?> class1, final Class<?> class2) {
+        final ClassLoader threadContextClassLoader = getThreadContextClassLoader();
+        final ClassLoader loader1 = class1 == null ? null : class1.getClassLoader();
+        final ClassLoader loader2 = class2 == null ? null : class2.getClassLoader();
+
+        if (isChild(threadContextClassLoader, loader1)) {
+            return isChild(threadContextClassLoader, loader2) ? threadContextClassLoader : loader2;
+        }
+        return isChild(loader1, loader2) ? loader1 : loader2;
+    }
+
     /**
      * Gets the current Thread ClassLoader. Returns the system ClassLoader if the TCCL is {@code null}. If the system
      * ClassLoader is {@code null} as well, then the ClassLoader for this class is returned. If running with a
@@ -93,6 +113,26 @@ public static ClassLoader getThreadContextClassLoader() {
         return SECURITY_MANAGER == null ? TCCL_GETTER.run() : AccessController.doPrivileged(TCCL_GETTER);
     }
 
+    /**
+     * Determines if one ClassLoader is a child of another ClassLoader. Note that a {@code null} ClassLoader is
+     * interpreted as the system ClassLoader as per convention.
+     *
+     * @param loader1 the ClassLoader to check for childhood.
+     * @param loader2 the ClassLoader to check for parenthood.
+     * @return {@code true} if the first ClassLoader is a strict descendant of the second ClassLoader.
+     */
+    private static boolean isChild(final ClassLoader loader1, final ClassLoader loader2) {
+        if (loader1 != null && loader2 != null) {
+            ClassLoader parent = loader1.getParent();
+            while (parent != null && parent != loader2) {
+                parent = parent.getParent();
+            }
+            // once parent is null, we're at the system CL, which would indicate they have separate ancestry
+            return parent != null;
+        }
+        return loader1 != null;
+    }
+
     /**
      *
      */

log4j-api/src/main/java/org/apache/logging/log4j/util/NameUtil.java

@@ -14,7 +14,7 @@
  * See the license for the specific language governing permissions and
  * limitations under the license.
  */
-package org.apache.logging.log4j.core.util;
+package org.apache.logging.log4j.util;
 
 import java.security.MessageDigest;
 

log4j-api/src/main/java/org/apache/logging/log4j/util/ReflectionUtil.java

@@ -15,7 +15,7 @@
  * limitations under the license.
  */
 
-package org.apache.logging.log4j.core.util;
+package org.apache.logging.log4j.util;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Constructor;
@@ -193,10 +193,13 @@ public static <T> T instantiate(final Class<T> clazz) {
         } catch (final IllegalAccessException e) {
             throw new IllegalStateException(e);
         } catch (final InvocationTargetException e) {
-            if (e.getCause() instanceof RuntimeException) {
-                throw (RuntimeException) e.getCause();
+            if (e.getCause() != null) {
+                if (e.getCause() instanceof RuntimeException) {
+                    throw (RuntimeException) e.getCause();
+                }
+                throw new InternalException(e.getCause());
             }
-            throw new
+            throw new InternalException("Error creating new instance of " + clazz.getName(), e);
         }
     }
 }

log4j-api/src/main/java/org/apache/logging/log4j/util/StringMap.java

@@ -95,4 +95,4 @@ public interface StringMap extends ReadOnlyStringMap {
      * @throws UnsupportedOperationException if this collection has been {@linkplain #isFrozen() frozen}.
      */
     void remove(final String key);
-}
+}