ref #10072 comment usage of log4j12 in LoggingConfigurer and cdmlib-io in general...

diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index 65877e9bad6f93b697d484e9a2f3a09bb3dd488a..9a8930fb1b98627e34cdf18310f068b2a4113a56 100644 (file)
--- a/cdmlib-remote/pom.xml
+++ b/cdmlib-remote/pom.xml
@@ -190,11 +190,11 @@
       <artifactId>iiif-apis</artifactId>
     </dependency>
     
-    <!-- only until problems in LoggingConfigurator are solved -->
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
+    <!-- needed only until problems in LoggingConfigurator are solved -->
+<!--    <dependency>-->
+<!--      <groupId>log4j</groupId>-->
+<!--      <artifactId>log4j</artifactId>-->
+<!--    </dependency>-->
     
   </dependencies>
 </project>

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/opt/config/LoggingConfigurer.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/opt/config/LoggingConfigurer.java
index de66e99f558cce19dcf7be03b0167020cd97275b..28764514f4da404a214f99bc7b5beebabe390526 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/opt/config/LoggingConfigurer.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/opt/config/LoggingConfigurer.java
@@ -8,12 +8,10 @@
  */
 package eu.etaxonomy.cdm.opt.config;
 
-import java.util.Enumeration;
-
-import org.apache.log4j.Appender;
-import org.apache.log4j.EnhancedPatternLayout;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
+//import org.apache.log4j.Appender;
+//import org.apache.log4j.EnhancedPatternLayout;
+//import org.apache.log4j.Logger;
+//import org.apache.log4j.PatternLayout;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 
@@ -66,31 +64,27 @@ public class LoggingConfigurer extends AbstractWebApplicationConfigurer  {
 //                }
         // ... ctx.updateLoggers();
 
-
-        if (true) {
-            return;
-        }
-        @SuppressWarnings("unchecked")
-        Enumeration<Appender> appenders = Logger.getRootLogger().getAllAppenders();
-        while(appenders.hasMoreElements()){
-            Appender appender = appenders.nextElement();
-            if(appender != null){
-                if(appender.getLayout() instanceof PatternLayout){
-                    PatternLayout layout = (PatternLayout)appender.getLayout();
-                    String conversionPattern = layout.getConversionPattern();
-                    if(!conversionPattern.startsWith(patternPrefix)){
-                        layout.setConversionPattern(patternPrefix + conversionPattern);
-                    }
-                }
-                if(appender.getLayout() instanceof EnhancedPatternLayout){
-                    EnhancedPatternLayout layout = (EnhancedPatternLayout)appender.getLayout();
-                    String conversionPattern = layout.getConversionPattern();
-                    if(!conversionPattern.startsWith(patternPrefix)){
-                        layout.setConversionPattern(patternPrefix + conversionPattern);
-                    }
-                }
-            }
-        }
+//        @SuppressWarnings("unchecked")
+//        Enumeration<Appender> appenders = Logger.getRootLogger().getAllAppenders();
+//        while(appenders.hasMoreElements()){
+//            Appender appender = appenders.nextElement();
+//            if(appender != null){
+//                if(appender.getLayout() instanceof PatternLayout){
+//                    PatternLayout layout = (PatternLayout)appender.getLayout();
+//                    String conversionPattern = layout.getConversionPattern();
+//                    if(!conversionPattern.startsWith(patternPrefix)){
+//                        layout.setConversionPattern(patternPrefix + conversionPattern);
+//                    }
+//                }
+//                if(appender.getLayout() instanceof EnhancedPatternLayout){
+//                    EnhancedPatternLayout layout = (EnhancedPatternLayout)appender.getLayout();
+//                    String conversionPattern = layout.getConversionPattern();
+//                    if(!conversionPattern.startsWith(patternPrefix)){
+//                        layout.setConversionPattern(patternPrefix + conversionPattern);
+//                    }
+//                }
+//            }
+//        }
     }
 
     @Override