logback-classic/files/logback-classic-1.0.6-disable-groovy-support-gentoo.patch

logback-classic-1.0.6-disable-groovy-support-gentoo.patch (text/plain), 6.11 KB, created by Ivan Baidakou (dmol) on 2012-06-26 17:09:47 UTC

diff -Nru src.orig/main/java/ch/qos/logback/classic/gaffer/GafferUtil.java src/main/java/ch/qos/logback/classic/gaffer/GafferUtil.java
--- src.orig/main/java/ch/qos/logback/classic/gaffer/GafferUtil.java	2012-06-26 19:50:26.536483668 +0300
+++ src/main/java/ch/qos/logback/classic/gaffer/GafferUtil.java	1970-01-01 03:00:00.000000000 +0300
@@ -1,80 +0,0 @@
-/**
- * Logback: the reliable, generic, fast and flexible logging framework.
- * Copyright (C) 1999-2011, QOS.ch. All rights reserved.
- *
- * This program and the accompanying materials are dual-licensed under
- * either the terms of the Eclipse Public License v1.0 as published by
- * the Eclipse Foundation
- *
- *   or (per the licensee's choosing)
- *
- * under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation.
- */
-package ch.qos.logback.classic.gaffer;
-
-import ch.qos.logback.classic.ClassicConstants;
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.core.status.ErrorStatus;
-import ch.qos.logback.core.status.StatusManager;
-
-import java.io.File;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-
-/**
- * @author Ceki Gücü
- */
-public class GafferUtil {
-
-  private static String ERROR_MSG = "Failed to instantiate " + ClassicConstants.GAFFER_CONFIGURATOR_FQCN;
-
-  public static void runGafferConfiguratorOn(LoggerContext loggerContext, Object origin, File configFile) {
-    GafferConfigurator gafferConfigurator = GafferUtil.newGafferConfiguratorInstance(loggerContext, origin);
-    if (gafferConfigurator != null) {
-      gafferConfigurator.run(configFile);
-    }
-  }
-
-  public static void runGafferConfiguratorOn(LoggerContext loggerContext, Object origin, URL configFile) {
-    GafferConfigurator gafferConfigurator = GafferUtil.newGafferConfiguratorInstance(loggerContext, origin);
-    if (gafferConfigurator != null) {
-      gafferConfigurator.run(configFile);
-    }
-  }
-
-  private static GafferConfigurator newGafferConfiguratorInstance(LoggerContext loggerContext, Object origin) {
-
-    try {
-      Class gcClass = Class.forName(ClassicConstants.GAFFER_CONFIGURATOR_FQCN);
-      Constructor c = gcClass.getConstructor(LoggerContext.class);
-      return (GafferConfigurator) c.newInstance(loggerContext);
-    } catch (ClassNotFoundException e) {
-      addError(loggerContext, origin, ERROR_MSG, e);
-    } catch (NoSuchMethodException e) {
-      addError(loggerContext, origin, ERROR_MSG, e);
-    } catch (InvocationTargetException e) {
-      addError(loggerContext, origin, ERROR_MSG, e);
-    } catch (InstantiationException e) {
-      addError(loggerContext, origin, ERROR_MSG, e);
-    } catch (IllegalAccessException e) {
-      addError(loggerContext, origin, ERROR_MSG, e);
-    }
-    return null;
-  }
-
-  private static void addError(LoggerContext context, Object origin, String msg) {
-    addError(context, origin, msg, null);
-  }
-
-  private static void addError(LoggerContext context, Object origin, String msg, Throwable t) {
-    StatusManager sm = context.getStatusManager();
-    if (sm == null) {
-      return;
-    }
-    sm.add(new ErrorStatus(msg, origin, t));
-  }
-
-
-}
diff -Nru src.orig/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java
--- src.orig/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java	2012-06-26 19:50:26.525483806 +0300
+++ src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java	2012-06-26 19:50:56.331109101 +0300
@@ -17,7 +17,6 @@
 import java.net.URL;
 import java.util.List;
 
-import ch.qos.logback.classic.gaffer.GafferUtil;
 import ch.qos.logback.classic.util.EnvUtil;
 import ch.qos.logback.core.CoreConstants;
 import ch.qos.logback.core.joran.event.SaxEvent;
@@ -190,12 +189,7 @@
         performXMLConfiguration(lc);
       } else if (mainConfigurationURL.toString().endsWith("groovy")) {
         if (EnvUtil.isGroovyAvailable()) {
-          lc.reset();
-          // avoid directly referring to GafferConfigurator so as to avoid
-          // loading  groovy.lang.GroovyObject . See also http://jira.qos.ch/browse/LBCLASSIC-214
-          GafferUtil.runGafferConfiguratorOn(lc, this, mainConfigurationURL);
-        } else {
-          addError("Groovy classes are not available on the class path. ABORTING INITIALIZATION.");
+          addError("[gentoo: no groovy support was added at buildtime]Groovy classes are not available on the class path. ABORTING INITIALIZATION.");
         }
       }
     }
diff -Nru src.orig/main/java/ch/qos/logback/classic/util/ContextInitializer.java src/main/java/ch/qos/logback/classic/util/ContextInitializer.java
--- src.orig/main/java/ch/qos/logback/classic/util/ContextInitializer.java	2012-06-26 19:50:26.524483819 +0300
+++ src/main/java/ch/qos/logback/classic/util/ContextInitializer.java	2012-06-26 19:50:50.808178532 +0300
@@ -21,7 +21,6 @@
 
 import ch.qos.logback.classic.BasicConfigurator;
 import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.gaffer.GafferUtil;
 import ch.qos.logback.classic.joran.JoranConfigurator;
 import ch.qos.logback.core.joran.spi.JoranException;
 import ch.qos.logback.core.status.ErrorStatus;
@@ -62,10 +61,9 @@
       if (EnvUtil.isGroovyAvailable()) {
         // avoid directly referring to GafferConfigurator so as to avoid
         // loading  groovy.lang.GroovyObject . See also http://jira.qos.ch/browse/LBCLASSIC-214
-        GafferUtil.runGafferConfiguratorOn(loggerContext, this, url);
-      } else {
+        // GafferUtil.runGafferConfiguratorOn(loggerContext, this, url);
         StatusManager sm = loggerContext.getStatusManager();
-        sm.add(new ErrorStatus("Groovy classes are not available on the class path. ABORTING INITIALIZATION.",
+        sm.add(new ErrorStatus("[gentoo: no groovy support was added at buildtime]. Groovy classes are not available on the class path. ABORTING INITIALIZATION.",
                 loggerContext));
       }
     }