Commits

Anonymous committed b5e0342

Renaming commons logging package to commons, as it is no longer part of jakarta

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@1634e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (5)

src/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java

             if (factory == null) {
                 try {
                     Class.forName("org.apache.commons.logging.LogFactory");
-                    factory = new com.opensymphony.xwork2.util.logging.jcl.CommonsLoggerFactory();
+                    factory = new com.opensymphony.xwork2.util.logging.commons.CommonsLoggerFactory();
                 } catch (ClassNotFoundException ex) {
                     // commons logging not found, falling back to jdk logging
                     factory = new JdkLoggerFactory();

src/java/com/opensymphony/xwork2/util/logging/commons/CommonsLogger.java

+/*
+ * Copyright (c) 2002-2006 by OpenSymphony
+ * All rights reserved.
+ */
+package com.opensymphony.xwork2.util.logging.commons;
+
+import org.apache.commons.logging.Log;
+
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerUtils;
+
+/**
+ * Simple logger that delegates to commons logging
+ */
+public class CommonsLogger implements Logger {
+    
+    private Log log;
+    
+    public CommonsLogger(Log log) {
+        this.log = log;
+    }
+
+    public void error(String msg, String... args) {
+        log.error(LoggerUtils.format(msg, args));
+    }
+
+    public void error(String msg, Throwable ex, String... args) {
+        log.error(LoggerUtils.format(msg, args), ex);
+    }
+
+    public void info(String msg, String... args) {
+        log.info(LoggerUtils.format(msg, args));
+    }
+
+    public void info(String msg, Throwable ex, String... args) {
+        log.info(LoggerUtils.format(msg, args), ex);
+    }
+
+    
+
+    public boolean isInfoEnabled() {
+        return log.isInfoEnabled();
+    }
+
+    public void warn(String msg, String... args) {
+        log.warn(LoggerUtils.format(msg, args));
+    }
+
+    public void warn(String msg, Throwable ex, String... args) {
+        log.warn(LoggerUtils.format(msg, args), ex);
+    }
+    
+    public boolean isDebugEnabled() {
+        return log.isDebugEnabled();
+    }
+    
+    public void debug(String msg, String... args) {
+        log.debug(LoggerUtils.format(msg, args));
+    }
+
+    public void debug(String msg, Throwable ex, String... args) {
+        log.debug(LoggerUtils.format(msg, args), ex);
+    }
+    
+    public boolean isTraceEnabled() {
+        return log.isTraceEnabled();
+    }
+    
+    public void trace(String msg, String... args) {
+        log.trace(LoggerUtils.format(msg, args));
+    }
+
+    public void trace(String msg, Throwable ex, String... args) {
+        log.trace(LoggerUtils.format(msg, args), ex);
+    }
+
+
+    public void fatal(String msg, String... args) {
+        log.fatal(LoggerUtils.format(msg, args));
+    }
+
+    public void fatal(String msg, Throwable ex, String... args) {
+        log.fatal(LoggerUtils.format(msg, args), ex);
+    }
+
+    public boolean isErrorEnabled() {
+        return log.isErrorEnabled();
+    }
+
+    public boolean isFatalEnabled() {
+        return log.isFatalEnabled();
+    }
+
+    public boolean isWarnEnabled() {
+        return log.isWarnEnabled();
+    }
+
+}

src/java/com/opensymphony/xwork2/util/logging/commons/CommonsLoggerFactory.java

+/*
+ * Copyright (c) 2002-2006 by OpenSymphony
+ * All rights reserved.
+ */
+package com.opensymphony.xwork2.util.logging.commons;
+
+import org.apache.commons.logging.LogFactory;
+
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+
+/**
+ * Creates commons-logging-backed loggers
+ */
+public class CommonsLoggerFactory extends LoggerFactory {
+
+    @Override
+    protected Logger getLoggerImpl(Class<?> cls) {
+        return new CommonsLogger(LogFactory.getLog(cls));
+    }
+    
+    @Override
+    protected Logger getLoggerImpl(String name) {
+        return new CommonsLogger(LogFactory.getLog(name));
+    }
+
+}

src/java/com/opensymphony/xwork2/util/logging/jcl/CommonsLogger.java

-/*
- * Copyright (c) 2002-2006 by OpenSymphony
- * All rights reserved.
- */
-package com.opensymphony.xwork2.util.logging.jcl;
-
-import org.apache.commons.logging.Log;
-
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerUtils;
-
-/**
- * Simple logger that delegates to commons logging
- */
-public class CommonsLogger implements Logger {
-    
-    private Log log;
-    
-    public CommonsLogger(Log log) {
-        this.log = log;
-    }
-
-    public void error(String msg, String... args) {
-        log.error(LoggerUtils.format(msg, args));
-    }
-
-    public void error(String msg, Throwable ex, String... args) {
-        log.error(LoggerUtils.format(msg, args), ex);
-    }
-
-    public void info(String msg, String... args) {
-        log.info(LoggerUtils.format(msg, args));
-    }
-
-    public void info(String msg, Throwable ex, String... args) {
-        log.info(LoggerUtils.format(msg, args), ex);
-    }
-
-    
-
-    public boolean isInfoEnabled() {
-        return log.isInfoEnabled();
-    }
-
-    public void warn(String msg, String... args) {
-        log.warn(LoggerUtils.format(msg, args));
-    }
-
-    public void warn(String msg, Throwable ex, String... args) {
-        log.warn(LoggerUtils.format(msg, args), ex);
-    }
-    
-    public boolean isDebugEnabled() {
-        return log.isDebugEnabled();
-    }
-    
-    public void debug(String msg, String... args) {
-        log.debug(LoggerUtils.format(msg, args));
-    }
-
-    public void debug(String msg, Throwable ex, String... args) {
-        log.debug(LoggerUtils.format(msg, args), ex);
-    }
-    
-    public boolean isTraceEnabled() {
-        return log.isTraceEnabled();
-    }
-    
-    public void trace(String msg, String... args) {
-        log.trace(LoggerUtils.format(msg, args));
-    }
-
-    public void trace(String msg, Throwable ex, String... args) {
-        log.trace(LoggerUtils.format(msg, args), ex);
-    }
-
-
-    public void fatal(String msg, String... args) {
-        log.fatal(LoggerUtils.format(msg, args));
-    }
-
-    public void fatal(String msg, Throwable ex, String... args) {
-        log.fatal(LoggerUtils.format(msg, args), ex);
-    }
-
-    public boolean isErrorEnabled() {
-        return log.isErrorEnabled();
-    }
-
-    public boolean isFatalEnabled() {
-        return log.isFatalEnabled();
-    }
-
-    public boolean isWarnEnabled() {
-        return log.isWarnEnabled();
-    }
-
-}

src/java/com/opensymphony/xwork2/util/logging/jcl/CommonsLoggerFactory.java

-/*
- * Copyright (c) 2002-2006 by OpenSymphony
- * All rights reserved.
- */
-package com.opensymphony.xwork2.util.logging.jcl;
-
-import org.apache.commons.logging.LogFactory;
-
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
-/**
- * Creates commons-logging-backed loggers
- */
-public class CommonsLoggerFactory extends LoggerFactory {
-
-    @Override
-    protected Logger getLoggerImpl(Class<?> cls) {
-        return new CommonsLogger(LogFactory.getLog(cls));
-    }
-    
-    @Override
-    protected Logger getLoggerImpl(String name) {
-        return new CommonsLogger(LogFactory.getLog(name));
-    }
-
-}