();
+
@Override
public InternalLogger newInstance(String name) {
return new CommonsLogger(LogFactory.getLog(name), name);
diff --git a/common/src/main/java/io/netty/logging/FormattingTuple.java b/common/src/main/java/io/netty/logging/FormattingTuple.java
new file mode 100644
index 0000000000..2fbe0ad2b6
--- /dev/null
+++ b/common/src/main/java/io/netty/logging/FormattingTuple.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2013 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+/**
+ * Copyright (c) 2004-2011 QOS.ch
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+package io.netty.logging;
+
+/**
+ * Holds the results of formatting done by {@link MessageFormatter}.
+ */
+class FormattingTuple {
+
+ static final FormattingTuple NULL = new FormattingTuple(null);
+
+ private final String message;
+ private final Throwable throwable;
+ private final Object[] argArray;
+
+ FormattingTuple(String message) {
+ this(message, null, null);
+ }
+
+ FormattingTuple(String message, Object[] argArray, Throwable throwable) {
+ this.message = message;
+ this.throwable = throwable;
+ if (throwable == null) {
+ this.argArray = argArray;
+ } else {
+ this.argArray = trimmedCopy(argArray);
+ }
+ }
+
+ static Object[] trimmedCopy(Object[] argArray) {
+ if (argArray == null || argArray.length == 0) {
+ throw new IllegalStateException("non-sensical empty or null argument array");
+ }
+ final int trimemdLen = argArray.length - 1;
+ Object[] trimmed = new Object[trimemdLen];
+ System.arraycopy(argArray, 0, trimmed, 0, trimemdLen);
+ return trimmed;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public Object[] getArgArray() {
+ return argArray;
+ }
+
+ public Throwable getThrowable() {
+ return throwable;
+ }
+}
diff --git a/common/src/main/java/io/netty/logging/InternalLogger.java b/common/src/main/java/io/netty/logging/InternalLogger.java
index 1b1496ff8e..1824195db2 100644
--- a/common/src/main/java/io/netty/logging/InternalLogger.java
+++ b/common/src/main/java/io/netty/logging/InternalLogger.java
@@ -13,6 +13,30 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
+/**
+ * Copyright (c) 2004-2011 QOS.ch
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
package io.netty.logging;
/**
@@ -20,93 +44,401 @@ package io.netty.logging;
* access this class outside of Netty.
*/
public interface InternalLogger {
+
/**
- * Returns {@code true} if a TRACE level message is logged.
+ * Return the name of this {@link InternalLogger} instance.
+ *
+ * @return name of this logger instance
+ */
+ String name();
+
+ /**
+ * Is the logger instance enabled for the TRACE level?
+ *
+ * @return True if this Logger is enabled for the TRACE level,
+ * false otherwise.
*/
boolean isTraceEnabled();
/**
- * Returns {@code true} if a DEBUG level message is logged.
- */
- boolean isDebugEnabled();
-
- /**
- * Returns {@code true} if an INFO level message is logged.
- */
- boolean isInfoEnabled();
-
- /**
- * Returns {@code true} if a WARN level message is logged.
- */
- boolean isWarnEnabled();
-
- /**
- * Returns {@code true} if an ERROR level message is logged.
- */
- boolean isErrorEnabled();
-
- /**
- * Returns {@code true} if the specified log level message is logged.
- */
- boolean isEnabled(InternalLogLevel level);
-
- /**
- * Logs a TRACE level message.
+ * Log a message at the TRACE level.
+ *
+ * @param msg the message string to be logged
*/
void trace(String msg);
/**
- * Logs a TRACE level message.
+ * Log a message at the TRACE level according to the specified format
+ * and argument.
+ *
+ * This form avoids superfluous object creation when the logger
+ * is disabled for the TRACE level.
+ *
+ * @param format the format string
+ * @param arg the argument
*/
- void trace(String msg, Throwable cause);
+ void trace(String format, Object arg);
/**
- * Logs a DEBUG level message.
+ * Log a message at the TRACE level according to the specified format
+ * and arguments.
+ *
+ * This form avoids superfluous object creation when the logger
+ * is disabled for the TRACE level.
+ *
+ * @param format the format string
+ * @param argA the first argument
+ * @param argB the second argument
+ */
+ void trace(String format, Object argA, Object argB);
+
+ /**
+ * Log a message at the TRACE level according to the specified format
+ * and arguments.
+ *
+ * This form avoids superfluous string concatenation when the logger
+ * is disabled for the TRACE level. However, this variant incurs the hidden
+ * (and relatively small) cost of creating an {@code Object[]} before invoking the method,
+ * even if this logger is disabled for TRACE. The variants taking {@link #trace(String, Object) one} and
+ * {@link #trace(String, Object, Object) two} arguments exist solely in order to avoid this hidden cost.
+ *
+ * @param format the format string
+ * @param arguments a list of 3 or more arguments
+ */
+ void trace(String format, Object... arguments);
+
+ /**
+ * Log an exception (throwable) at the TRACE level with an
+ * accompanying message.
+ *
+ * @param msg the message accompanying the exception
+ * @param t the exception (throwable) to log
+ */
+ void trace(String msg, Throwable t);
+
+ /**
+ * Is the logger instance enabled for the DEBUG level?
+ *
+ * @return True if this Logger is enabled for the DEBUG level,
+ * false otherwise.
+ */
+ boolean isDebugEnabled();
+
+ /**
+ * Log a message at the DEBUG level.
+ *
+ * @param msg the message string to be logged
*/
void debug(String msg);
/**
- * Logs a DEBUG level message.
+ * Log a message at the DEBUG level according to the specified format
+ * and argument.
+ *
+ * This form avoids superfluous object creation when the logger
+ * is disabled for the DEBUG level.
+ *
+ * @param format the format string
+ * @param arg the argument
*/
- void debug(String msg, Throwable cause);
+ void debug(String format, Object arg);
/**
- * Logs an INFO level message.
+ * Log a message at the DEBUG level according to the specified format
+ * and arguments.
+ *
+ * This form avoids superfluous object creation when the logger
+ * is disabled for the DEBUG level.
+ *
+ * @param format the format string
+ * @param argA the first argument
+ * @param argB the second argument
+ */
+ void debug(String format, Object argA, Object argB);
+
+ /**
+ * Log a message at the DEBUG level according to the specified format
+ * and arguments.
+ *
+ * This form avoids superfluous string concatenation when the logger
+ * is disabled for the DEBUG level. However, this variant incurs the hidden
+ * (and relatively small) cost of creating an {@code Object[]} before invoking the method,
+ * even if this logger is disabled for DEBUG. The variants taking
+ * {@link #debug(String, Object) one} and {@link #debug(String, Object, Object) two}
+ * arguments exist solely in order to avoid this hidden cost.
+ *
+ * @param format the format string
+ * @param arguments a list of 3 or more arguments
+ */
+ void debug(String format, Object... arguments);
+
+ /**
+ * Log an exception (throwable) at the DEBUG level with an
+ * accompanying message.
+ *
+ * @param msg the message accompanying the exception
+ * @param t the exception (throwable) to log
+ */
+ void debug(String msg, Throwable t);
+
+ /**
+ * Is the logger instance enabled for the INFO level?
+ *
+ * @return True if this Logger is enabled for the INFO level,
+ * false otherwise.
+ */
+ boolean isInfoEnabled();
+
+ /**
+ * Log a message at the INFO level.
+ *
+ * @param msg the message string to be logged
*/
void info(String msg);
/**
- * Logs an INFO level message.
+ * Log a message at the INFO level according to the specified format
+ * and argument.
+ *
+ * This form avoids superfluous object creation when the logger
+ * is disabled for the INFO level.
+ *
+ * @param format the format string
+ * @param arg the argument
*/
- void info(String msg, Throwable cause);
+ void info(String format, Object arg);
/**
- * Logs a WARN level message.
+ * Log a message at the INFO level according to the specified format
+ * and arguments.
+ *
+ * This form avoids superfluous object creation when the logger
+ * is disabled for the INFO level.
+ *
+ * @param format the format string
+ * @param argA the first argument
+ * @param argB the second argument
+ */
+ void info(String format, Object argA, Object argB);
+
+ /**
+ * Log a message at the INFO level according to the specified format
+ * and arguments.
+ *
+ * This form avoids superfluous string concatenation when the logger
+ * is disabled for the INFO level. However, this variant incurs the hidden
+ * (and relatively small) cost of creating an {@code Object[]} before invoking the method,
+ * even if this logger is disabled for INFO. The variants taking
+ * {@link #info(String, Object) one} and {@link #info(String, Object, Object) two}
+ * arguments exist solely in order to avoid this hidden cost.
+ *
+ * @param format the format string
+ * @param arguments a list of 3 or more arguments
+ */
+ void info(String format, Object... arguments);
+
+ /**
+ * Log an exception (throwable) at the INFO level with an
+ * accompanying message.
+ *
+ * @param msg the message accompanying the exception
+ * @param t the exception (throwable) to log
+ */
+ void info(String msg, Throwable t);
+
+ /**
+ * Is the logger instance enabled for the WARN level?
+ *
+ * @return True if this Logger is enabled for the WARN level,
+ * false otherwise.
+ */
+ boolean isWarnEnabled();
+
+ /**
+ * Log a message at the WARN level.
+ *
+ * @param msg the message string to be logged
*/
void warn(String msg);
/**
- * Logs a WARN level message.
+ * Log a message at the WARN level according to the specified format
+ * and argument.
+ *
+ * This form avoids superfluous object creation when the logger
+ * is disabled for the WARN level.
+ *
+ * @param format the format string
+ * @param arg the argument
*/
- void warn(String msg, Throwable cause);
+ void warn(String format, Object arg);
/**
- * Logs an ERROR level message.
+ * Log a message at the WARN level according to the specified format
+ * and arguments.
+ *
+ * This form avoids superfluous string concatenation when the logger
+ * is disabled for the WARN level. However, this variant incurs the hidden
+ * (and relatively small) cost of creating an {@code Object[]} before invoking the method,
+ * even if this logger is disabled for WARN. The variants taking
+ * {@link #warn(String, Object) one} and {@link #warn(String, Object, Object) two}
+ * arguments exist solely in order to avoid this hidden cost.
+ *
+ * @param format the format string
+ * @param arguments a list of 3 or more arguments
+ */
+ void warn(String format, Object... arguments);
+
+ /**
+ * Log a message at the WARN level according to the specified format
+ * and arguments.
+ *
+ * This form avoids superfluous object creation when the logger
+ * is disabled for the WARN level.
+ *
+ * @param format the format string
+ * @param argA the first argument
+ * @param argB the second argument
+ */
+ void warn(String format, Object argA, Object argB);
+
+ /**
+ * Log an exception (throwable) at the WARN level with an
+ * accompanying message.
+ *
+ * @param msg the message accompanying the exception
+ * @param t the exception (throwable) to log
+ */
+ void warn(String msg, Throwable t);
+
+ /**
+ * Is the logger instance enabled for the ERROR level?
+ *
+ * @return True if this Logger is enabled for the ERROR level,
+ * false otherwise.
+ */
+ boolean isErrorEnabled();
+
+ /**
+ * Log a message at the ERROR level.
+ *
+ * @param msg the message string to be logged
*/
void error(String msg);
/**
- * Logs an ERROR level message.
+ * Log a message at the ERROR level according to the specified format
+ * and argument.
+ *
+ * This form avoids superfluous object creation when the logger
+ * is disabled for the ERROR level.
+ *
+ * @param format the format string
+ * @param arg the argument
*/
- void error(String msg, Throwable cause);
+ void error(String format, Object arg);
/**
- * Logs a message.
+ * Log a message at the ERROR level according to the specified format
+ * and arguments.
+ *
+ * This form avoids superfluous object creation when the logger
+ * is disabled for the ERROR level.
+ *
+ * @param format the format string
+ * @param argA the first argument
+ * @param argB the second argument
+ */
+ void error(String format, Object argA, Object argB);
+
+ /**
+ * Log a message at the ERROR level according to the specified format
+ * and arguments.
+ *
+ * This form avoids superfluous string concatenation when the logger
+ * is disabled for the ERROR level. However, this variant incurs the hidden
+ * (and relatively small) cost of creating an {@code Object[]} before invoking the method,
+ * even if this logger is disabled for ERROR. The variants taking
+ * {@link #error(String, Object) one} and {@link #error(String, Object, Object) two}
+ * arguments exist solely in order to avoid this hidden cost.
+ *
+ * @param format the format string
+ * @param arguments a list of 3 or more arguments
+ */
+ void error(String format, Object... arguments);
+
+ /**
+ * Log an exception (throwable) at the ERROR level with an
+ * accompanying message.
+ *
+ * @param msg the message accompanying the exception
+ * @param t the exception (throwable) to log
+ */
+ void error(String msg, Throwable t);
+
+ /**
+ * Is the logger instance enabled for the specified {@code level}?
+ *
+ * @return True if this Logger is enabled for the specified {@code level},
+ * false otherwise.
+ */
+ boolean isEnabled(InternalLogLevel level);
+
+ /**
+ * Log a message at the specified {@code level}.
+ *
+ * @param msg the message string to be logged
*/
void log(InternalLogLevel level, String msg);
/**
- * Logs a message.
+ * Log a message at the specified {@code level} according to the specified format
+ * and argument.
+ *
+ * This form avoids superfluous object creation when the logger
+ * is disabled for the specified {@code level}.
+ *
+ * @param format the format string
+ * @param arg the argument
*/
- void log(InternalLogLevel level, String msg, Throwable cause);
+ void log(InternalLogLevel level, String format, Object arg);
+
+ /**
+ * Log a message at the specified {@code level} according to the specified format
+ * and arguments.
+ *
+ * This form avoids superfluous object creation when the logger
+ * is disabled for the specified {@code level}.
+ *
+ * @param format the format string
+ * @param argA the first argument
+ * @param argB the second argument
+ */
+ void log(InternalLogLevel level, String format, Object argA, Object argB);
+
+ /**
+ * Log a message at the specified {@code level} according to the specified format
+ * and arguments.
+ *
+ * This form avoids superfluous string concatenation when the logger
+ * is disabled for the specified {@code level}. However, this variant incurs the hidden
+ * (and relatively small) cost of creating an {@code Object[]} before invoking the method,
+ * even if this logger is disabled for the specified {@code level}. The variants taking
+ * {@link #log(InternalLogLevel, String, Object) one} and
+ * {@link #log(InternalLogLevel, String, Object, Object) two} arguments exist solely
+ * in order to avoid this hidden cost.
+ *
+ * @param format the format string
+ * @param arguments a list of 3 or more arguments
+ */
+ void log(InternalLogLevel level, String format, Object... arguments);
+
+ /**
+ * Log an exception (throwable) at the specified {@code level} with an
+ * accompanying message.
+ *
+ * @param msg the message accompanying the exception
+ * @param t the exception (throwable) to log
+ */
+ void log(InternalLogLevel level, String msg, Throwable t);
}
diff --git a/common/src/main/java/io/netty/logging/InternalLoggerFactory.java b/common/src/main/java/io/netty/logging/InternalLoggerFactory.java
index 90cd8b4f02..9898bf5050 100644
--- a/common/src/main/java/io/netty/logging/InternalLoggerFactory.java
+++ b/common/src/main/java/io/netty/logging/InternalLoggerFactory.java
@@ -32,7 +32,27 @@ package io.netty.logging;
* @apiviz.has io.netty.logging.InternalLogger oneway - - creates
*/
public abstract class InternalLoggerFactory {
- private static volatile InternalLoggerFactory defaultFactory = new JdkLoggerFactory();
+ private static volatile InternalLoggerFactory defaultFactory;
+
+ static {
+ final String name = InternalLoggerFactory.class.getName();
+ InternalLoggerFactory f;
+ try {
+ f = new Slf4JLoggerFactory(true);
+ f.newInstance(name).debug("Using SLF4J as the default logging framework");
+ defaultFactory = f;
+ } catch (Throwable t1) {
+ try {
+ f = new Log4JLoggerFactory();
+ f.newInstance(name).debug("Using Log4J as the default logging framework");
+ } catch (Throwable t2) {
+ f = new JdkLoggerFactory();
+ f.newInstance(name).debug("Using java.util.logging as the default logging framework");
+ }
+ }
+
+ defaultFactory = f;
+ }
/**
* Returns the default factory. The initial default factory is
@@ -63,103 +83,11 @@ public abstract class InternalLoggerFactory {
* Creates a new logger instance with the specified name.
*/
public static InternalLogger getInstance(String name) {
- final InternalLogger logger = getDefaultFactory().newInstance(name);
- return new InternalLogger() {
-
- @Override
- public void trace(String msg) {
- logger.trace(msg);
- }
-
- @Override
- public void trace(String msg, Throwable cause) {
- logger.trace(msg, cause);
- }
-
- @Override
- public void debug(String msg) {
- logger.debug(msg);
- }
-
- @Override
- public void debug(String msg, Throwable cause) {
- logger.debug(msg, cause);
- }
-
- @Override
- public void error(String msg) {
- logger.error(msg);
- }
-
- @Override
- public void error(String msg, Throwable cause) {
- logger.error(msg, cause);
- }
-
- @Override
- public void info(String msg) {
- logger.info(msg);
- }
-
- @Override
- public void info(String msg, Throwable cause) {
- logger.info(msg, cause);
- }
-
- @Override
- public boolean isTraceEnabled() {
- return logger.isTraceEnabled();
- }
-
- @Override
- public boolean isDebugEnabled() {
- return logger.isDebugEnabled();
- }
-
- @Override
- public boolean isErrorEnabled() {
- return logger.isErrorEnabled();
- }
-
- @Override
- public boolean isInfoEnabled() {
- return logger.isInfoEnabled();
- }
-
- @Override
- public boolean isWarnEnabled() {
- return logger.isWarnEnabled();
- }
-
- @Override
- public void warn(String msg) {
- logger.warn(msg);
- }
-
- @Override
- public void warn(String msg, Throwable cause) {
- logger.warn(msg, cause);
- }
-
- @Override
- public boolean isEnabled(InternalLogLevel level) {
- return logger.isEnabled(level);
- }
-
- @Override
- public void log(InternalLogLevel level, String msg) {
- logger.log(level, msg);
- }
-
- @Override
- public void log(InternalLogLevel level, String msg, Throwable cause) {
- logger.log(level, msg, cause);
- }
- };
+ return getDefaultFactory().newInstance(name);
}
/**
* Creates a new logger instance with the specified name.
*/
- public abstract InternalLogger newInstance(String name);
+ protected abstract InternalLogger newInstance(String name);
}
diff --git a/common/src/main/java/io/netty/logging/JBossLogger.java b/common/src/main/java/io/netty/logging/JBossLogger.java
deleted file mode 100644
index f134ff19aa..0000000000
--- a/common/src/main/java/io/netty/logging/JBossLogger.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2012 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.logging;
-
-import org.jboss.logging.Logger;
-
-/**
- * JBoss Logging
- * logger.
- */
-class JBossLogger extends AbstractInternalLogger {
-
- private final Logger logger;
-
- JBossLogger(Logger logger) {
- this.logger = logger;
- }
-
- @Override
- public void trace(String msg) {
- logger.trace(msg);
- }
-
- @Override
- public void trace(String msg, Throwable cause) {
- logger.trace(msg, cause);
- }
-
- @Override
- public void debug(String msg) {
- logger.debug(msg);
- }
-
- @Override
- public void debug(String msg, Throwable cause) {
- logger.debug(msg, cause);
- }
-
- @Override
- public void error(String msg) {
- logger.error(msg);
- }
-
- @Override
- public void error(String msg, Throwable cause) {
- logger.error(msg, cause);
- }
-
- @Override
- public void info(String msg) {
- logger.info(msg);
- }
-
- @Override
- public void info(String msg, Throwable cause) {
- logger.info(msg, cause);
- }
-
- @Override
- public boolean isTraceEnabled() {
- return logger.isTraceEnabled();
- }
-
- @Override
- @SuppressWarnings("deprecation")
- public boolean isDebugEnabled() {
- return logger.isDebugEnabled();
- }
-
- @Override
- public boolean isErrorEnabled() {
- return true;
- }
-
- @Override
- @SuppressWarnings("deprecation")
- public boolean isInfoEnabled() {
- return logger.isInfoEnabled();
- }
-
- @Override
- public boolean isWarnEnabled() {
- return true;
- }
-
- @Override
- public void warn(String msg) {
- logger.warn(msg);
- }
-
- @Override
- public void warn(String msg, Throwable cause) {
- logger.warn(msg, cause);
- }
-
- @Override
- public String toString() {
- return String.valueOf(logger.getName());
- }
-}
diff --git a/common/src/main/java/io/netty/logging/JBossLoggerFactory.java b/common/src/main/java/io/netty/logging/JBossLoggerFactory.java
deleted file mode 100644
index d758aa9225..0000000000
--- a/common/src/main/java/io/netty/logging/JBossLoggerFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2012 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.logging;
-
-
-import org.jboss.logging.Logger;
-
-/**
- * Logger factory which creates a
- * JBoss Logging
- * logger.
- */
-public class JBossLoggerFactory extends InternalLoggerFactory {
-
- @Override
- public InternalLogger newInstance(String name) {
- final Logger logger =
- Logger.getLogger(name);
- return new JBossLogger(logger);
- }
-}
diff --git a/common/src/main/java/io/netty/logging/JdkLogger.java b/common/src/main/java/io/netty/logging/JdkLogger.java
index 274a0accaa..e978ae7d68 100644
--- a/common/src/main/java/io/netty/logging/JdkLogger.java
+++ b/common/src/main/java/io/netty/logging/JdkLogger.java
@@ -13,9 +13,34 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
+/**
+ * Copyright (c) 2004-2011 QOS.ch
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
package io.netty.logging;
import java.util.logging.Level;
+import java.util.logging.LogRecord;
import java.util.logging.Logger;
/**
@@ -24,91 +49,599 @@ import java.util.logging.Logger;
*/
class JdkLogger extends AbstractInternalLogger {
- private final Logger logger;
- private final String loggerName;
+ private static final long serialVersionUID = -1767272577989225979L;
- JdkLogger(Logger logger, String loggerName) {
+ final transient Logger logger;
+
+ JdkLogger(Logger logger) {
+ super(logger.getName());
this.logger = logger;
- this.loggerName = loggerName;
- }
-
- @Override
- public void trace(String msg) {
- logger.logp(Level.FINEST, loggerName, null, msg);
- }
-
- @Override
- public void trace(String msg, Throwable cause) {
- logger.logp(Level.FINEST, loggerName, null, msg, cause);
- }
-
- @Override
- public void debug(String msg) {
- logger.logp(Level.FINE, loggerName, null, msg);
- }
-
- @Override
- public void debug(String msg, Throwable cause) {
- logger.logp(Level.FINE, loggerName, null, msg, cause);
- }
-
- @Override
- public void error(String msg) {
- logger.logp(Level.SEVERE, loggerName, null, msg);
- }
-
- @Override
- public void error(String msg, Throwable cause) {
- logger.logp(Level.SEVERE, loggerName, null, msg, cause);
- }
-
- @Override
- public void info(String msg) {
- logger.logp(Level.INFO, loggerName, null, msg);
- }
-
- @Override
- public void info(String msg, Throwable cause) {
- logger.logp(Level.INFO, loggerName, null, msg, cause);
}
+ /**
+ * Is this logger instance enabled for the FINEST level?
+ *
+ * @return True if this Logger is enabled for level FINEST, false otherwise.
+ */
@Override
public boolean isTraceEnabled() {
return logger.isLoggable(Level.FINEST);
}
+ /**
+ * Log a message object at level FINEST.
+ *
+ * @param msg
+ * - the message object to be logged
+ */
+ @Override
+ public void trace(String msg) {
+ if (logger.isLoggable(Level.FINEST)) {
+ log(SELF, Level.FINEST, msg, null);
+ }
+ }
+
+ /**
+ * Log a message at level FINEST according to the specified format and
+ * argument.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for level FINEST.
+ *
+ *
+ * @param format
+ * the format string
+ * @param arg
+ * the argument
+ */
+ @Override
+ public void trace(String format, Object arg) {
+ if (logger.isLoggable(Level.FINEST)) {
+ FormattingTuple ft = MessageFormatter.format(format, arg);
+ log(SELF, Level.FINEST, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at level FINEST according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the FINEST level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argA
+ * the first argument
+ * @param argB
+ * the second argument
+ */
+ @Override
+ public void trace(String format, Object argA, Object argB) {
+ if (logger.isLoggable(Level.FINEST)) {
+ FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+ log(SELF, Level.FINEST, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at level FINEST according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the FINEST level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argArray
+ * an array of arguments
+ */
+ @Override
+ public void trace(String format, Object... argArray) {
+ if (logger.isLoggable(Level.FINEST)) {
+ FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
+ log(SELF, Level.FINEST, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log an exception (throwable) at level FINEST with an accompanying message.
+ *
+ * @param msg
+ * the message accompanying the exception
+ * @param t
+ * the exception (throwable) to log
+ */
+ @Override
+ public void trace(String msg, Throwable t) {
+ if (logger.isLoggable(Level.FINEST)) {
+ log(SELF, Level.FINEST, msg, t);
+ }
+ }
+
+ /**
+ * Is this logger instance enabled for the FINE level?
+ *
+ * @return True if this Logger is enabled for level FINE, false otherwise.
+ */
@Override
public boolean isDebugEnabled() {
return logger.isLoggable(Level.FINE);
}
+ /**
+ * Log a message object at level FINE.
+ *
+ * @param msg
+ * - the message object to be logged
+ */
@Override
- public boolean isErrorEnabled() {
- return logger.isLoggable(Level.SEVERE);
+ public void debug(String msg) {
+ if (logger.isLoggable(Level.FINE)) {
+ log(SELF, Level.FINE, msg, null);
+ }
}
+ /**
+ * Log a message at level FINE according to the specified format and argument.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for level FINE.
+ *
+ *
+ * @param format
+ * the format string
+ * @param arg
+ * the argument
+ */
+ @Override
+ public void debug(String format, Object arg) {
+ if (logger.isLoggable(Level.FINE)) {
+ FormattingTuple ft = MessageFormatter.format(format, arg);
+ log(SELF, Level.FINE, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at level FINE according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the FINE level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argA
+ * the first argument
+ * @param argB
+ * the second argument
+ */
+ @Override
+ public void debug(String format, Object argA, Object argB) {
+ if (logger.isLoggable(Level.FINE)) {
+ FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+ log(SELF, Level.FINE, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at level FINE according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the FINE level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argArray
+ * an array of arguments
+ */
+ @Override
+ public void debug(String format, Object... argArray) {
+ if (logger.isLoggable(Level.FINE)) {
+ FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
+ log(SELF, Level.FINE, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log an exception (throwable) at level FINE with an accompanying message.
+ *
+ * @param msg
+ * the message accompanying the exception
+ * @param t
+ * the exception (throwable) to log
+ */
+ @Override
+ public void debug(String msg, Throwable t) {
+ if (logger.isLoggable(Level.FINE)) {
+ log(SELF, Level.FINE, msg, t);
+ }
+ }
+
+ /**
+ * Is this logger instance enabled for the INFO level?
+ *
+ * @return True if this Logger is enabled for the INFO level, false otherwise.
+ */
@Override
public boolean isInfoEnabled() {
return logger.isLoggable(Level.INFO);
}
+ /**
+ * Log a message object at the INFO level.
+ *
+ * @param msg
+ * - the message object to be logged
+ */
+ @Override
+ public void info(String msg) {
+ if (logger.isLoggable(Level.INFO)) {
+ log(SELF, Level.INFO, msg, null);
+ }
+ }
+
+ /**
+ * Log a message at level INFO according to the specified format and argument.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the INFO level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param arg
+ * the argument
+ */
+ @Override
+ public void info(String format, Object arg) {
+ if (logger.isLoggable(Level.INFO)) {
+ FormattingTuple ft = MessageFormatter.format(format, arg);
+ log(SELF, Level.INFO, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at the INFO level according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the INFO level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argA
+ * the first argument
+ * @param argB
+ * the second argument
+ */
+ @Override
+ public void info(String format, Object argA, Object argB) {
+ if (logger.isLoggable(Level.INFO)) {
+ FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+ log(SELF, Level.INFO, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at level INFO according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the INFO level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argArray
+ * an array of arguments
+ */
+ @Override
+ public void info(String format, Object... argArray) {
+ if (logger.isLoggable(Level.INFO)) {
+ FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
+ log(SELF, Level.INFO, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log an exception (throwable) at the INFO level with an accompanying
+ * message.
+ *
+ * @param msg
+ * the message accompanying the exception
+ * @param t
+ * the exception (throwable) to log
+ */
+ @Override
+ public void info(String msg, Throwable t) {
+ if (logger.isLoggable(Level.INFO)) {
+ log(SELF, Level.INFO, msg, t);
+ }
+ }
+
+ /**
+ * Is this logger instance enabled for the WARNING level?
+ *
+ * @return True if this Logger is enabled for the WARNING level, false
+ * otherwise.
+ */
@Override
public boolean isWarnEnabled() {
return logger.isLoggable(Level.WARNING);
}
+ /**
+ * Log a message object at the WARNING level.
+ *
+ * @param msg
+ * - the message object to be logged
+ */
@Override
public void warn(String msg) {
- logger.logp(Level.WARNING, loggerName, null, msg);
+ if (logger.isLoggable(Level.WARNING)) {
+ log(SELF, Level.WARNING, msg, null);
+ }
}
+ /**
+ * Log a message at the WARNING level according to the specified format and
+ * argument.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the WARNING level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param arg
+ * the argument
+ */
@Override
- public void warn(String msg, Throwable cause) {
- logger.logp(Level.WARNING, loggerName, null, msg, cause);
+ public void warn(String format, Object arg) {
+ if (logger.isLoggable(Level.WARNING)) {
+ FormattingTuple ft = MessageFormatter.format(format, arg);
+ log(SELF, Level.WARNING, ft.getMessage(), ft.getThrowable());
+ }
}
+ /**
+ * Log a message at the WARNING level according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the WARNING level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argA
+ * the first argument
+ * @param argB
+ * the second argument
+ */
@Override
- public String toString() {
- return loggerName;
+ public void warn(String format, Object argA, Object argB) {
+ if (logger.isLoggable(Level.WARNING)) {
+ FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+ log(SELF, Level.WARNING, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at level WARNING according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the WARNING level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argArray
+ * an array of arguments
+ */
+ @Override
+ public void warn(String format, Object... argArray) {
+ if (logger.isLoggable(Level.WARNING)) {
+ FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
+ log(SELF, Level.WARNING, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log an exception (throwable) at the WARNING level with an accompanying
+ * message.
+ *
+ * @param msg
+ * the message accompanying the exception
+ * @param t
+ * the exception (throwable) to log
+ */
+ @Override
+ public void warn(String msg, Throwable t) {
+ if (logger.isLoggable(Level.WARNING)) {
+ log(SELF, Level.WARNING, msg, t);
+ }
+ }
+
+ /**
+ * Is this logger instance enabled for level SEVERE?
+ *
+ * @return True if this Logger is enabled for level SEVERE, false otherwise.
+ */
+ @Override
+ public boolean isErrorEnabled() {
+ return logger.isLoggable(Level.SEVERE);
+ }
+
+ /**
+ * Log a message object at the SEVERE level.
+ *
+ * @param msg
+ * - the message object to be logged
+ */
+ @Override
+ public void error(String msg) {
+ if (logger.isLoggable(Level.SEVERE)) {
+ log(SELF, Level.SEVERE, msg, null);
+ }
+ }
+
+ /**
+ * Log a message at the SEVERE level according to the specified format and
+ * argument.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the SEVERE level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param arg
+ * the argument
+ */
+ @Override
+ public void error(String format, Object arg) {
+ if (logger.isLoggable(Level.SEVERE)) {
+ FormattingTuple ft = MessageFormatter.format(format, arg);
+ log(SELF, Level.SEVERE, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at the SEVERE level according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the SEVERE level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argA
+ * the first argument
+ * @param argB
+ * the second argument
+ */
+ @Override
+ public void error(String format, Object argA, Object argB) {
+ if (logger.isLoggable(Level.SEVERE)) {
+ FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+ log(SELF, Level.SEVERE, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at level SEVERE according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the SEVERE level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param arguments
+ * an array of arguments
+ */
+ @Override
+ public void error(String format, Object... arguments) {
+ if (logger.isLoggable(Level.SEVERE)) {
+ FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments);
+ log(SELF, Level.SEVERE, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log an exception (throwable) at the SEVERE level with an accompanying
+ * message.
+ *
+ * @param msg
+ * the message accompanying the exception
+ * @param t
+ * the exception (throwable) to log
+ */
+ @Override
+ public void error(String msg, Throwable t) {
+ if (logger.isLoggable(Level.SEVERE)) {
+ log(SELF, Level.SEVERE, msg, t);
+ }
+ }
+
+ /**
+ * Log the message at the specified level with the specified throwable if any.
+ * This method creates a LogRecord and fills in caller date before calling
+ * this instance's JDK14 logger.
+ *
+ * See bug report #13 for more details.
+ */
+ private void log(String callerFQCN, Level level, String msg, Throwable t) {
+ // millis and thread are filled by the constructor
+ LogRecord record = new LogRecord(level, msg);
+ record.setLoggerName(name());
+ record.setThrown(t);
+ fillCallerData(callerFQCN, record);
+ logger.log(record);
+ }
+
+ static final String SELF = JdkLogger.class.getName();
+ static final String SUPER = AbstractInternalLogger.class.getName();
+
+ /**
+ * Fill in caller data if possible.
+ *
+ * @param record
+ * The record to update
+ */
+ private static void fillCallerData(String callerFQCN, LogRecord record) {
+ StackTraceElement[] steArray = new Throwable().getStackTrace();
+
+ int selfIndex = -1;
+ for (int i = 0; i < steArray.length; i++) {
+ final String className = steArray[i].getClassName();
+ if (className.equals(callerFQCN) || className.equals(SUPER)) {
+ selfIndex = i;
+ break;
+ }
+ }
+
+ int found = -1;
+ for (int i = selfIndex + 1; i < steArray.length; i++) {
+ final String className = steArray[i].getClassName();
+ if (!(className.equals(callerFQCN) || className.equals(SUPER))) {
+ found = i;
+ break;
+ }
+ }
+
+ if (found != -1) {
+ StackTraceElement ste = steArray[found];
+ // setting the class name has the side effect of setting
+ // the needToInferCaller variable to false.
+ record.setSourceClassName(ste.getClassName());
+ record.setSourceMethodName(ste.getMethodName());
+ }
}
}
diff --git a/common/src/main/java/io/netty/logging/JdkLoggerFactory.java b/common/src/main/java/io/netty/logging/JdkLoggerFactory.java
index e98f6232bf..5dd0f032c2 100644
--- a/common/src/main/java/io/netty/logging/JdkLoggerFactory.java
+++ b/common/src/main/java/io/netty/logging/JdkLoggerFactory.java
@@ -27,8 +27,6 @@ public class JdkLoggerFactory extends InternalLoggerFactory {
@Override
public InternalLogger newInstance(String name) {
- final Logger logger =
- Logger.getLogger(name);
- return new JdkLogger(logger, name);
+ return new JdkLogger(Logger.getLogger(name));
}
}
diff --git a/common/src/main/java/io/netty/logging/Log4JLogger.java b/common/src/main/java/io/netty/logging/Log4JLogger.java
index 5e379d2932..17bceb933e 100644
--- a/common/src/main/java/io/netty/logging/Log4JLogger.java
+++ b/common/src/main/java/io/netty/logging/Log4JLogger.java
@@ -13,8 +13,33 @@
* License for the specific language governing permissions and limitations
* under the License.
*/
+/**
+ * Copyright (c) 2004-2011 QOS.ch
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
package io.netty.logging;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
/**
@@ -23,89 +48,550 @@ import org.apache.log4j.Logger;
*/
class Log4JLogger extends AbstractInternalLogger {
- private final Logger logger;
+ private static final long serialVersionUID = 2851357342488183058L;
+
+ final transient Logger logger;
+
+ /**
+ * Following the pattern discussed in pages 162 through 168 of "The complete
+ * log4j manual".
+ */
+ static final String FQCN = Log4JLogger.class.getName();
+
+ // Does the log4j version in use recognize the TRACE level?
+ // The trace level was introduced in log4j 1.2.12.
+ final boolean traceCapable;
Log4JLogger(Logger logger) {
+ super(logger.getName());
this.logger = logger;
+ traceCapable = isTraceCapable();
}
- @Override
- public void trace(String msg) {
- logger.trace(msg);
- }
-
- @Override
- public void trace(String msg, Throwable cause) {
- logger.trace(msg, cause);
- }
-
- @Override
- public void debug(String msg) {
- logger.debug(msg);
- }
-
- @Override
- public void debug(String msg, Throwable cause) {
- logger.debug(msg, cause);
- }
-
- @Override
- public void error(String msg) {
- logger.error(msg);
- }
-
- @Override
- public void error(String msg, Throwable cause) {
- logger.error(msg, cause);
- }
-
- @Override
- public void info(String msg) {
- logger.info(msg);
- }
-
- @Override
- public void info(String msg, Throwable cause) {
- logger.info(msg, cause);
+ private boolean isTraceCapable() {
+ try {
+ logger.isTraceEnabled();
+ return true;
+ } catch (NoSuchMethodError e) {
+ return false;
+ }
}
+ /**
+ * Is this logger instance enabled for the TRACE level?
+ *
+ * @return True if this Logger is enabled for level TRACE, false otherwise.
+ */
@Override
public boolean isTraceEnabled() {
- return logger.isTraceEnabled();
+ if (traceCapable) {
+ return logger.isTraceEnabled();
+ } else {
+ return logger.isDebugEnabled();
+ }
}
+ /**
+ * Log a message object at level TRACE.
+ *
+ * @param msg
+ * - the message object to be logged
+ */
+ @Override
+ public void trace(String msg) {
+ logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, msg, null);
+ }
+
+ /**
+ * Log a message at level TRACE according to the specified format and
+ * argument.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for level TRACE.
+ *
+ *
+ * @param format
+ * the format string
+ * @param arg
+ * the argument
+ */
+ @Override
+ public void trace(String format, Object arg) {
+ if (isTraceEnabled()) {
+ FormattingTuple ft = MessageFormatter.format(format, arg);
+ logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, ft
+ .getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at level TRACE according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the TRACE level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argA
+ * the first argument
+ * @param argB
+ * the second argument
+ */
+ @Override
+ public void trace(String format, Object argA, Object argB) {
+ if (isTraceEnabled()) {
+ FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+ logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, ft
+ .getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at level TRACE according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the TRACE level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param arguments
+ * an array of arguments
+ */
+ @Override
+ public void trace(String format, Object... arguments) {
+ if (isTraceEnabled()) {
+ FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments);
+ logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, ft
+ .getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log an exception (throwable) at level TRACE with an accompanying message.
+ *
+ * @param msg
+ * the message accompanying the exception
+ * @param t
+ * the exception (throwable) to log
+ */
+ @Override
+ public void trace(String msg, Throwable t) {
+ logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, msg, t);
+ }
+
+ /**
+ * Is this logger instance enabled for the DEBUG level?
+ *
+ * @return True if this Logger is enabled for level DEBUG, false otherwise.
+ */
@Override
public boolean isDebugEnabled() {
return logger.isDebugEnabled();
}
+ /**
+ * Log a message object at level DEBUG.
+ *
+ * @param msg
+ * - the message object to be logged
+ */
@Override
- public boolean isErrorEnabled() {
- return true;
+ public void debug(String msg) {
+ logger.log(FQCN, Level.DEBUG, msg, null);
}
+ /**
+ * Log a message at level DEBUG according to the specified format and
+ * argument.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for level DEBUG.
+ *
+ *
+ * @param format
+ * the format string
+ * @param arg
+ * the argument
+ */
+ @Override
+ public void debug(String format, Object arg) {
+ if (logger.isDebugEnabled()) {
+ FormattingTuple ft = MessageFormatter.format(format, arg);
+ logger.log(FQCN, Level.DEBUG, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at level DEBUG according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the DEBUG level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argA
+ * the first argument
+ * @param argB
+ * the second argument
+ */
+ @Override
+ public void debug(String format, Object argA, Object argB) {
+ if (logger.isDebugEnabled()) {
+ FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+ logger.log(FQCN, Level.DEBUG, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at level DEBUG according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the DEBUG level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param arguments an array of arguments
+ */
+ @Override
+ public void debug(String format, Object... arguments) {
+ if (logger.isDebugEnabled()) {
+ FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments);
+ logger.log(FQCN, Level.DEBUG, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log an exception (throwable) at level DEBUG with an accompanying message.
+ *
+ * @param msg
+ * the message accompanying the exception
+ * @param t
+ * the exception (throwable) to log
+ */
+ @Override
+ public void debug(String msg, Throwable t) {
+ logger.log(FQCN, Level.DEBUG, msg, t);
+ }
+
+ /**
+ * Is this logger instance enabled for the INFO level?
+ *
+ * @return True if this Logger is enabled for the INFO level, false otherwise.
+ */
@Override
public boolean isInfoEnabled() {
return logger.isInfoEnabled();
}
+ /**
+ * Log a message object at the INFO level.
+ *
+ * @param msg
+ * - the message object to be logged
+ */
+ @Override
+ public void info(String msg) {
+ logger.log(FQCN, Level.INFO, msg, null);
+ }
+
+ /**
+ * Log a message at level INFO according to the specified format and argument.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the INFO level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param arg
+ * the argument
+ */
+ @Override
+ public void info(String format, Object arg) {
+ if (logger.isInfoEnabled()) {
+ FormattingTuple ft = MessageFormatter.format(format, arg);
+ logger.log(FQCN, Level.INFO, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at the INFO level according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the INFO level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argA
+ * the first argument
+ * @param argB
+ * the second argument
+ */
+ @Override
+ public void info(String format, Object argA, Object argB) {
+ if (logger.isInfoEnabled()) {
+ FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+ logger.log(FQCN, Level.INFO, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at level INFO according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the INFO level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argArray
+ * an array of arguments
+ */
+ @Override
+ public void info(String format, Object... argArray) {
+ if (logger.isInfoEnabled()) {
+ FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
+ logger.log(FQCN, Level.INFO, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log an exception (throwable) at the INFO level with an accompanying
+ * message.
+ *
+ * @param msg
+ * the message accompanying the exception
+ * @param t
+ * the exception (throwable) to log
+ */
+ @Override
+ public void info(String msg, Throwable t) {
+ logger.log(FQCN, Level.INFO, msg, t);
+ }
+
+ /**
+ * Is this logger instance enabled for the WARN level?
+ *
+ * @return True if this Logger is enabled for the WARN level, false otherwise.
+ */
@Override
public boolean isWarnEnabled() {
- return true;
+ return logger.isEnabledFor(Level.WARN);
}
+ /**
+ * Log a message object at the WARN level.
+ *
+ * @param msg
+ * - the message object to be logged
+ */
@Override
public void warn(String msg) {
- logger.warn(msg);
+ logger.log(FQCN, Level.WARN, msg, null);
}
+ /**
+ * Log a message at the WARN level according to the specified format and
+ * argument.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the WARN level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param arg
+ * the argument
+ */
@Override
- public void warn(String msg, Throwable cause) {
- logger.warn(msg, cause);
+ public void warn(String format, Object arg) {
+ if (logger.isEnabledFor(Level.WARN)) {
+ FormattingTuple ft = MessageFormatter.format(format, arg);
+ logger.log(FQCN, Level.WARN, ft.getMessage(), ft.getThrowable());
+ }
}
+ /**
+ * Log a message at the WARN level according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the WARN level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argA
+ * the first argument
+ * @param argB
+ * the second argument
+ */
@Override
- public String toString() {
- return String.valueOf(logger.getName());
+ public void warn(String format, Object argA, Object argB) {
+ if (logger.isEnabledFor(Level.WARN)) {
+ FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+ logger.log(FQCN, Level.WARN, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at level WARN according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the WARN level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argArray
+ * an array of arguments
+ */
+ @Override
+ public void warn(String format, Object... argArray) {
+ if (logger.isEnabledFor(Level.WARN)) {
+ FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
+ logger.log(FQCN, Level.WARN, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log an exception (throwable) at the WARN level with an accompanying
+ * message.
+ *
+ * @param msg
+ * the message accompanying the exception
+ * @param t
+ * the exception (throwable) to log
+ */
+ @Override
+ public void warn(String msg, Throwable t) {
+ logger.log(FQCN, Level.WARN, msg, t);
+ }
+
+ /**
+ * Is this logger instance enabled for level ERROR?
+ *
+ * @return True if this Logger is enabled for level ERROR, false otherwise.
+ */
+ @Override
+ public boolean isErrorEnabled() {
+ return logger.isEnabledFor(Level.ERROR);
+ }
+
+ /**
+ * Log a message object at the ERROR level.
+ *
+ * @param msg
+ * - the message object to be logged
+ */
+ @Override
+ public void error(String msg) {
+ logger.log(FQCN, Level.ERROR, msg, null);
+ }
+
+ /**
+ * Log a message at the ERROR level according to the specified format and
+ * argument.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the ERROR level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param arg
+ * the argument
+ */
+ @Override
+ public void error(String format, Object arg) {
+ if (logger.isEnabledFor(Level.ERROR)) {
+ FormattingTuple ft = MessageFormatter.format(format, arg);
+ logger.log(FQCN, Level.ERROR, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at the ERROR level according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the ERROR level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argA
+ * the first argument
+ * @param argB
+ * the second argument
+ */
+ @Override
+ public void error(String format, Object argA, Object argB) {
+ if (logger.isEnabledFor(Level.ERROR)) {
+ FormattingTuple ft = MessageFormatter.format(format, argA, argB);
+ logger.log(FQCN, Level.ERROR, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log a message at level ERROR according to the specified format and
+ * arguments.
+ *
+ *
+ * This form avoids superfluous object creation when the logger is disabled
+ * for the ERROR level.
+ *
+ *
+ * @param format
+ * the format string
+ * @param argArray
+ * an array of arguments
+ */
+ @Override
+ public void error(String format, Object... argArray) {
+ if (logger.isEnabledFor(Level.ERROR)) {
+ FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray);
+ logger.log(FQCN, Level.ERROR, ft.getMessage(), ft.getThrowable());
+ }
+ }
+
+ /**
+ * Log an exception (throwable) at the ERROR level with an accompanying
+ * message.
+ *
+ * @param msg
+ * the message accompanying the exception
+ * @param t
+ * the exception (throwable) to log
+ */
+ @Override
+ public void error(String msg, Throwable t) {
+ logger.log(FQCN, Level.ERROR, msg, t);
}
}
diff --git a/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java b/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java
index 4b0667ee45..47f84fc1a2 100644
--- a/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java
+++ b/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java
@@ -26,8 +26,6 @@ public class Log4JLoggerFactory extends InternalLoggerFactory {
@Override
public InternalLogger newInstance(String name) {
- final Logger logger =
- Logger.getLogger(name);
- return new Log4JLogger(logger);
+ return new Log4JLogger(Logger.getLogger(name));
}
}
diff --git a/common/src/main/java/io/netty/logging/MessageFormatter.java b/common/src/main/java/io/netty/logging/MessageFormatter.java
new file mode 100644
index 0000000000..7a9eb234e8
--- /dev/null
+++ b/common/src/main/java/io/netty/logging/MessageFormatter.java
@@ -0,0 +1,428 @@
+/*
+ * Copyright 2013 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+/**
+ * Copyright (c) 2004-2011 QOS.ch
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+package io.netty.logging;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+
+// contributors: lizongbo: proposed special treatment of array parameter values
+// Joern Huxhorn: pointed out double[] omission, suggested deep array copy
+
+/**
+ * Formats messages according to very simple substitution rules. Substitutions
+ * can be made 1, 2 or more arguments.
+ *
+ *
+ * For example,
+ *
+ *
+ * MessageFormatter.format("Hi {}.", "there")
+ *
+ *
+ * will return the string "Hi there.".
+ *
+ * The {} pair is called the formatting anchor. It serves to designate
+ * the location where arguments need to be substituted within the message
+ * pattern.
+ *
+ * In case your message contains the '{' or the '}' character, you do not have
+ * to do anything special unless the '}' character immediately follows '{'. For
+ * example,
+ *
+ *
+ * MessageFormatter.format("Set {1,2,3} is not equal to {}.", "1,2");
+ *
+ *
+ * will return the string "Set {1,2,3} is not equal to 1,2.".
+ *
+ *
+ * If for whatever reason you need to place the string "{}" in the message
+ * without its formatting anchor meaning, then you need to escape the
+ * '{' character with '\', that is the backslash character. Only the '{'
+ * character should be escaped. There is no need to escape the '}' character.
+ * For example,
+ *
+ *
+ * MessageFormatter.format("Set \\{} is not equal to {}.", "1,2");
+ *
+ *
+ * will return the string "Set {} is not equal to 1,2.".
+ *
+ *
+ * The escaping behavior just described can be overridden by escaping the escape
+ * character '\'. Calling
+ *
+ *
+ * MessageFormatter.format("File name is C:\\\\{}.", "file.zip");
+ *
+ *
+ * will return the string "File name is C:\file.zip".
+ *
+ *
+ * The formatting conventions are different than those of {@link MessageFormat}
+ * which ships with the Java platform. This is justified by the fact that
+ * SLF4J's implementation is 10 times faster than that of {@link MessageFormat}.
+ * This local performance difference is both measurable and significant in the
+ * larger context of the complete logging processing chain.
+ *
+ *
+ * See also {@link #format(String, Object)},
+ * {@link #format(String, Object, Object)} and
+ * {@link #arrayFormat(String, Object[])} methods for more details.
+ */
+final class MessageFormatter {
+ static final char DELIM_START = '{';
+ static final char DELIM_STOP = '}';
+ static final String DELIM_STR = "{}";
+ private static final char ESCAPE_CHAR = '\\';
+
+ /**
+ * Performs single argument substitution for the 'messagePattern' passed as
+ * parameter.
+ *
+ * For example,
+ *
+ *
+ * MessageFormatter.format("Hi {}.", "there");
+ *
+ *
+ * will return the string "Hi there.".
+ *
+ *
+ * @param messagePattern The message pattern which will be parsed and formatted
+ * @param arg The argument to be substituted in place of the formatting anchor
+ * @return The formatted message
+ */
+ static FormattingTuple format(String messagePattern, Object arg) {
+ return arrayFormat(messagePattern, new Object[]{arg});
+ }
+
+ /**
+ * Performs a two argument substitution for the 'messagePattern' passed as
+ * parameter.
+ *
+ * For example,
+ *
+ *
+ * MessageFormatter.format("Hi {}. My name is {}.", "Alice", "Bob");
+ *
+ *
+ * will return the string "Hi Alice. My name is Bob.".
+ *
+ * @param messagePattern The message pattern which will be parsed and formatted
+ * @param argA The argument to be substituted in place of the first formatting
+ * anchor
+ * @param argB The argument to be substituted in place of the second formatting
+ * anchor
+ * @return The formatted message
+ */
+ static FormattingTuple format(final String messagePattern,
+ Object argA, Object argB) {
+ return arrayFormat(messagePattern, new Object[]{argA, argB});
+ }
+
+ static Throwable getThrowableCandidate(Object[] argArray) {
+ if (argArray == null || argArray.length == 0) {
+ return null;
+ }
+
+ final Object lastEntry = argArray[argArray.length - 1];
+ if (lastEntry instanceof Throwable) {
+ return (Throwable) lastEntry;
+ }
+ return null;
+ }
+
+ /**
+ * Same principle as the {@link #format(String, Object)} and
+ * {@link #format(String, Object, Object)} methods except that any number of
+ * arguments can be passed in an array.
+ *
+ * @param messagePattern The message pattern which will be parsed and formatted
+ * @param argArray An array of arguments to be substituted in place of formatting
+ * anchors
+ * @return The formatted message
+ */
+ static FormattingTuple arrayFormat(final String messagePattern,
+ final Object[] argArray) {
+
+ Throwable throwableCandidate = getThrowableCandidate(argArray);
+
+ if (messagePattern == null) {
+ return new FormattingTuple(null, argArray, throwableCandidate);
+ }
+
+ if (argArray == null) {
+ return new FormattingTuple(messagePattern);
+ }
+
+ int i = 0;
+ int j;
+ StringBuffer sbuf = new StringBuffer(messagePattern.length() + 50);
+
+ int L;
+ for (L = 0; L < argArray.length; L++) {
+
+ j = messagePattern.indexOf(DELIM_STR, i);
+
+ if (j == -1) {
+ // no more variables
+ if (i == 0) { // this is a simple string
+ return new FormattingTuple(messagePattern, argArray,
+ throwableCandidate);
+ } else { // add the tail string which contains no variables and return
+ // the result.
+ sbuf.append(messagePattern.substring(i, messagePattern.length()));
+ return new FormattingTuple(sbuf.toString(), argArray,
+ throwableCandidate);
+ }
+ } else {
+ if (isEscapedDelimeter(messagePattern, j)) {
+ if (!isDoubleEscaped(messagePattern, j)) {
+ L--; // DELIM_START was escaped, thus should not be incremented
+ sbuf.append(messagePattern.substring(i, j - 1));
+ sbuf.append(DELIM_START);
+ i = j + 1;
+ } else {
+ // The escape character preceding the delimiter start is
+ // itself escaped: "abc x:\\{}"
+ // we have to consume one backward slash
+ sbuf.append(messagePattern.substring(i, j - 1));
+ deeplyAppendParameter(sbuf, argArray[L], new HashMap());
+ i = j + 2;
+ }
+ } else {
+ // normal case
+ sbuf.append(messagePattern.substring(i, j));
+ deeplyAppendParameter(sbuf, argArray[L], new HashMap());
+ i = j + 2;
+ }
+ }
+ }
+ // append the characters following the last {} pair.
+ sbuf.append(messagePattern.substring(i, messagePattern.length()));
+ if (L < argArray.length - 1) {
+ return new FormattingTuple(sbuf.toString(), argArray, throwableCandidate);
+ } else {
+ return new FormattingTuple(sbuf.toString(), argArray, null);
+ }
+ }
+
+ static boolean isEscapedDelimeter(String messagePattern,
+ int delimeterStartIndex) {
+
+ if (delimeterStartIndex == 0) {
+ return false;
+ }
+ return messagePattern.charAt(delimeterStartIndex - 1) == ESCAPE_CHAR;
+ }
+
+ static boolean isDoubleEscaped(String messagePattern,
+ int delimeterStartIndex) {
+ return delimeterStartIndex >= 2 && messagePattern.charAt(delimeterStartIndex - 2) == ESCAPE_CHAR;
+ }
+
+ // special treatment of array values was suggested by 'lizongbo'
+ private static void deeplyAppendParameter(StringBuffer sbuf, Object o,
+ Map seenMap) {
+ if (o == null) {
+ sbuf.append("null");
+ return;
+ }
+ if (!o.getClass().isArray()) {
+ safeObjectAppend(sbuf, o);
+ } else {
+ // check for primitive array types because they
+ // unfortunately cannot be cast to Object[]
+ if (o instanceof boolean[]) {
+ booleanArrayAppend(sbuf, (boolean[]) o);
+ } else if (o instanceof byte[]) {
+ byteArrayAppend(sbuf, (byte[]) o);
+ } else if (o instanceof char[]) {
+ charArrayAppend(sbuf, (char[]) o);
+ } else if (o instanceof short[]) {
+ shortArrayAppend(sbuf, (short[]) o);
+ } else if (o instanceof int[]) {
+ intArrayAppend(sbuf, (int[]) o);
+ } else if (o instanceof long[]) {
+ longArrayAppend(sbuf, (long[]) o);
+ } else if (o instanceof float[]) {
+ floatArrayAppend(sbuf, (float[]) o);
+ } else if (o instanceof double[]) {
+ doubleArrayAppend(sbuf, (double[]) o);
+ } else {
+ objectArrayAppend(sbuf, (Object[]) o, seenMap);
+ }
+ }
+ }
+
+ private static void safeObjectAppend(StringBuffer sbuf, Object o) {
+ try {
+ String oAsString = o.toString();
+ sbuf.append(oAsString);
+ } catch (Throwable t) {
+ System.err
+ .println("SLF4J: Failed toString() invocation on an object of type ["
+ + o.getClass().getName() + ']');
+ t.printStackTrace();
+ sbuf.append("[FAILED toString()]");
+ }
+ }
+
+ private static void objectArrayAppend(StringBuffer sbuf, Object[] a,
+ Map seenMap) {
+ sbuf.append('[');
+ if (!seenMap.containsKey(a)) {
+ seenMap.put(a, null);
+ final int len = a.length;
+ for (int i = 0; i < len; i++) {
+ deeplyAppendParameter(sbuf, a[i], seenMap);
+ if (i != len - 1) {
+ sbuf.append(", ");
+ }
+ }
+ // allow repeats in siblings
+ seenMap.remove(a);
+ } else {
+ sbuf.append("...");
+ }
+ sbuf.append(']');
+ }
+
+ private static void booleanArrayAppend(StringBuffer sbuf, boolean[] a) {
+ sbuf.append('[');
+ final int len = a.length;
+ for (int i = 0; i < len; i++) {
+ sbuf.append(a[i]);
+ if (i != len - 1) {
+ sbuf.append(", ");
+ }
+ }
+ sbuf.append(']');
+ }
+
+ private static void byteArrayAppend(StringBuffer sbuf, byte[] a) {
+ sbuf.append('[');
+ final int len = a.length;
+ for (int i = 0; i < len; i++) {
+ sbuf.append(a[i]);
+ if (i != len - 1) {
+ sbuf.append(", ");
+ }
+ }
+ sbuf.append(']');
+ }
+
+ private static void charArrayAppend(StringBuffer sbuf, char[] a) {
+ sbuf.append('[');
+ final int len = a.length;
+ for (int i = 0; i < len; i++) {
+ sbuf.append(a[i]);
+ if (i != len - 1) {
+ sbuf.append(", ");
+ }
+ }
+ sbuf.append(']');
+ }
+
+ private static void shortArrayAppend(StringBuffer sbuf, short[] a) {
+ sbuf.append('[');
+ final int len = a.length;
+ for (int i = 0; i < len; i++) {
+ sbuf.append(a[i]);
+ if (i != len - 1) {
+ sbuf.append(", ");
+ }
+ }
+ sbuf.append(']');
+ }
+
+ private static void intArrayAppend(StringBuffer sbuf, int[] a) {
+ sbuf.append('[');
+ final int len = a.length;
+ for (int i = 0; i < len; i++) {
+ sbuf.append(a[i]);
+ if (i != len - 1) {
+ sbuf.append(", ");
+ }
+ }
+ sbuf.append(']');
+ }
+
+ private static void longArrayAppend(StringBuffer sbuf, long[] a) {
+ sbuf.append('[');
+ final int len = a.length;
+ for (int i = 0; i < len; i++) {
+ sbuf.append(a[i]);
+ if (i != len - 1) {
+ sbuf.append(", ");
+ }
+ }
+ sbuf.append(']');
+ }
+
+ private static void floatArrayAppend(StringBuffer sbuf, float[] a) {
+ sbuf.append('[');
+ final int len = a.length;
+ for (int i = 0; i < len; i++) {
+ sbuf.append(a[i]);
+ if (i != len - 1) {
+ sbuf.append(", ");
+ }
+ }
+ sbuf.append(']');
+ }
+
+ private static void doubleArrayAppend(StringBuffer sbuf, double[] a) {
+ sbuf.append('[');
+ final int len = a.length;
+ for (int i = 0; i < len; i++) {
+ sbuf.append(a[i]);
+ if (i != len - 1) {
+ sbuf.append(", ");
+ }
+ }
+ sbuf.append(']');
+ }
+
+ private MessageFormatter() {
+ }
+}
diff --git a/common/src/main/java/io/netty/logging/OsgiLogger.java b/common/src/main/java/io/netty/logging/OsgiLogger.java
deleted file mode 100644
index 0320268a4d..0000000000
--- a/common/src/main/java/io/netty/logging/OsgiLogger.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright 2012 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.logging;
-
-import org.osgi.service.log.LogService;
-
-/**
- * OSGi {@link LogService} logger.
- */
-class OsgiLogger extends AbstractInternalLogger {
-
- private final OsgiLoggerFactory parent;
- private final InternalLogger fallback;
- private final String name;
- private final String prefix;
-
- OsgiLogger(OsgiLoggerFactory parent, String name, InternalLogger fallback) {
- this.parent = parent;
- this.name = name;
- this.fallback = fallback;
- prefix = '[' + name + "] ";
- }
-
- @Override
- public void trace(String msg) {
- // This logger doesn't have TRACE level
- }
-
- @Override
- public void trace(String msg, Throwable cause) {
- // This logger doesn't have TRACE level
- }
-
- @Override
- public void debug(String msg) {
- LogService logService = parent.getLogService();
- if (logService != null) {
- logService.log(LogService.LOG_DEBUG, prefix + msg);
- } else {
- fallback.debug(msg);
- }
- }
-
- @Override
- public void debug(String msg, Throwable cause) {
- LogService logService = parent.getLogService();
- if (logService != null) {
- logService.log(LogService.LOG_DEBUG, prefix + msg, cause);
- } else {
- fallback.debug(msg, cause);
- }
- }
-
- @Override
- public void error(String msg) {
- LogService logService = parent.getLogService();
- if (logService != null) {
- logService.log(LogService.LOG_ERROR, prefix + msg);
- } else {
- fallback.error(msg);
- }
- }
-
- @Override
- public void error(String msg, Throwable cause) {
- LogService logService = parent.getLogService();
- if (logService != null) {
- logService.log(LogService.LOG_ERROR, prefix + msg, cause);
- } else {
- fallback.error(msg, cause);
- }
- }
-
- @Override
- public void info(String msg) {
- LogService logService = parent.getLogService();
- if (logService != null) {
- logService.log(LogService.LOG_INFO, prefix + msg);
- } else {
- fallback.info(msg);
- }
- }
-
- @Override
- public void info(String msg, Throwable cause) {
- LogService logService = parent.getLogService();
- if (logService != null) {
- logService.log(LogService.LOG_INFO, prefix + msg, cause);
- } else {
- fallback.info(msg, cause);
- }
- }
-
- @Override
- public boolean isTraceEnabled() {
- return false;
- }
-
- @Override
- public boolean isDebugEnabled() {
- return true;
- }
-
- @Override
- public boolean isErrorEnabled() {
- return true;
- }
-
- @Override
- public boolean isInfoEnabled() {
- return true;
- }
-
- @Override
- public boolean isWarnEnabled() {
- return true;
- }
-
- @Override
- public void warn(String msg) {
- LogService logService = parent.getLogService();
- if (logService != null) {
- logService.log(LogService.LOG_WARNING, prefix + msg);
- } else {
- fallback.warn(msg);
- }
- }
-
- @Override
- public void warn(String msg, Throwable cause) {
- LogService logService = parent.getLogService();
- if (logService != null) {
- logService.log(LogService.LOG_WARNING, prefix + msg, cause);
- } else {
- fallback.warn(msg, cause);
- }
- }
-
- @Override
- public String toString() {
- return name;
- }
-}
diff --git a/common/src/main/java/io/netty/logging/OsgiLoggerFactory.java b/common/src/main/java/io/netty/logging/OsgiLoggerFactory.java
deleted file mode 100644
index fae5da758e..0000000000
--- a/common/src/main/java/io/netty/logging/OsgiLoggerFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2012 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.logging;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogService;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * Logger factory which creates an OSGi
- * {@link LogService} logger.
- */
-@SuppressWarnings("all")
-public class OsgiLoggerFactory extends InternalLoggerFactory {
-
- private final ServiceTracker logServiceTracker;
- private final InternalLoggerFactory fallback;
- volatile LogService logService;
-
- public OsgiLoggerFactory(BundleContext ctx) {
- this(ctx, null);
- }
-
- public OsgiLoggerFactory(BundleContext ctx, InternalLoggerFactory fallback) {
- if (ctx == null) {
- throw new NullPointerException("ctx");
- }
- if (fallback == null) {
- fallback = InternalLoggerFactory.getDefaultFactory();
- if (fallback instanceof OsgiLoggerFactory) {
- fallback = new JdkLoggerFactory();
- }
- }
-
- this.fallback = fallback;
- logServiceTracker = new ServiceTracker(
- ctx, "org.osgi.service.log.LogService", null) {
- @Override
- public Object addingService(ServiceReference reference) {
- LogService service = (LogService) super.addingService(reference);
- logService = service;
- return service;
- }
-
- @Override
- public void removedService(ServiceReference reference, Object service) {
- logService = null;
- }
- };
- logServiceTracker.open();
- }
-
- public InternalLoggerFactory getFallback() {
- return fallback;
- }
-
- public LogService getLogService() {
- return logService;
- }
-
- public void destroy() {
- logService = null;
- logServiceTracker.close();
- }
-
- @Override
- public InternalLogger newInstance(String name) {
- return new OsgiLogger(this, name, fallback.newInstance(name));
- }
-}
diff --git a/common/src/main/java/io/netty/logging/Slf4JLogger.java b/common/src/main/java/io/netty/logging/Slf4JLogger.java
index 259757d35c..fee653d8ac 100644
--- a/common/src/main/java/io/netty/logging/Slf4JLogger.java
+++ b/common/src/main/java/io/netty/logging/Slf4JLogger.java
@@ -22,65 +22,73 @@ import org.slf4j.Logger;
*/
class Slf4JLogger extends AbstractInternalLogger {
- private final Logger logger;
+ private static final long serialVersionUID = 108038972685130825L;
+
+ private final transient Logger logger;
Slf4JLogger(Logger logger) {
+ super(logger.getName());
this.logger = logger;
}
- @Override
- public void trace(String msg) {
- logger.trace(msg);
- }
-
- @Override
- public void trace(String msg, Throwable cause) {
- logger.trace(msg, cause);
- }
-
- @Override
- public void debug(String msg) {
- logger.debug(msg);
- }
-
- @Override
- public void debug(String msg, Throwable cause) {
- logger.debug(msg, cause);
- }
-
- @Override
- public void error(String msg) {
- logger.error(msg);
- }
-
- @Override
- public void error(String msg, Throwable cause) {
- logger.error(msg, cause);
- }
-
- @Override
- public void info(String msg) {
- logger.info(msg);
- }
-
- @Override
- public void info(String msg, Throwable cause) {
- logger.info(msg, cause);
- }
-
@Override
public boolean isTraceEnabled() {
return logger.isTraceEnabled();
}
+ @Override
+ public void trace(String msg) {
+ logger.trace(msg);
+ }
+
+ @Override
+ public void trace(String format, Object arg) {
+ logger.trace(format, arg);
+ }
+
+ @Override
+ public void trace(String format, Object argA, Object argB) {
+ logger.trace(format, argA, argB);
+ }
+
+ @Override
+ public void trace(String format, Object[] argArray) {
+ logger.trace(format, argArray);
+ }
+
+ @Override
+ public void trace(String msg, Throwable t) {
+ logger.trace(msg, t);
+ }
+
@Override
public boolean isDebugEnabled() {
return logger.isDebugEnabled();
}
@Override
- public boolean isErrorEnabled() {
- return logger.isErrorEnabled();
+ public void debug(String msg) {
+ logger.debug(msg);
+ }
+
+ @Override
+ public void debug(String format, Object arg) {
+ logger.debug(format, arg);
+ }
+
+ @Override
+ public void debug(String format, Object argA, Object argB) {
+ logger.debug(format, argA, argB);
+ }
+
+ @Override
+ public void debug(String format, Object[] argArray) {
+ logger.debug(format, argArray);
+ }
+
+ @Override
+ public void debug(String msg, Throwable t) {
+ logger.debug(msg, t);
}
@Override
@@ -88,6 +96,31 @@ class Slf4JLogger extends AbstractInternalLogger {
return logger.isInfoEnabled();
}
+ @Override
+ public void info(String msg) {
+ logger.info(msg);
+ }
+
+ @Override
+ public void info(String format, Object arg) {
+ logger.info(format, arg);
+ }
+
+ @Override
+ public void info(String format, Object argA, Object argB) {
+ logger.info(format, argA, argB);
+ }
+
+ @Override
+ public void info(String format, Object[] argArray) {
+ logger.info(format, argArray);
+ }
+
+ @Override
+ public void info(String msg, Throwable t) {
+ logger.info(msg, t);
+ }
+
@Override
public boolean isWarnEnabled() {
return logger.isWarnEnabled();
@@ -99,12 +132,52 @@ class Slf4JLogger extends AbstractInternalLogger {
}
@Override
- public void warn(String msg, Throwable cause) {
- logger.warn(msg, cause);
+ public void warn(String format, Object arg) {
+ logger.warn(format, arg);
}
@Override
- public String toString() {
- return String.valueOf(logger.getName());
+ public void warn(String format, Object[] argArray) {
+ logger.warn(format, argArray);
+ }
+
+ @Override
+ public void warn(String format, Object argA, Object argB) {
+ logger.warn(format, argA, argB);
+ }
+
+ @Override
+ public void warn(String msg, Throwable t) {
+ logger.warn(msg, t);
+ }
+
+ @Override
+ public boolean isErrorEnabled() {
+ return logger.isErrorEnabled();
+ }
+
+ @Override
+ public void error(String msg) {
+ logger.error(msg);
+ }
+
+ @Override
+ public void error(String format, Object arg) {
+ logger.error(format, arg);
+ }
+
+ @Override
+ public void error(String format, Object argA, Object argB) {
+ logger.error(format, argA, argB);
+ }
+
+ @Override
+ public void error(String format, Object[] argArray) {
+ logger.error(format, argArray);
+ }
+
+ @Override
+ public void error(String msg, Throwable t) {
+ logger.error(msg, t);
}
}
diff --git a/common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java b/common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java
index b8860591f2..e81d3296de 100644
--- a/common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java
+++ b/common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java
@@ -16,8 +16,12 @@
package io.netty.logging;
-import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.slf4j.helpers.NOPLoggerFactory;
+
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
/**
* Logger factory which creates a SLF4J
@@ -25,10 +29,41 @@ import org.slf4j.LoggerFactory;
*/
public class Slf4JLoggerFactory extends InternalLoggerFactory {
+ public Slf4JLoggerFactory() {
+ }
+
+ Slf4JLoggerFactory(boolean failIfNOP) {
+ assert failIfNOP; // Should be always called with true.
+
+ // SFL4J writes it error messages to System.err. Capture them so that the user does not see such a message on
+ // the console during automatic detection.
+ final StringBuffer buf = new StringBuffer();
+ final PrintStream err = System.err;
+ try {
+ System.setErr(new PrintStream(new OutputStream() {
+ @Override
+ public void write(int b) {
+ buf.append((char) b);
+ }
+ }, true, "US-ASCII"));
+ } catch (UnsupportedEncodingException e) {
+ throw new Error(e);
+ }
+
+ try {
+ if (LoggerFactory.getILoggerFactory() instanceof NOPLoggerFactory) {
+ throw new NoClassDefFoundError(buf.toString());
+ } else {
+ err.print(buf.toString());
+ err.flush();
+ }
+ } finally {
+ System.setErr(err);
+ }
+ }
+
@Override
public InternalLogger newInstance(String name) {
- final Logger logger =
- LoggerFactory.getLogger(name);
- return new Slf4JLogger(logger);
+ return new Slf4JLogger(LoggerFactory.getLogger(name));
}
}
diff --git a/common/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java
index 32c552775a..7ea41870ff 100644
--- a/common/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java
+++ b/common/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java
@@ -15,16 +15,16 @@
*/
package io.netty.logging;
-import static org.junit.Assert.*;
-
import org.junit.Test;
+import static org.junit.Assert.*;
+
public class CommonsLoggerFactoryTest {
@Test
public void testCreation() {
InternalLogger logger = new CommonsLoggerFactory().newInstance("foo");
assertTrue(logger instanceof CommonsLogger);
- assertEquals("foo", logger.toString());
+ assertEquals("foo", logger.name());
}
}
diff --git a/common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java
index 5763f2b697..20d129ac58 100644
--- a/common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java
+++ b/common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java
@@ -15,13 +15,13 @@
*/
package io.netty.logging;
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
public class InternalLoggerFactoryTest {
private static final Exception e = new Exception();
private InternalLoggerFactory oldLoggerFactory;
@@ -49,11 +49,6 @@ public class InternalLoggerFactoryTest {
InternalLoggerFactory.setDefaultFactory(null);
}
- @Test
- public void shouldReturnWrappedLogger() {
- assertNotSame(mock, InternalLoggerFactory.getInstance("mock"));
- }
-
@Test
public void shouldGetInstance() {
InternalLoggerFactory.setDefaultFactory(oldLoggerFactory);
diff --git a/common/src/test/java/io/netty/logging/JBossLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/JBossLoggerFactoryTest.java
deleted file mode 100644
index 36d38e7699..0000000000
--- a/common/src/test/java/io/netty/logging/JBossLoggerFactoryTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2012 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.logging;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-public class JBossLoggerFactoryTest {
-
- @Test
- public void testCreation() {
- InternalLogger logger = new JBossLoggerFactory().newInstance("foo");
- assertTrue(logger instanceof JBossLogger);
- assertEquals("foo", logger.toString());
- }
-}
diff --git a/common/src/test/java/io/netty/logging/JBossLoggerTest.java b/common/src/test/java/io/netty/logging/JBossLoggerTest.java
deleted file mode 100644
index b1979f721b..0000000000
--- a/common/src/test/java/io/netty/logging/JBossLoggerTest.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright 2012 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.logging;
-
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-
-import org.jboss.logging.Logger;
-import org.junit.Test;
-
-public class JBossLoggerTest {
- private static final Exception e = new Exception();
-
- @Test
- public void testIsTraceEnabled() {
- Logger mock =
- createStrictMock(Logger.class);
-
- expect(mock.isTraceEnabled()).andReturn(true);
- replay(mock);
-
- InternalLogger logger = new JBossLogger(mock);
- assertTrue(logger.isTraceEnabled());
- verify(mock);
- }
-
- @Test
- @SuppressWarnings("deprecation")
- public void testIsDebugEnabled() {
- Logger mock =
- createStrictMock(Logger.class);
-
- expect(mock.isDebugEnabled()).andReturn(true);
- replay(mock);
-
- InternalLogger logger = new JBossLogger(mock);
- assertTrue(logger.isDebugEnabled());
- verify(mock);
- }
-
- @Test
- @SuppressWarnings("deprecation")
- public void testIsInfoEnabled() {
- Logger mock =
- createStrictMock(Logger.class);
-
- expect(mock.isInfoEnabled()).andReturn(true);
- replay(mock);
-
- InternalLogger logger = new JBossLogger(mock);
- assertTrue(logger.isInfoEnabled());
- verify(mock);
- }
-
- @Test
- public void testIsWarnEnabled() {
- Logger mock =
- createStrictMock(Logger.class);
- replay(mock);
-
- InternalLogger logger = new JBossLogger(mock);
- assertTrue(logger.isWarnEnabled());
- verify(mock);
- }
-
- @Test
- public void testIsErrorEnabled() {
- Logger mock =
- createStrictMock(Logger.class);
- replay(mock);
-
- InternalLogger logger = new JBossLogger(mock);
- assertTrue(logger.isErrorEnabled());
- verify(mock);
- }
-
- @Test
- public void testTrace() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.trace("a");
- replay(mock);
-
- InternalLogger logger = new JBossLogger(mock);
- logger.trace("a");
- verify(mock);
- }
-
- @Test
- public void testTraceWithException() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.trace("a", e);
- replay(mock);
-
- InternalLogger logger = new JBossLogger(mock);
- logger.trace("a", e);
- verify(mock);
- }
-
- @Test
- public void testDebug() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.debug("a");
- replay(mock);
-
- InternalLogger logger = new JBossLogger(mock);
- logger.debug("a");
- verify(mock);
- }
-
- @Test
- public void testDebugWithException() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.debug("a", e);
- replay(mock);
-
- InternalLogger logger = new JBossLogger(mock);
- logger.debug("a", e);
- verify(mock);
- }
-
- @Test
- public void testInfo() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.info("a");
- replay(mock);
-
- InternalLogger logger = new JBossLogger(mock);
- logger.info("a");
- verify(mock);
- }
-
- @Test
- public void testInfoWithException() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.info("a", e);
- replay(mock);
-
- InternalLogger logger = new JBossLogger(mock);
- logger.info("a", e);
- verify(mock);
- }
-
- @Test
- public void testWarn() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.warn("a");
- replay(mock);
-
- InternalLogger logger = new JBossLogger(mock);
- logger.warn("a");
- verify(mock);
- }
-
- @Test
- public void testWarnWithException() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.warn("a", e);
- replay(mock);
-
- InternalLogger logger = new JBossLogger(mock);
- logger.warn("a", e);
- verify(mock);
- }
-
- @Test
- public void testError() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.error("a");
- replay(mock);
-
- InternalLogger logger = new JBossLogger(mock);
- logger.error("a");
- verify(mock);
- }
-
- @Test
- public void testErrorWithException() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.error("a", e);
- replay(mock);
-
- InternalLogger logger = new JBossLogger(mock);
- logger.error("a", e);
- verify(mock);
- }
-}
diff --git a/common/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java
index b0be07271a..c4ffdc799a 100644
--- a/common/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java
+++ b/common/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java
@@ -15,16 +15,16 @@
*/
package io.netty.logging;
-import static org.junit.Assert.*;
-
import org.junit.Test;
+import static org.junit.Assert.*;
+
public class JdkLoggerFactoryTest {
@Test
public void testCreation() {
InternalLogger logger = new JdkLoggerFactory().newInstance("foo");
assertTrue(logger instanceof JdkLogger);
- assertEquals("foo", logger.toString());
+ assertEquals("foo", logger.name());
}
}
diff --git a/common/src/test/java/io/netty/logging/JdkLoggerTest.java b/common/src/test/java/io/netty/logging/JdkLoggerTest.java
deleted file mode 100644
index 8d26ce47b2..0000000000
--- a/common/src/test/java/io/netty/logging/JdkLoggerTest.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright 2012 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.logging;
-
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.junit.Test;
-
-public class JdkLoggerTest {
- private static final Exception e = new Exception();
-
- @Test
- public void testIsTraceEnabled() {
-
- Logger mock =
- createStrictMock(Logger.class);
-
- expect(mock.isLoggable(Level.FINEST)).andReturn(true);
- replay(mock);
-
- InternalLogger logger = new JdkLogger(mock, "foo");
- assertTrue(logger.isTraceEnabled());
- verify(mock);
- }
-
- @Test
- public void testIsDebugEnabled() {
-
- Logger mock =
- createStrictMock(Logger.class);
-
- expect(mock.isLoggable(Level.FINE)).andReturn(true);
- replay(mock);
-
- InternalLogger logger = new JdkLogger(mock, "foo");
- assertTrue(logger.isDebugEnabled());
- verify(mock);
- }
-
- @Test
- public void testIsInfoEnabled() {
- Logger mock =
- createStrictMock(Logger.class);
-
- expect(mock.isLoggable(Level.INFO)).andReturn(true);
- replay(mock);
-
- InternalLogger logger = new JdkLogger(mock, "foo");
- assertTrue(logger.isInfoEnabled());
- verify(mock);
- }
-
- @Test
- public void testIsWarnEnabled() {
- Logger mock =
- createStrictMock(Logger.class);
-
- expect(mock.isLoggable(Level.WARNING)).andReturn(true);
- replay(mock);
-
- InternalLogger logger = new JdkLogger(mock, "foo");
- assertTrue(logger.isWarnEnabled());
- verify(mock);
- }
-
- @Test
- public void testIsErrorEnabled() {
- Logger mock =
- createStrictMock(Logger.class);
-
- expect(mock.isLoggable(Level.SEVERE)).andReturn(true);
- replay(mock);
-
- InternalLogger logger = new JdkLogger(mock, "foo");
- assertTrue(logger.isErrorEnabled());
- verify(mock);
- }
-
- @Test
- public void testTrace() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.logp(Level.FINEST, "foo", null, "a");
- replay(mock);
-
- InternalLogger logger = new JdkLogger(mock, "foo");
- logger.trace("a");
- verify(mock);
- }
-
- @Test
- public void testTraceWithException() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.logp(Level.FINEST, "foo", null, "a", e);
- replay(mock);
-
- InternalLogger logger = new JdkLogger(mock, "foo");
- logger.trace("a", e);
- verify(mock);
- }
-
- @Test
- public void testDebug() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.logp(Level.FINE, "foo", null, "a");
- replay(mock);
-
- InternalLogger logger = new JdkLogger(mock, "foo");
- logger.debug("a");
- verify(mock);
- }
-
- @Test
- public void testDebugWithException() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.logp(Level.FINE, "foo", null, "a", e);
- replay(mock);
-
- InternalLogger logger = new JdkLogger(mock, "foo");
- logger.debug("a", e);
- verify(mock);
- }
-
- @Test
- public void testInfo() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.logp(Level.INFO, "foo", null, "a");
- replay(mock);
-
- InternalLogger logger = new JdkLogger(mock, "foo");
- logger.info("a");
- verify(mock);
- }
-
- @Test
- public void testInfoWithException() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.logp(Level.INFO, "foo", null, "a", e);
- replay(mock);
-
- InternalLogger logger = new JdkLogger(mock, "foo");
- logger.info("a", e);
- verify(mock);
- }
-
- @Test
- public void testWarn() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.logp(Level.WARNING, "foo", null, "a");
- replay(mock);
-
- InternalLogger logger = new JdkLogger(mock, "foo");
- logger.warn("a");
- verify(mock);
- }
-
- @Test
- public void testWarnWithException() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.logp(Level.WARNING, "foo", null, "a", e);
- replay(mock);
-
- InternalLogger logger = new JdkLogger(mock, "foo");
- logger.warn("a", e);
- verify(mock);
- }
-
- @Test
- public void testError() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.logp(Level.SEVERE, "foo", null, "a");
- replay(mock);
-
- InternalLogger logger = new JdkLogger(mock, "foo");
- logger.error("a");
- verify(mock);
- }
-
- @Test
- public void testErrorWithException() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.logp(Level.SEVERE, "foo", null, "a", e);
- replay(mock);
-
- InternalLogger logger = new JdkLogger(mock, "foo");
- logger.error("a", e);
- verify(mock);
- }
-}
diff --git a/common/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java
index 1090376b3c..4564acd795 100644
--- a/common/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java
+++ b/common/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java
@@ -15,16 +15,16 @@
*/
package io.netty.logging;
-import static org.junit.Assert.*;
-
import org.junit.Test;
+import static org.junit.Assert.*;
+
public class Log4JLoggerFactoryTest {
@Test
public void testCreation() {
InternalLogger logger = new Log4JLoggerFactory().newInstance("foo");
assertTrue(logger instanceof Log4JLogger);
- assertEquals("foo", logger.toString());
+ assertEquals("foo", logger.name());
}
}
diff --git a/common/src/test/java/io/netty/logging/Log4JLoggerTest.java b/common/src/test/java/io/netty/logging/Log4JLoggerTest.java
deleted file mode 100644
index df4e05b281..0000000000
--- a/common/src/test/java/io/netty/logging/Log4JLoggerTest.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright 2012 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.logging;
-
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-
-import org.apache.log4j.Logger;
-import org.junit.Test;
-
-public class Log4JLoggerTest {
- private static final Exception e = new Exception();
-
- @Test
- public void testIsTraceEnabled() {
-
- Logger mock =
- createStrictMock(Logger.class);
-
- expect(mock.isTraceEnabled()).andReturn(true);
- replay(mock);
-
- InternalLogger logger = new Log4JLogger(mock);
- assertTrue(logger.isTraceEnabled());
- verify(mock);
- }
-
- @Test
- public void testIsDebugEnabled() {
-
- Logger mock =
- createStrictMock(Logger.class);
-
- expect(mock.isDebugEnabled()).andReturn(true);
- replay(mock);
-
- InternalLogger logger = new Log4JLogger(mock);
- assertTrue(logger.isDebugEnabled());
- verify(mock);
- }
-
- @Test
- public void testIsInfoEnabled() {
- Logger mock =
- createStrictMock(Logger.class);
-
- expect(mock.isInfoEnabled()).andReturn(true);
- replay(mock);
-
- InternalLogger logger = new Log4JLogger(mock);
- assertTrue(logger.isInfoEnabled());
- verify(mock);
- }
-
- @Test
- public void testIsWarnEnabled() {
- Logger mock =
- createStrictMock(Logger.class);
-
- replay(mock);
-
- InternalLogger logger = new Log4JLogger(mock);
- assertTrue(logger.isWarnEnabled());
- verify(mock);
- }
-
- @Test
- public void testIsErrorEnabled() {
- Logger mock =
- createStrictMock(Logger.class);
- replay(mock);
-
- InternalLogger logger = new Log4JLogger(mock);
- assertTrue(logger.isErrorEnabled());
- verify(mock);
- }
-
- @Test
- public void testTrace() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.trace("a");
- replay(mock);
-
- InternalLogger logger = new Log4JLogger(mock);
- logger.trace("a");
- verify(mock);
- }
-
- @Test
- public void testTraceWithException() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.trace("a", e);
- replay(mock);
-
- InternalLogger logger = new Log4JLogger(mock);
- logger.trace("a", e);
- verify(mock);
- }
-
- @Test
- public void testDebug() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.debug("a");
- replay(mock);
-
- InternalLogger logger = new Log4JLogger(mock);
- logger.debug("a");
- verify(mock);
- }
-
- @Test
- public void testDebugWithException() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.debug("a", e);
- replay(mock);
-
- InternalLogger logger = new Log4JLogger(mock);
- logger.debug("a", e);
- verify(mock);
- }
-
- @Test
- public void testInfo() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.info("a");
- replay(mock);
-
- InternalLogger logger = new Log4JLogger(mock);
- logger.info("a");
- verify(mock);
- }
-
- @Test
- public void testInfoWithException() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.info("a", e);
- replay(mock);
-
- InternalLogger logger = new Log4JLogger(mock);
- logger.info("a", e);
- verify(mock);
- }
-
- @Test
- public void testWarn() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.warn("a");
- replay(mock);
-
- InternalLogger logger = new Log4JLogger(mock);
- logger.warn("a");
- verify(mock);
- }
-
- @Test
- public void testWarnWithException() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.warn("a", e);
- replay(mock);
-
- InternalLogger logger = new Log4JLogger(mock);
- logger.warn("a", e);
- verify(mock);
- }
-
- @Test
- public void testError() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.error("a");
- replay(mock);
-
- InternalLogger logger = new Log4JLogger(mock);
- logger.error("a");
- verify(mock);
- }
-
- @Test
- public void testErrorWithException() {
- Logger mock =
- createStrictMock(Logger.class);
-
- mock.error("a", e);
- replay(mock);
-
- InternalLogger logger = new Log4JLogger(mock);
- logger.error("a", e);
- verify(mock);
- }
-}
diff --git a/common/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java
index a6b172793f..94acd7e132 100644
--- a/common/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java
+++ b/common/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java
@@ -15,16 +15,16 @@
*/
package io.netty.logging;
-import static org.junit.Assert.*;
-
import org.junit.Test;
+import static org.junit.Assert.*;
+
public class Slf4JLoggerFactoryTest {
@Test
public void testCreation() {
InternalLogger logger = new Slf4JLoggerFactory().newInstance("foo");
assertTrue(logger instanceof Slf4JLogger);
- assertEquals("foo", logger.toString());
+ assertEquals("foo", logger.name());
}
}
diff --git a/common/src/test/java/io/netty/logging/Slf4JLoggerTest.java b/common/src/test/java/io/netty/logging/Slf4JLoggerTest.java
index ce120ff264..d40d1f32e2 100644
--- a/common/src/test/java/io/netty/logging/Slf4JLoggerTest.java
+++ b/common/src/test/java/io/netty/logging/Slf4JLoggerTest.java
@@ -15,12 +15,12 @@
*/
package io.netty.logging;
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-
import org.junit.Test;
import org.slf4j.Logger;
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
public class Slf4JLoggerTest {
private static final Exception e = new Exception();
@@ -29,6 +29,7 @@ public class Slf4JLoggerTest {
Logger mock =
createStrictMock(Logger.class);
+ expect(mock.getName()).andReturn("foo");
expect(mock.isTraceEnabled()).andReturn(true);
replay(mock);
@@ -42,6 +43,7 @@ public class Slf4JLoggerTest {
Logger mock =
createStrictMock(Logger.class);
+ expect(mock.getName()).andReturn("foo");
expect(mock.isDebugEnabled()).andReturn(true);
replay(mock);
@@ -55,6 +57,7 @@ public class Slf4JLoggerTest {
Logger mock =
createStrictMock(Logger.class);
+ expect(mock.getName()).andReturn("foo");
expect(mock.isInfoEnabled()).andReturn(true);
replay(mock);
@@ -68,6 +71,7 @@ public class Slf4JLoggerTest {
Logger mock =
createStrictMock(Logger.class);
+ expect(mock.getName()).andReturn("foo");
expect(mock.isWarnEnabled()).andReturn(true);
replay(mock);
@@ -81,6 +85,7 @@ public class Slf4JLoggerTest {
Logger mock =
createStrictMock(Logger.class);
+ expect(mock.getName()).andReturn("foo");
expect(mock.isErrorEnabled()).andReturn(true);
replay(mock);
@@ -94,6 +99,7 @@ public class Slf4JLoggerTest {
Logger mock =
createStrictMock(Logger.class);
+ expect(mock.getName()).andReturn("foo");
mock.trace("a");
replay(mock);
@@ -107,6 +113,7 @@ public class Slf4JLoggerTest {
Logger mock =
createStrictMock(Logger.class);
+ expect(mock.getName()).andReturn("foo");
mock.trace("a", e);
replay(mock);
@@ -120,6 +127,7 @@ public class Slf4JLoggerTest {
Logger mock =
createStrictMock(Logger.class);
+ expect(mock.getName()).andReturn("foo");
mock.debug("a");
replay(mock);
@@ -133,6 +141,7 @@ public class Slf4JLoggerTest {
Logger mock =
createStrictMock(Logger.class);
+ expect(mock.getName()).andReturn("foo");
mock.debug("a", e);
replay(mock);
@@ -146,6 +155,7 @@ public class Slf4JLoggerTest {
Logger mock =
createStrictMock(Logger.class);
+ expect(mock.getName()).andReturn("foo");
mock.info("a");
replay(mock);
@@ -159,6 +169,7 @@ public class Slf4JLoggerTest {
Logger mock =
createStrictMock(Logger.class);
+ expect(mock.getName()).andReturn("foo");
mock.info("a", e);
replay(mock);
@@ -172,6 +183,7 @@ public class Slf4JLoggerTest {
Logger mock =
createStrictMock(Logger.class);
+ expect(mock.getName()).andReturn("foo");
mock.warn("a");
replay(mock);
@@ -185,6 +197,7 @@ public class Slf4JLoggerTest {
Logger mock =
createStrictMock(Logger.class);
+ expect(mock.getName()).andReturn("foo");
mock.warn("a", e);
replay(mock);
@@ -198,6 +211,7 @@ public class Slf4JLoggerTest {
Logger mock =
createStrictMock(Logger.class);
+ expect(mock.getName()).andReturn("foo");
mock.error("a");
replay(mock);
@@ -211,6 +225,7 @@ public class Slf4JLoggerTest {
Logger mock =
createStrictMock(Logger.class);
+ expect(mock.getName()).andReturn("foo");
mock.error("a", e);
replay(mock);
diff --git a/license/LICENSE.jboss-logging.txt b/license/LICENSE.jboss-logging.txt
deleted file mode 100644
index d80fdbe771..0000000000
--- a/license/LICENSE.jboss-logging.txt
+++ /dev/null
@@ -1,504 +0,0 @@
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- , 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
diff --git a/license/LICENSE.osgi.txt b/license/LICENSE.osgi.txt
deleted file mode 100644
index 6b0b1270ff..0000000000
--- a/license/LICENSE.osgi.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
diff --git a/pom.xml b/pom.xml
index 8b699887cb..6ea3c800ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,32 +123,16 @@
2.5
-
- org.osgi
- org.osgi.core
- 4.3.0
-
-
- org.osgi
- org.osgi.compendium
- 4.3.0
-
-
org.slf4j
slf4j-api
- 1.6.5
+ 1.7.2
commons-logging
commons-logging
1.1.1
-
- org.jboss.logging
- jboss-logging-spi
- 2.1.2.GA
-
log4j
log4j
diff --git a/transport-udt/pom.xml b/transport-udt/pom.xml
index cd95f8805e..b8e655a631 100644
--- a/transport-udt/pom.xml
+++ b/transport-udt/pom.xml
@@ -63,8 +63,7 @@
org.slf4j
slf4j-api
- 1.7.2
- compile
+ test
diff --git a/transport-udt/src/test/java/io/netty/channel/udt/bench/xfer/UdtNetty.java b/transport-udt/src/test/java/io/netty/channel/udt/bench/xfer/UdtNetty.java
index 36fec8c761..ff0c70c9ac 100644
--- a/transport-udt/src/test/java/io/netty/channel/udt/bench/xfer/UdtNetty.java
+++ b/transport-udt/src/test/java/io/netty/channel/udt/bench/xfer/UdtNetty.java
@@ -22,8 +22,6 @@ import com.yammer.metrics.core.Meter;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelHandler;
-import io.netty.logging.InternalLoggerFactory;
-import io.netty.logging.Slf4JLoggerFactory;
import io.netty.channel.udt.util.BootHelp;
import io.netty.channel.udt.util.CustomReporter;
import io.netty.channel.udt.util.EchoMessageHandler;
@@ -46,16 +44,6 @@ public final class UdtNetty {
static final Logger log = LoggerFactory.getLogger(UdtNetty.class);
- /**
- * use slf4j provider for io.netty.logging.InternalLogger
- */
- static {
- final InternalLoggerFactory defaultFactory = new Slf4JLoggerFactory();
- InternalLoggerFactory.setDefaultFactory(defaultFactory);
- log.info("InternalLoggerFactory={}", InternalLoggerFactory
- .getDefaultFactory().getClass().getName());
- }
-
/** benchmark duration */
static final int time = 10 * 60 * 1000;
diff --git a/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtByteAcceptorChannelTest.java b/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtByteAcceptorChannelTest.java
index 5ec3f6c223..b5630010cc 100644
--- a/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtByteAcceptorChannelTest.java
+++ b/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtByteAcceptorChannelTest.java
@@ -18,10 +18,14 @@ package io.netty.channel.udt.nio;
import io.netty.buffer.BufType;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.junit.Assert.*;
-public class NioUdtByteAcceptorChannelTest extends TestAny {
+public class NioUdtByteAcceptorChannelTest {
+
+ protected static final Logger log = LoggerFactory.getLogger(NioUdtByteAcceptorChannelTest.class);
/**
* verify channel meta data
diff --git a/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtByteConnectorChannelTest.java b/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtByteConnectorChannelTest.java
index e80975d7f3..b0952361c4 100644
--- a/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtByteConnectorChannelTest.java
+++ b/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtByteConnectorChannelTest.java
@@ -18,10 +18,14 @@ package io.netty.channel.udt.nio;
import io.netty.buffer.BufType;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.junit.Assert.*;
-public class NioUdtByteConnectorChannelTest extends TestAny {
+public class NioUdtByteConnectorChannelTest {
+
+ protected static final Logger log = LoggerFactory.getLogger(NioUdtByteAcceptorChannelTest.class);
/**
* verify channel meta data
diff --git a/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtByteRendezvousChannelTest.java b/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtByteRendezvousChannelTest.java
index f113f5aa21..658d1a3bc9 100644
--- a/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtByteRendezvousChannelTest.java
+++ b/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtByteRendezvousChannelTest.java
@@ -25,13 +25,17 @@ import io.netty.channel.udt.util.BootHelp;
import io.netty.channel.udt.util.EchoByteHandler;
import io.netty.channel.udt.util.UnitHelp;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.net.InetSocketAddress;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.*;
-public class NioUdtByteRendezvousChannelTest extends TestAny {
+public class NioUdtByteRendezvousChannelTest {
+
+ protected static final Logger log = LoggerFactory.getLogger(NioUdtByteAcceptorChannelTest.class);
/**
* verify channel meta data
@@ -76,7 +80,7 @@ public class NioUdtByteRendezvousChannelTest extends TestAny {
while (handler1.meter().count() < transferLimit
&& handler2.meter().count() < transferLimit) {
- log.info("progress : {} {}", handler1.meter().count(), handler2
+ NioUdtByteAcceptorChannelTest.log.info("progress : {} {}", handler1.meter().count(), handler2
.meter().count());
Thread.sleep(1000);
@@ -86,8 +90,8 @@ public class NioUdtByteRendezvousChannelTest extends TestAny {
connectFuture1.channel().close().sync();
connectFuture2.channel().close().sync();
- log.info("handler1 : {}", handler1.meter().count());
- log.info("handler2 : {}", handler2.meter().count());
+ NioUdtByteAcceptorChannelTest.log.info("handler1 : {}", handler1.meter().count());
+ NioUdtByteAcceptorChannelTest.log.info("handler2 : {}", handler2.meter().count());
assertTrue(handler1.meter().count() >= transferLimit);
assertTrue(handler2.meter().count() >= transferLimit);
diff --git a/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtMessageAcceptorChannelTest.java b/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtMessageAcceptorChannelTest.java
index 92e436326a..999ae19a85 100644
--- a/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtMessageAcceptorChannelTest.java
+++ b/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtMessageAcceptorChannelTest.java
@@ -18,10 +18,14 @@ package io.netty.channel.udt.nio;
import io.netty.buffer.BufType;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.junit.Assert.*;
-public class NioUdtMessageAcceptorChannelTest extends TestAny {
+public class NioUdtMessageAcceptorChannelTest {
+
+ protected static final Logger log = LoggerFactory.getLogger(NioUdtByteAcceptorChannelTest.class);
/**
* verify channel meta data
diff --git a/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtMessageConnectorChannelTest.java b/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtMessageConnectorChannelTest.java
index d2cf1ad853..408b1d3f00 100644
--- a/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtMessageConnectorChannelTest.java
+++ b/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtMessageConnectorChannelTest.java
@@ -18,10 +18,14 @@ package io.netty.channel.udt.nio;
import io.netty.buffer.BufType;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.junit.Assert.*;
-public class NioUdtMessageConnectorChannelTest extends TestAny {
+public class NioUdtMessageConnectorChannelTest {
+
+ protected static final Logger log = LoggerFactory.getLogger(NioUdtByteAcceptorChannelTest.class);
/**
* verify channel meta data
diff --git a/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtMessageRendezvousChannelTest.java b/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtMessageRendezvousChannelTest.java
index f23bca86a1..d44732941a 100644
--- a/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtMessageRendezvousChannelTest.java
+++ b/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtMessageRendezvousChannelTest.java
@@ -25,13 +25,17 @@ import io.netty.channel.udt.util.BootHelp;
import io.netty.channel.udt.util.EchoMessageHandler;
import io.netty.channel.udt.util.UnitHelp;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.net.InetSocketAddress;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.*;
-public class NioUdtMessageRendezvousChannelTest extends TestAny {
+public class NioUdtMessageRendezvousChannelTest {
+
+ protected static final Logger log = LoggerFactory.getLogger(NioUdtByteAcceptorChannelTest.class);
/**
* verify channel meta data
@@ -80,7 +84,7 @@ public class NioUdtMessageRendezvousChannelTest extends TestAny {
while (handler1.meter().count() < transferLimit
&& handler2.meter().count() < transferLimit) {
- log.info("progress : {} {}", handler1.meter().count(), handler2
+ NioUdtByteAcceptorChannelTest.log.info("progress : {} {}", handler1.meter().count(), handler2
.meter().count());
Thread.sleep(1000);
@@ -90,8 +94,8 @@ public class NioUdtMessageRendezvousChannelTest extends TestAny {
connectFuture1.channel().close().sync();
connectFuture2.channel().close().sync();
- log.info("handler1 : {}", handler1.meter().count());
- log.info("handler2 : {}", handler2.meter().count());
+ NioUdtByteAcceptorChannelTest.log.info("handler1 : {}", handler1.meter().count());
+ NioUdtByteAcceptorChannelTest.log.info("handler2 : {}", handler2.meter().count());
assertTrue(handler1.meter().count() >= transferLimit);
assertTrue(handler2.meter().count() >= transferLimit);
diff --git a/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtProviderTest.java b/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtProviderTest.java
index da7634ffd9..567157ec05 100644
--- a/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtProviderTest.java
+++ b/transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtProviderTest.java
@@ -17,10 +17,14 @@
package io.netty.channel.udt.nio;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.junit.Assert.*;
-public class NioUdtProviderTest extends TestAny {
+public class NioUdtProviderTest {
+
+ protected static final Logger log = LoggerFactory.getLogger(NioUdtProviderTest.class);
/**
* verify factory
diff --git a/transport-udt/src/test/java/io/netty/channel/udt/nio/TestAny.java b/transport-udt/src/test/java/io/netty/channel/udt/nio/TestAny.java
deleted file mode 100644
index 3687f2a1df..0000000000
--- a/transport-udt/src/test/java/io/netty/channel/udt/nio/TestAny.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2012 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package io.netty.channel.udt.nio;
-
-import io.netty.logging.InternalLoggerFactory;
-import io.netty.logging.Slf4JLoggerFactory;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * shared test base
- */
-public abstract class TestAny {
-
- protected static final Logger log = LoggerFactory.getLogger(TestAny.class);
-
- /**
- * use slf4j provider for io.netty.logging.InternalLogger
- */
- static {
- final InternalLoggerFactory defaultFactory = new Slf4JLoggerFactory();
- InternalLoggerFactory.setDefaultFactory(defaultFactory);
- log.info("InternalLoggerFactory={}", InternalLoggerFactory
- .getDefaultFactory().getClass().getName());
- }
-
-}
diff --git a/transport-udt/src/test/java/io/netty/channel/udt/util/CaliperBench.java b/transport-udt/src/test/java/io/netty/channel/udt/util/CaliperBench.java
index 88d190babb..25b0908c85 100644
--- a/transport-udt/src/test/java/io/netty/channel/udt/util/CaliperBench.java
+++ b/transport-udt/src/test/java/io/netty/channel/udt/util/CaliperBench.java
@@ -16,14 +16,10 @@
package io.netty.channel.udt.util;
-import io.netty.logging.InternalLoggerFactory;
-import io.netty.logging.Slf4JLoggerFactory;
-
+import com.google.caliper.SimpleBenchmark;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.caliper.SimpleBenchmark;
-
/**
* Base class for caliper/metrics benchmarks.
*/
@@ -45,14 +41,6 @@ public abstract class CaliperBench extends SimpleBenchmark {
});
}
- /**
- * Use slf4j logging.
- */
- static {
- final InternalLoggerFactory defaultFactory = new Slf4JLoggerFactory();
- InternalLoggerFactory.setDefaultFactory(defaultFactory);
- }
-
protected final Logger log = LoggerFactory.getLogger(getClass());
private volatile CaliperMeasure measure;