This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SLF4J: Simple Logging Facade for Java". The branch, master has been updated via 86eaa9cf19193c9e8c471283b23149aa87a88573 (commit) from 370eca42fbaa403cabdd19353c4b05f756cf5677 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=86eaa9cf19193c9e8c471283b23... http://github.com/ceki/slf4j/commit/86eaa9cf19193c9e8c471283b23149aa87a88573 commit 86eaa9cf19193c9e8c471283b23149aa87a88573 Author: Ceki Gulcu <ceki@qos.ch> Date: Thu Sep 6 15:40:33 2012 +0200 adding vargs support to Logger interface diff --git a/integration/pom.xml b/integration/pom.xml index 14568d8..3d67ab1 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -1,14 +1,14 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<project + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> - + <modelVersion>4.0.0</modelVersion> <groupId>org.slf4j</groupId> @@ -35,7 +35,7 @@ <dependency> <groupId>ant</groupId> <artifactId>ant-junit</artifactId> - <version>1.6.5</version> + <version>1.6.5</version> </dependency> @@ -61,7 +61,7 @@ <dependency> <groupId>ant</groupId> <artifactId>ant-junit</artifactId> - <version>1.6.5</version> + <version>1.6.5</version> </dependency> </dependencies> <executions> @@ -69,7 +69,7 @@ <id>ant-test</id> <phase>package</phase> <configuration> - <tasks> + <tasks> <property name="currentVersion" value="${project.version}" /> <property name="compile_classpath" refid="maven.compile.classpath"/> <property name="runtime_classpath" refid="maven.runtime.classpath"/> @@ -86,7 +86,7 @@ <id>ant-osgi-test</id> <phase>package</phase> <configuration> - <tasks> + <tasks> <property name="currentVersion" value="${project.version}" /> <property name="test_classpath" refid="maven.test.classpath"/> <property name="basedir" value="${basedir}"/> diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index 52ee4e4..e7ff512 100644 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -59,24 +59,4 @@ </plugins> </build> - <!-- Check whether we comply with the interfaces of JCL 1.1.1 - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>clirr-maven-plugin</artifactId> - <configuration> - <comparisonArtifacts> - <comparisonArtifact> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </comparisonArtifact> - </comparisonArtifacts> - </configuration> - </plugin> - </plugins> - </reporting> - --> - </project> \ No newline at end of file diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index e3b2a6c..b022a76 100644 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index 7190825..c9fbe37 100644 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index bb7470e..b8ec0ec 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>SLF4J</name> @@ -34,11 +34,10 @@ </scm> <properties> - <slf4j.api.minimum.compatible.version>1.6.0 - </slf4j.api.minimum.compatible.version> + <slf4j.api.minimum.compatible.version>1.6.0</slf4j.api.minimum.compatible.version> <cal10n.version>0.7.4</cal10n.version> <log4j.version>1.2.17</log4j.version> - <logback.version>1.0.4</logback.version> + <logback.version>1.0.7</logback.version> </properties> <developers> @@ -129,8 +128,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.3.2</version> <configuration> - <source>1.3</source> - <target>1.3</target> + <source>1.5</source> + <target>1.5</target> </configuration> </plugin> diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index c39dfdc..99b76bd 100644 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-api/src/main/java/org/slf4j/Logger.java b/slf4j-api/src/main/java/org/slf4j/Logger.java index 12844f6..83e60e8 100644 --- a/slf4j-api/src/main/java/org/slf4j/Logger.java +++ b/slf4j-api/src/main/java/org/slf4j/Logger.java @@ -128,11 +128,11 @@ public interface Logger { * is disabled for the TRACE level. </p> * * @param format the format string - * @param argArray an array of arguments + * @param arguments a list of 3 or more arguments * * @since 1.4 */ - public void trace(String format, Object[] argArray); + public void trace(String format, Object... arguments); /** * Log an exception (throwable) at the TRACE level with an @@ -194,7 +194,7 @@ public interface Logger { public void trace(Marker marker, String format, Object arg1, Object arg2); /** - * This method is similar to {@link #trace(String, Object[])} + * This method is similar to {@link #trace(String, Object...)} * method except that the marker data is also taken into * consideration. * @@ -204,7 +204,7 @@ public interface Logger { * * @since 1.4 */ - public void trace(Marker marker, String format, Object[] argArray); + public void trace(Marker marker, String format, Object... argArray); /** @@ -272,9 +272,9 @@ public interface Logger { * is disabled for the DEBUG level. </p> * * @param format the format string - * @param argArray an array of arguments + * @param arguments a list of 3 or more arguments */ - public void debug(String format, Object[] argArray); + public void debug(String format, Object... arguments); /** * Log an exception (throwable) at the DEBUG level with an @@ -326,15 +326,15 @@ public interface Logger { public void debug(Marker marker, String format, Object arg1, Object arg2); /** - * This method is similar to {@link #debug(String, Object[])} + * This method is similar to {@link #debug(String, Object...)} * method except that the marker data is also taken into * consideration. * * @param marker the marker data specific to this log statement * @param format the format string - * @param argArray an array of arguments + * @param arguments a list of 3 or more arguments */ - public void debug(Marker marker, String format, Object[] argArray); + public void debug(Marker marker, String format, Object... arguments); /** @@ -398,9 +398,9 @@ public interface Logger { * is disabled for the INFO level. </p> * * @param format the format string - * @param argArray an array of arguments + * @param arguments a list of 3 or more arguments */ - public void info(String format, Object[] argArray); + public void info(String format, Object... arguments); /** * Log an exception (throwable) at the INFO level with an @@ -451,15 +451,15 @@ public interface Logger { /** - * This method is similar to {@link #info(String, Object[])} + * This method is similar to {@link #info(String, Object...)} * method except that the marker data is also taken into * consideration. * * @param marker the marker data specific to this log statement * @param format the format string - * @param argArray an array of arguments + * @param arguments a list of 3 or more arguments */ - public void info(Marker marker, String format, Object[] argArray); + public void info(Marker marker, String format, Object... arguments); /** @@ -508,9 +508,9 @@ public interface Logger { * is disabled for the WARN level. </p> * * @param format the format string - * @param argArray an array of arguments + * @param arguments a list of 3 or more arguments */ - public void warn(String format, Object[] argArray); + public void warn(String format, Object... arguments); /** * Log a message at the WARN level according to the specified format @@ -574,15 +574,15 @@ public interface Logger { public void warn(Marker marker, String format, Object arg1, Object arg2); /** - * This method is similar to {@link #warn(String, Object[])} + * This method is similar to {@link #warn(String, Object...)} * method except that the marker data is also taken into * consideration. * * @param marker the marker data specific to this log statement * @param format the format string - * @param argArray an array of arguments + * @param arguments a list of 3 or more arguments */ - public void warn(Marker marker, String format, Object[] argArray); + public void warn(Marker marker, String format, Object... arguments); /** @@ -643,9 +643,9 @@ public interface Logger { * is disabled for the ERROR level. </p> * * @param format the format string - * @param argArray an array of arguments + * @param arguments a list of 3 or more arguments */ - public void error(String format, Object[] argArray); + public void error(String format, Object... arguments); /** * Log an exception (throwable) at the ERROR level with an @@ -696,15 +696,15 @@ public interface Logger { public void error(Marker marker, String format, Object arg1, Object arg2); /** - * This method is similar to {@link #error(String, Object[])} + * This method is similar to {@link #error(String, Object...)} * method except that the marker data is also taken into * consideration. * * @param marker the marker data specific to this log statement * @param format the format string - * @param argArray an array of arguments + * @param arguments a list of 3 or more arguments */ - public void error(Marker marker, String format, Object[] argArray); + public void error(Marker marker, String format, Object... arguments); /** diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java index e436c7b..3994188 100644 --- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java @@ -81,7 +81,7 @@ public final class LoggerFactory { * <p/> * It is assumed that all versions in the 1.6 are mutually compatible. */ - static private final String[] API_COMPATIBILITY_LIST = new String[]{"1.6"}; + static private final String[] API_COMPATIBILITY_LIST = new String[]{"1.6", "1.7"}; // private constructor prevents instantiation private LoggerFactory() { diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/MarkerIgnoringBase.java b/slf4j-api/src/main/java/org/slf4j/helpers/MarkerIgnoringBase.java index 2c5cd4a..c128df5 100644 --- a/slf4j-api/src/main/java/org/slf4j/helpers/MarkerIgnoringBase.java +++ b/slf4j-api/src/main/java/org/slf4j/helpers/MarkerIgnoringBase.java @@ -56,8 +56,8 @@ public abstract class MarkerIgnoringBase extends NamedLoggerBase implements Logg trace(format, arg1, arg2); } - public void trace(Marker marker, String format, Object[] argArray) { - trace(format, argArray); + public void trace(Marker marker, String format, Object... arguments) { + trace(format, arguments); } public void trace(Marker marker, String msg, Throwable t) { @@ -80,8 +80,8 @@ public abstract class MarkerIgnoringBase extends NamedLoggerBase implements Logg debug(format, arg1, arg2); } - public void debug(Marker marker, String format, Object[] argArray) { - debug(format, argArray); + public void debug(Marker marker, String format, Object... arguments) { + debug(format, arguments); } public void debug(Marker marker, String msg, Throwable t) { @@ -104,8 +104,8 @@ public abstract class MarkerIgnoringBase extends NamedLoggerBase implements Logg info(format, arg1, arg2); } - public void info(Marker marker, String format, Object[] argArray) { - info(format, argArray); + public void info(Marker marker, String format, Object... arguments) { + info(format, arguments); } public void info(Marker marker, String msg, Throwable t) { @@ -128,8 +128,8 @@ public abstract class MarkerIgnoringBase extends NamedLoggerBase implements Logg warn(format, arg1, arg2); } - public void warn(Marker marker, String format, Object[] argArray) { - warn(format, argArray); + public void warn(Marker marker, String format, Object... arguments) { + warn(format, arguments); } public void warn(Marker marker, String msg, Throwable t) { @@ -153,8 +153,8 @@ public abstract class MarkerIgnoringBase extends NamedLoggerBase implements Logg error(format, arg1, arg2); } - public void error(Marker marker, String format, Object[] argArray) { - error(format, argArray); + public void error(Marker marker, String format, Object... arguments) { + error(format, arguments); } public void error(Marker marker, String msg, Throwable t) { diff --git a/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 151f24e..606a406 100644 --- a/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-api/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -57,7 +57,7 @@ public class StaticLoggerBinder { * The value of this field is usually modified with each release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.6"; // !final + public static String REQUESTED_API_VERSION = "1.7"; // !final private StaticLoggerBinder() { throw new UnsupportedOperationException("This code should have never made it into slf4j-api.jar"); diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index 7bf0811..cdeded4 100644 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index c30521c..efa4df8 100644 --- a/slf4j-jcl/pom.xml +++ b/slf4j-jcl/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerAdapter.java b/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerAdapter.java index 611f004..262151c 100644 --- a/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerAdapter.java +++ b/slf4j-jcl/src/main/java/org/slf4j/impl/JCLLoggerAdapter.java @@ -125,11 +125,11 @@ public final class JCLLoggerAdapter extends MarkerIgnoringBase { * </p> * * @param format the format string - * @param argArray an array of arguments + * @param arguments a list of 3 or more arguments */ - public void trace(String format, Object[] argArray) { + public void trace(String format, Object... arguments) { if (log.isDebugEnabled()) { - FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); + FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments); log.trace(ft.getMessage(), ft.getThrowable()); } } @@ -223,11 +223,11 @@ public final class JCLLoggerAdapter extends MarkerIgnoringBase { * </p> * * @param format the format string - * @param argArray an array of arguments + * @param arguments a list of 3 or more arguments */ - public void debug(String format, Object[] argArray) { + public void debug(String format, Object... arguments) { if (log.isDebugEnabled()) { - FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); + FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments); log.debug(ft.getMessage(), ft.getThrowable()); } } @@ -318,11 +318,11 @@ public final class JCLLoggerAdapter extends MarkerIgnoringBase { * </p> * * @param format the format string - * @param argArray an array of arguments + * @param arguments a list of 3 or more arguments */ - public void info(String format, Object[] argArray) { + public void info(String format, Object... arguments) { if (log.isInfoEnabled()) { - FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); + FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments); log.info(ft.getMessage(), ft.getThrowable()); } } @@ -413,11 +413,11 @@ public final class JCLLoggerAdapter extends MarkerIgnoringBase { * </p> * * @param format the format string - * @param argArray an array of arguments + * @param arguments a list of 3 or more arguments */ - public void warn(String format, Object[] argArray) { + public void warn(String format, Object... arguments) { if (log.isWarnEnabled()) { - FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); + FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments); log.warn(ft.getMessage(), ft.getThrowable()); } } @@ -510,11 +510,11 @@ public final class JCLLoggerAdapter extends MarkerIgnoringBase { * </p> * * @param format the format string - * @param argArray an array of arguments + * @param arguments a list of 3 or more arguments */ - public void error(String format, Object[] argArray) { + public void error(String format, Object... arguments) { if (log.isErrorEnabled()) { - FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); + FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments); log.error(ft.getMessage(), ft.getThrowable()); } } diff --git a/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 1a9c7e5..fca85e5 100644 --- a/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-jcl/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -56,7 +56,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { */ //to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.6"; + public static String REQUESTED_API_VERSION = "1.7"; // Binding specific code: private static final String loggerFactoryClassStr = JCLLoggerFactory.class diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index f17a31d..b63c8a1 100644 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -37,16 +37,6 @@ <build> <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> diff --git a/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java b/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java index 3c20c14..7b5ee09 100644 --- a/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java +++ b/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java @@ -136,7 +136,7 @@ public final class JDK14LoggerAdapter extends MarkerIgnoringBase implements * @param argArray * an array of arguments */ - public void trace(String format, Object[] argArray) { + 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()); @@ -235,7 +235,7 @@ public final class JDK14LoggerAdapter extends MarkerIgnoringBase implements * @param argArray * an array of arguments */ - public void debug(String format, Object[] argArray) { + 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()); @@ -334,7 +334,7 @@ public final class JDK14LoggerAdapter extends MarkerIgnoringBase implements * @param argArray * an array of arguments */ - public void info(String format, Object[] argArray) { + 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()); @@ -436,7 +436,7 @@ public final class JDK14LoggerAdapter extends MarkerIgnoringBase implements * @param argArray * an array of arguments */ - public void warn(String format, Object[] argArray) { + 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()); @@ -534,12 +534,12 @@ public final class JDK14LoggerAdapter extends MarkerIgnoringBase implements * * @param format * the format string - * @param argArray + * @param arguments * an array of arguments */ - public void error(String format, Object[] argArray) { + public void error(String format, Object... arguments) { if (logger.isLoggable(Level.SEVERE)) { - FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); + FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments); log(SELF, Level.SEVERE, ft.getMessage(), ft.getThrowable()); } } diff --git a/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 2ea3c29..b90e885 100644 --- a/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-jdk14/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -57,7 +57,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is usually modified with each release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.6"; // !final + public static String REQUESTED_API_VERSION = "1.7"; // !final private static final String loggerFactoryClassStr = org.slf4j.impl.JDK14LoggerFactory.class.getName(); diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index 0d717f0..76a11e4 100644 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java index 136ab22..6a5c97a 100644 --- a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java +++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java @@ -167,12 +167,12 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * * @param format * the format string - * @param argArray + * @param arguments * an array of arguments */ - public void trace(String format, Object[] argArray) { + public void trace(String format, Object... arguments) { if (isTraceEnabled()) { - FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); + FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments); logger.log(FQCN, traceCapable ? Level.TRACE : Level.DEBUG, ft .getMessage(), ft.getThrowable()); } @@ -264,12 +264,11 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * * @param format * the format string - * @param argArray - * an array of arguments + * @param arguments an array of arguments */ - public void debug(String format, Object[] argArray) { + public void debug(String format, Object... arguments) { if (logger.isDebugEnabled()) { - FormattingTuple ft = MessageFormatter.arrayFormat(format, argArray); + FormattingTuple ft = MessageFormatter.arrayFormat(format, arguments); logger.log(FQCN, Level.DEBUG, ft.getMessage(), ft.getThrowable()); } } @@ -362,7 +361,7 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * @param argArray * an array of arguments */ - public void info(String format, Object[] argArray) { + 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()); @@ -459,7 +458,7 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * @param argArray * an array of arguments */ - public void warn(String format, Object[] argArray) { + 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()); @@ -556,7 +555,7 @@ public final class Log4jLoggerAdapter extends MarkerIgnoringBase implements * @param argArray * an array of arguments */ - public void error(String format, Object[] argArray) { + 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()); diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 0221bc4..7be00e7 100644 --- a/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -58,7 +58,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * against. The value of this field is usually modified with each release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.6"; // !final + public static String REQUESTED_API_VERSION = "1.7"; // !final private static final String loggerFactoryClassStr = Log4jLoggerFactory.class .getName(); diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index 622fb44..966968c 100644 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index e28371d..105eee5 100644 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index 3faefbb..ab7c824 100644 --- a/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-nop/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -58,7 +58,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * The value of this field is usually modified with each release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.6"; // !final + public static String REQUESTED_API_VERSION = "1.7"; // !final private static final String loggerFactoryClassStr = NOPLoggerFactory.class.getName(); diff --git a/slf4j-osgi-integration-test/pom.xml b/slf4j-osgi-integration-test/pom.xml deleted file mode 100644 index f6c201f..0000000 --- a/slf4j-osgi-integration-test/pom.xml +++ /dev/null @@ -1,241 +0,0 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <parent> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <groupId>org.slf4j</groupId> - <artifactId>slf4j-osgi-integration-test</artifactId> - <packaging>jar</packaging> - <name>SLF4J OSGi Integration Test</name> - - <url>http://www.slf4j.org</url> - <description>OSGi integration tests</description> - - <!-- These dependencies are deceptive they are only for the springframework testing env. -bundles being tested are specified in the --> - - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>javax.servlet</artifactId> - <version>0.8.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>4.0</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-osgi-test-bundle</artifactId> - <version>${parent.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>org.springframework.osgi.test</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>spring-core</artifactId> - <version>2.1-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>spring-context</artifactId> - <version>2.1-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>spring-beans</artifactId> - <version>2.1-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - - - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>spring-mock</artifactId> - <version>2.1-SNAPSHOT</version> - <type>jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>jcl104-over-slf4j.osgi</artifactId> - <version>1.1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j-full</artifactId> - <version>1.1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>log4j.osgi</artifactId> - <version>1.2.13-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.osgi</groupId> - <artifactId>backport-util-concurrent</artifactId> - <version>3.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> - - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <!-- run tests during the integration-test phase, not the normal test phase --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - <systemProperties> - <property> - <name>org.springframework.osgi.test.framework</name> - <value>${osgi.test.platform}</value> - </property> - <property> - <name>org.osgi.framework.system.packages</name> - <value>${osgi.test.system.packages}</value> - </property> - <!-- - <property> - <name>org.osgi.vendor.framework</name> - <value>${org.osgi.vendor.framework}</value> - </property> - --> - </systemProperties> - </configuration> - <executions> - <execution> - <id>default</id> - <phase>test</phase> - <goals></goals> - </execution> - <execution> - <id>integration-test</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - <forkMode>pertest</forkMode> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <profiles> - <profile> - <id>equinox</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>org.eclipse.osgi</artifactId> - <version>3.2.0</version> - <type>jar</type> - <scope>provided</scope> - </dependency> - </dependencies> - <properties> - <osgi.test.system.packages>org.xml.sax, org.w3c.dom, javax.xml.parsers, javax.naming, javax.management - </osgi.test.system.packages> - <osgi.test.platform>equinox</osgi.test.platform> - </properties> - </profile> - <profile> - <id>knopflerfish</id> - <dependencies> - <dependency> - <groupId>org.knopflerfish</groupId> - <artifactId>framework</artifactId> - <version>2.0.1</version> - <type>jar</type> - <scope>provided</scope> - </dependency> - </dependencies> - <properties> - <!-- knopflerfish testing requires that the system property - org.osgi.framework.system.packages be set with a list - system packages that are to be imported on the kf classpath. - This property is a placeholder for the list. See the surefire - plugin configuration systemProperties referenced above to see - the mapping to this element. --> - <osgi.test.system.packages>org.xml.sax, org.w3c.dom, javax.xml.parsers, javax.naming, javax.management - </osgi.test.system.packages> - <osgi.test.platform>knopflerfish</osgi.test.platform> - </properties> - </profile> - <profile> - <id>felix</id> - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - <version>0.8.0-SNAPSHOT</version> - <type>jar</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - <version>0.8.0-SNAPSHOT</version> - <type>jar</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.core</artifactId> - <version>0.8.0-SNAPSHOT</version> - <type>jar</type> - <scope>runtime</scope> - </dependency> - </dependencies> - <properties> - <osgi.test.platform>felix</osgi.test.platform> - <!-- <org.osgi.vendor.framework>org.apache.felix.framework</org.osgi.vendor.framework> --> - </properties> - </profile> - </profiles> -</project> \ No newline at end of file diff --git a/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java b/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java deleted file mode 100644 index 072189e..0000000 --- a/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2004-2005 SLF4J.ORG - * - * 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, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * 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 - * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY - * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Except as contained in this notice, the name of a copyright holder - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * of the copyright holder. - * - */ -package org.slf4j.osgi.integration; - -public interface IntegrationTestConstants { - - /** - * Versions of this release. - */ - public static final String SLF4J_VERSION_UNDER_TEST = "1.3.1-SNAPSHOT"; - - public static final String SLF4J_GROUP_ID = "org.slf4j"; - - public static final String SPRINGFRAMEWORK_OSGI_GROUP_NAME = "org.springframework.osgi"; - - public static final String API_BUNDLE_ARTIFACT_ID = "slf4j-api"; - - public static final String JCL104_ADAPTER_BUNDLE_ARTIFACT_ID = "jcl104-over-slf4j"; - - public static final String LOGSERVICE_ADAPTER_BUNDLE_ARTIFACT_ID = "osgi-over-slf4j"; - - public static final String JDK14_BINDING_BUNDLE_ARTIFACT_ID = "slf4j-jdk14"; - - public static final String SIMPLE_BINDING_BUNDLE_ARTIFACT_ID = "slf4j-simple"; - - public static final String LOG4J12_BINDING_BUNDLE_ARTIFACT_ID = "slf4j-log4j12"; - - public static final String NOP_BINDING_BUNDLE_ARTIFACT_ID = "slf4j-nop"; - - public static final String TEST_BUNDLE_ARTIFACT_ID = "slf4j-osgi-test-bundle"; - - - public static final String TEST_BUNDLE_SYM_NAME = SLF4J_GROUP_ID+'.'+TEST_BUNDLE_ARTIFACT_ID; - - public static final String NOP_BINDING_BUNDLE_SYM_NAME = "slf4j.nop"; - - public static final String LOG4J_BINDING_BUNDLE_SYM_NAME = "slf4j.log4j12"; - - public static final String SIMPLE_BINDING_BUNDLE_SYM_NAME ="slf4j.simple"; - - public static final String JDK_BINDING_BUNDLE_SYM_NAME = "slf4j.jdk14"; - - public static final String JCL_ADAPTER_BUNDLE_SYM_NAME = "jcl104.over.slf4j"; - - public static final String LOGSERVICE_ADAPTER_BUNDLE_SYM_NAME = SLF4J_GROUP_ID+'.'+LOGSERVICE_ADAPTER_BUNDLE_ARTIFACT_ID; - - - -} diff --git a/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/jdk/test/JdkBundleTest.java b/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/jdk/test/JdkBundleTest.java deleted file mode 100644 index f739150..0000000 --- a/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/jdk/test/JdkBundleTest.java +++ /dev/null @@ -1,176 +0,0 @@ -/* - * Copyright (c) 2004-2005 SLF4J.ORG - * - * 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, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * 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 - * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY - * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Except as contained in this notice, the name of a copyright holder - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * of the copyright holder. - * - */ - -package org.slf4j.osgi.integration.jdk.test; - -import java.util.ArrayList; -import java.util.List; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.ServiceReference; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.osgi.integration.IntegrationTestConstants; -import org.slf4j.osgi.test.service.Probe; -import org.springframework.osgi.test.ConfigurableBundleCreatorTests; - -/** - * - * <code>JdkBundleTest</code> starts up an OSGi environment (equinox, - * knopflerfish, or felix according to the profile selected) and installs the - * slf4j.osgi.test.bundle, the slf4j.jdk bundle and the bundles they depend on. - * - * The test classes in this project will be turned into a virtual bundle which is - * also installed and the tests are then run inside the OSGi runtime. - * - * The tests have access to a BundleContext, which we use to test that all bundles have - * been started. - * - * - * @author John Conlon - */ -public class JdkBundleTest extends ConfigurableBundleCreatorTests implements IntegrationTestConstants{ - - - - - - /** - * The manifest to use for the "virtual bundle" created out of the test - * classes and resources in this project - * - * This is actually the boilerplate manifest with one additional - * import-package added. We should provide a simpler customization point for - * such use cases that doesn't require duplication of the entire manifest... - */ - protected String getManifestLocation() { - return "classpath:org/slf4j/osgi/integration/jdk/test/MANIFEST.MF"; - } - - /** - * The location of the packaged OSGi bundles to be installed for this test. - * Values are Spring resource paths. The bundles we want to use are part of - * the same multi-project maven build as this project is. Hence we use the - * localMavenArtifact helper method to find the bundles produced by the - * package phase of the maven build (these tests will run after the - * packaging phase, in the integration-test phase). - * - * JUnit, commons-logging, spring-core and the spring OSGi test bundle are - * automatically included so they do not need to be specified here. - * - * Our test bundles are using package import and export versions to keep - * these other logging bundles from getting mixed up with our test bundles. - */ - protected String[] getBundleLocations() { - return new String[] { - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, - "aopalliance.osgi", "1.0-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, - "spring-context", "2.1-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-beans", - "2.1-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, - "spring-osgi-core", "1.0-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-aop", - "2.1-SNAPSHOT"), - localMavenArtifact(SLF4J_GROUP_ID, API_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST), - localMavenArtifact(SLF4J_GROUP_ID, JDK14_BINDING_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST), - localMavenArtifact(SLF4J_GROUP_ID, TEST_BUNDLE_ARTIFACT_ID, - SLF4J_VERSION_UNDER_TEST) }; - } - - /** - * The superclass provides us access to the root bundle context via the - * 'getBundleContext' operation. Make sure it is not null. - */ - public void testOSGiStartedOk() { - BundleContext bundleContext = getBundleContext(); - assertNotNull(bundleContext); - - } - - /** - * Makes sure our bundles are in the OSGi runtime and their state is Active. - * - */ - public void testSlf4jNopBundleIntegration() { - Logger log = LoggerFactory.getLogger(JdkBundleTest.class); - assertNotNull(log); - BundleContext context = getBundleContext(); - List symNames = new ArrayList(); - - Bundle[] bundles = context.getBundles(); - log.info("Loaded bundles:"); - for (int i = 0; i < bundles.length; i++) { - Bundle bundle = bundles[i]; - assertEquals("Bundle " + bundle.getSymbolicName() - + " is not active.", Bundle.ACTIVE, bundle.getState()); - symNames.add(bundle.getSymbolicName()); - if (bundle.getHeaders().get(Constants.BUNDLE_ACTIVATOR) != null) { - log.info("Symbolic Name:" + bundle.getSymbolicName() - + ", Activator:" - + bundle.getHeaders().get(Constants.BUNDLE_ACTIVATOR)); - } else { - log.info("Symbolic Name:" + bundle.getSymbolicName()); - } - } - - assertTrue(symNames.contains(JDK_BINDING_BUNDLE_SYM_NAME)); - assertTrue(symNames.contains(TEST_BUNDLE_SYM_NAME)); - - } - - public void testProbeService(){ - Logger log = LoggerFactory.getLogger(JdkBundleTest.class); - log.debug("Testing probe"); - BundleContext context = getBundleContext(); - ServiceReference ref = context.getServiceReference( Probe.class.getName() ); - assertNotNull( "Service Reference is null", ref ); - Probe probe = ( Probe ) context.getService( ref ); - assertNotNull( "Cannot find the probe service", probe ); - - try { - probe.testCommonslogging(); - fail("Expected exception while testing commons logging."); - } catch (Throwable t){ - log.debug("Failed to execute the probe.testCommonsLogging. "+t); - - } - - context.ungetService( ref ); - - log.debug("Tested probe."); - } - -} diff --git a/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/log4j/test/Log4JBundleTest.java b/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/log4j/test/Log4JBundleTest.java deleted file mode 100644 index 556335c..0000000 --- a/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/log4j/test/Log4JBundleTest.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright (c) 2004-2005 SLF4J.ORG - * - * 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, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * 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 - * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY - * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Except as contained in this notice, the name of a copyright holder - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * of the copyright holder. - * - */ - -package org.slf4j.osgi.integration.log4j.test; - -import java.util.ArrayList; -import java.util.List; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.ServiceReference; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.osgi.integration.IntegrationTestConstants; -import org.slf4j.osgi.test.service.Probe; -import org.springframework.osgi.test.ConfigurableBundleCreatorTests; - -/** - * - * <code>Log4JBundleTest</code> starts up an OSGi environment (equinox, - * knopflerfish, or felix according to the profile selected) and installs the - * slf4j.osgi.test.bundle, the slf4j.log4j12 bundle and the bundles they depend - * on. - * - * The slf4j.log4j12 will use the log4j bundle associated with the Spring-OSGi - * testing framework. - * - * The test classes in this project will be turned into a virtual bundle which - * is also installed and the tests are then run inside the OSGi runtime. - * - * The tests have access to a BundleContext, which we use to test that all - * bundles have been started. - * - * - * @author John Conlon - */ -public class Log4JBundleTest extends ConfigurableBundleCreatorTests implements IntegrationTestConstants { - - - - - - - /** - * The manifest to use for the "virtual bundle" created out of the test - * classes and resources in this project - * - * This is actually the boilerplate manifest with one additional - * import-package added. We should provide a simpler customization point for - * such use cases that doesn't require duplication of the entire manifest... - */ - protected String getManifestLocation() { - return "classpath:org/slf4j/osgi/integration/log4j/test/MANIFEST.MF"; - } - - /** - * The location of the packaged OSGi bundles to be installed for this test. - * Values are Spring resource paths. The bundles we want to use are part of - * the same multi-project maven build as this project is. Hence we use the - * localMavenArtifact helper method to find the bundles produced by the - * package phase of the maven build (these tests will run after the - * packaging phase, in the integration-test phase). - * - * JUnit, commons-logging, spring-core and the spring OSGi test bundle are - * automatically included so they do not need to be specified here. - * - * Except in the case of slf4j.log4j12 using the log4j bundle associated - * with the Spring-OSGi testing framework our test bundles are using package - * import and export versions to keep these other logging bundles from - * getting mixed up with our test bundles. - */ - protected String[] getBundleLocations() { - return new String[] { - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, - "aopalliance.osgi", "1.0-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, - "spring-context", "2.1-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-beans", - "2.1-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, - "spring-osgi-core", "1.0-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-aop", - "2.1-SNAPSHOT"), - localMavenArtifact(SLF4J_GROUP_ID, API_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST), - localMavenArtifact(SLF4J_GROUP_ID, LOG4J12_BINDING_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST), - localMavenArtifact(SLF4J_GROUP_ID, TEST_BUNDLE_ARTIFACT_ID, - SLF4J_VERSION_UNDER_TEST) }; - } - - /** - * The superclass provides us access to the root bundle context via the - * 'getBundleContext' operation. Make sure it is not null. - */ - public void testOSGiStartedOk() { - BundleContext bundleContext = getBundleContext(); - assertNotNull(bundleContext); - - } - - /** - * Makes sure our bundles are in the OSGi runtime and their state is Active. - * - */ - public void testSlf4jLog4j12BundleIntegration() { - Logger log = LoggerFactory.getLogger(Log4JBundleTest.class); - assertNotNull(log); - BundleContext context = getBundleContext(); - List symNames = new ArrayList(); - - Bundle[] bundles = context.getBundles(); - log.info("Loaded bundles:"); - for (int i = 0; i < bundles.length; i++) { - Bundle bundle = bundles[i]; - assertEquals("Bundle " + bundle.getSymbolicName() - + " is not active.", Bundle.ACTIVE, bundle.getState()); - symNames.add(bundle.getSymbolicName()); - if (bundle.getHeaders().get(Constants.BUNDLE_ACTIVATOR) != null) { - log.info("Symbolic Name:" + bundle.getSymbolicName() - + ", Activator:" - + bundle.getHeaders().get(Constants.BUNDLE_ACTIVATOR)); - } else { - log.info("Symbolic Name:" + bundle.getSymbolicName()); - } - } - - assertTrue(symNames.contains(LOG4J_BINDING_BUNDLE_SYM_NAME)); - assertTrue(symNames.contains(TEST_BUNDLE_SYM_NAME)); - - } - - public void testProbeService() { - BundleContext context = getBundleContext(); - ServiceReference ref = context.getServiceReference(Probe.class - .getName()); - assertNotNull("Service Reference is null", ref); - Probe probe = null; - - probe = (Probe) context.getService(ref); - assertNotNull("Cannot find the probe service", probe); - - try { - probe.testCommonslogging(); - fail("The commons logging package should not be found. Instead an exception should be thrown."); - } catch (Throwable t) { - // "Expect.",t); - } - - context.ungetService(ref); - - } -} diff --git a/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/logservice/test/LogServiceBundleTest.java b/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/logservice/test/LogServiceBundleTest.java deleted file mode 100644 index 436c612..0000000 --- a/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/logservice/test/LogServiceBundleTest.java +++ /dev/null @@ -1,188 +0,0 @@ -/* - * Copyright (c) 2004-2005 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, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * 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 - * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY - * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Except as contained in this notice, the name of a copyright holder - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * of the copyright holder. - * - */ - -package org.slf4j.osgi.integration.logservice.test; - -import java.util.ArrayList; -import java.util.List; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.ServiceReference; -import org.osgi.service.log.LogService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.osgi.integration.IntegrationTestConstants; -import org.slf4j.osgi.integration.nop.test.NopBundleTest; -import org.springframework.osgi.test.ConfigurableBundleCreatorTests; - -/** - * - * <code>LogServiceBundleTest</code> starts up an OSGi environment (equinox, - * knopflerfish, or felix according to the profile selected) and installs the - * slf4j.osgi.test.bundle, the slf4j.simple bundle and the bundles they depend - * on. - * - * The test classes in this project will be turned into a virtual bundle which - * is also installed and the tests are then run inside the OSGi runtime. - * - * The tests have access to a BundleContext, which we use to test that all - * bundles have been started. - * - * - * @author John Conlon - */ -public class LogServiceBundleTest extends ConfigurableBundleCreatorTests implements IntegrationTestConstants{ - - - - - /** - * The manifest to use for the "virtual bundle" created out of the test - * classes and resources in this project - * - * This is actually the boilerplate manifest with one additional - * import-package added. We should provide a simpler customization point for - * such use cases that doesn't require duplication of the entire manifest... - */ - protected String getManifestLocation() { - return "classpath:org/slf4j/osgi/integration/logservice/test/MANIFEST.MF"; - } - - /** - * The location of the packaged OSGi bundles to be installed for this test. - * Values are Spring resource paths. The bundles we want to use are part of - * the same multi-project maven build as this project is. Hence we use the - * localMavenArtifact helper method to find the bundles produced by the - * package phase of the maven build (these tests will run after the - * packaging phase, in the integration-test phase). - * - * JUnit, commons-logging, spring-core and the spring OSGi test bundle are - * automatically included so they do not need to be specified here. - * - * Our test bundles are using package import and export versions to keep - * these other logging bundles from getting mixed up with our test bundles. - */ - protected String[] getBundleLocations() { - return new String[] { - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, - "aopalliance.osgi", "1.0-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, - "spring-context", "2.1-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-beans", - "2.1-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, - "spring-osgi-core", "1.0-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-aop", - "2.1-SNAPSHOT"), - localMavenArtifact( "org.osgi", "org.osgi.compendium", "4.0" ), - localMavenArtifact(SLF4J_GROUP_ID, API_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST), - localMavenArtifact(SLF4J_GROUP_ID, - SIMPLE_BINDING_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST), - localMavenArtifact(SLF4J_GROUP_ID, - LOGSERVICE_ADAPTER_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST) }; - } - - /** - * The superclass provides us access to the root bundle context via the - * 'getBundleContext' operation. Make sure it is not null. - */ - public void testOSGiStartedOk() { - BundleContext bundleContext = getBundleContext(); - assertNotNull(bundleContext); - - } - - /** - * Makes sure our bundles are in the OSGi runtime and their state is Active. - * - */ - public void testSlf4jLogServiceBundles() { - Logger log = LoggerFactory.getLogger(LogServiceBundleTest.class); - assertNotNull(log); - BundleContext context = getBundleContext(); - List symNames = new ArrayList(); - - Bundle[] bundles = context.getBundles(); - log.info("Loaded bundles:"); - for (int i = 0; i < bundles.length; i++) { - Bundle bundle = bundles[i]; - assertEquals("Bundle " + bundle.getSymbolicName() - + " is not active.", Bundle.ACTIVE, bundle.getState()); - symNames.add(bundle.getSymbolicName()); - if (bundle.getHeaders().get(Constants.BUNDLE_ACTIVATOR) != null) { - log.info("Symbolic Name:" + bundle.getSymbolicName() - + ", Activator:" - + bundle.getHeaders().get(Constants.BUNDLE_ACTIVATOR)); - } else { - log.info("Symbolic Name:" + bundle.getSymbolicName()); - } - } - - assertTrue(symNames.contains(SIMPLE_BINDING_BUNDLE_SYM_NAME)); - assertTrue(symNames.contains(LOGSERVICE_ADAPTER_BUNDLE_SYM_NAME)); - - } - - public void testLogService() { - Logger log = LoggerFactory.getLogger(NopBundleTest.class); - log.debug("Testing LogSerivce"); - BundleContext context = getBundleContext(); - ServiceReference ref = context.getServiceReference(LogService.class.getName()); - assertNotNull("Service Reference is null", ref); - LogService logService = null; - - logService = (LogService) context.getService(ref); - assertNotNull("Cannot find the probe service", logService); - - exerciseLogService( logService); - exerciseLogService( logService,ref); - - context.ungetService(ref); - } - - private void exerciseLogService(LogService logService, ServiceReference ref){ - logService.log(ref, LogService.LOG_DEBUG, "Loaded bundles" ); - logService.log(ref, LogService.LOG_INFO, "Found LogService. " ); - logService.log(ref, LogService.LOG_WARNING, "Found LogService. " ); - logService.log(ref, LogService.LOG_ERROR, "Found LogService. ", new Exception("just a test.") ); - } - - private void exerciseLogService(LogService logService){ - logService.log(LogService.LOG_DEBUG, "Loaded bundles" ); - logService.log(LogService.LOG_INFO, "Found LogService. " ); - logService.log(LogService.LOG_WARNING, "Found LogService. " ); - logService.log(LogService.LOG_ERROR, "Found LogService. ", new Exception("just a test.") ); - } - -} diff --git a/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/nop/test/NopBundleTest.java b/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/nop/test/NopBundleTest.java deleted file mode 100644 index d9394af..0000000 --- a/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/nop/test/NopBundleTest.java +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Copyright (c) 2004-2005 SLF4J.ORG - * - * 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, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * 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 - * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY - * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Except as contained in this notice, the name of a copyright holder - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * of the copyright holder. - * - */ - -package org.slf4j.osgi.integration.nop.test; - -import java.util.ArrayList; -import java.util.List; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.ServiceReference; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.osgi.integration.IntegrationTestConstants; -import org.slf4j.osgi.test.service.Probe; -import org.springframework.osgi.test.ConfigurableBundleCreatorTests; - -/** - * - * <code>JdkBundleTest</code> starts up an OSGi environment (equinox, - * knopflerfish, or felix according to the profile selected) and installs the - * slf4j.osgi.test.bundle, the slf4j.nop bundle and the bundles they depend on. - * - * The test classes in this project will be turned into a virtual bundle which is - * also installed and the tests are then run inside the OSGi runtime. - * - * The tests have access to a BundleContext, which we use to test that all bundles have - * been started. - * - * - * @author John Conlon - */ -public class NopBundleTest extends ConfigurableBundleCreatorTests implements IntegrationTestConstants{ - - - - /** - * The manifest to use for the "virtual bundle" created out of the test - * classes and resources in this project - * - * This is actually the boilerplate manifest with one additional - * import-package added. We should provide a simpler customization point for - * such use cases that doesn't require duplication of the entire manifest... - */ - protected String getManifestLocation() { - return "classpath:org/slf4j/osgi/integration/nop/test/MANIFEST.MF"; - } - - /** - * The location of the packaged OSGi bundles to be installed for this test. - * Values are Spring resource paths. The bundles we want to use are part of - * the same multi-project maven build as this project is. Hence we use the - * localMavenArtifact helper method to find the bundles produced by the - * package phase of the maven build (these tests will run after the - * packaging phase, in the integration-test phase). - * - * JUnit, commons-logging, spring-core and the spring OSGi test bundle are - * automatically included so they do not need to be specified here. - * - * Our test bundles are using package import and export versions to keep - * these other logging bundles from getting mixed up with our test bundles. - */ - protected String[] getBundleLocations() { - return new String[] { - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, - "aopalliance.osgi", "1.0-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, - "spring-context", "2.1-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-beans", - "2.1-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, - "spring-osgi-core", "1.0-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-aop", - "2.1-SNAPSHOT"), - localMavenArtifact(SLF4J_GROUP_ID, API_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST), - localMavenArtifact(SLF4J_GROUP_ID, NOP_BINDING_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST), - localMavenArtifact(SLF4J_GROUP_ID, TEST_BUNDLE_ARTIFACT_ID, - SLF4J_VERSION_UNDER_TEST) }; - } - - /** - * The superclass provides us access to the root bundle context via the - * 'getBundleContext' operation. Make sure it is not null. - */ - public void testOSGiStartedOk() { - BundleContext bundleContext = getBundleContext(); - assertNotNull(bundleContext); - - } - - /** - * Makes sure our bundles are in the OSGi runtime and their state is Active. - * - */ - public void testSlf4jNopBundleIntegration() { - Logger log = LoggerFactory.getLogger(NopBundleTest.class); - assertNotNull(log); - BundleContext context = getBundleContext(); - List symNames = new ArrayList(); - - Bundle[] bundles = context.getBundles(); - log.info("Loaded bundles:"); - for (int i = 0; i < bundles.length; i++) { - Bundle bundle = bundles[i]; - assertEquals("Bundle " + bundle.getSymbolicName() - + " is not active.", Bundle.ACTIVE, bundle.getState()); - symNames.add(bundle.getSymbolicName()); - if (bundle.getHeaders().get(Constants.BUNDLE_ACTIVATOR) != null) { - log.info("Symbolic Name:" + bundle.getSymbolicName() - + ", Activator:" - + bundle.getHeaders().get(Constants.BUNDLE_ACTIVATOR)); - } else { - log.info("Symbolic Name:" + bundle.getSymbolicName()); - } - } - - assertTrue("Could not find "+NOP_BINDING_BUNDLE_SYM_NAME, symNames.contains(NOP_BINDING_BUNDLE_SYM_NAME)); - assertTrue(symNames.contains(TEST_BUNDLE_SYM_NAME)); - - } - - public void testProbeService(){ - Logger log = LoggerFactory.getLogger(NopBundleTest.class); - log.debug("Testing probe"); - BundleContext context = getBundleContext(); - ServiceReference ref = context.getServiceReference( Probe.class.getName() ); - assertNotNull( "Service Reference is null", ref ); - Probe probe = ( Probe ) context.getService( ref ); - assertNotNull( "Cannot find the probe service", probe ); - - try { - probe.testCommonslogging(); - fail("Expected exception while testing commons logging."); - } catch (Throwable t){ - log.debug("Failed to execute the probe.testCommonsLogging. "+t); - - } - - context.ungetService( ref ); - - log.debug("Tested probe."); - } - -} diff --git a/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/simple/test/SimpleBundleTest.java b/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/simple/test/SimpleBundleTest.java deleted file mode 100644 index 29052ec..0000000 --- a/slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/simple/test/SimpleBundleTest.java +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright (c) 2004-2005 SLF4J.ORG - * - * 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, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * 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 - * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY - * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Except as contained in this notice, the name of a copyright holder - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * of the copyright holder. - * - */ - -package org.slf4j.osgi.integration.simple.test; - -import java.util.ArrayList; -import java.util.List; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.ServiceReference; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.osgi.integration.IntegrationTestConstants; -import org.slf4j.osgi.integration.nop.test.NopBundleTest; -import org.slf4j.osgi.test.service.Probe; -import org.springframework.osgi.test.ConfigurableBundleCreatorTests; - -/** - * - * <code>LogServiceBundleTest</code> starts up an OSGi environment (equinox, - * knopflerfish, or felix according to the profile selected) and installs the - * slf4j.osgi.test.bundle, the slf4j.simple bundle and the bundles they depend - * on. - * - * The test classes in this project will be turned into a virtual bundle which - * is also installed and the tests are then run inside the OSGi runtime. - * - * The tests have access to a BundleContext, which we use to test that all - * bundles have been started. - * - * - * @author John Conlon - */ -public class SimpleBundleTest extends ConfigurableBundleCreatorTests implements IntegrationTestConstants{ - - - - - /** - * The manifest to use for the "virtual bundle" created out of the test - * classes and resources in this project - * - * This is actually the boilerplate manifest with one additional - * import-package added. We should provide a simpler customization point for - * such use cases that doesn't require duplication of the entire manifest... - */ - protected String getManifestLocation() { - return "classpath:org/slf4j/osgi/integration/simple/test/MANIFEST.MF"; - } - - /** - * The location of the packaged OSGi bundles to be installed for this test. - * Values are Spring resource paths. The bundles we want to use are part of - * the same multi-project maven build as this project is. Hence we use the - * localMavenArtifact helper method to find the bundles produced by the - * package phase of the maven build (these tests will run after the - * packaging phase, in the integration-test phase). - * - * JUnit, commons-logging, spring-core and the spring OSGi test bundle are - * automatically included so they do not need to be specified here. - * - * Our test bundles are using package import and export versions to keep - * these other logging bundles from getting mixed up with our test bundles. - */ - protected String[] getBundleLocations() { - return new String[] { - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, - "aopalliance.osgi", "1.0-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, - "spring-context", "2.1-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-beans", - "2.1-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, - "spring-osgi-core", "1.0-SNAPSHOT"), - localMavenArtifact(SPRINGFRAMEWORK_OSGI_GROUP_NAME, "spring-aop", - "2.1-SNAPSHOT"), - localMavenArtifact(SLF4J_GROUP_ID, API_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST), - localMavenArtifact(SLF4J_GROUP_ID, SIMPLE_BINDING_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST), - localMavenArtifact(SLF4J_GROUP_ID, JCL104_ADAPTER_BUNDLE_ARTIFACT_ID, SLF4J_VERSION_UNDER_TEST), - localMavenArtifact(SLF4J_GROUP_ID, TEST_BUNDLE_ARTIFACT_ID, - SLF4J_VERSION_UNDER_TEST) }; - } - - /** - * The superclass provides us access to the root bundle context via the - * 'getBundleContext' operation. Make sure it is not null. - */ - public void testOSGiStartedOk() { - BundleContext bundleContext = getBundleContext(); - assertNotNull(bundleContext); - - } - - /** - * Makes sure our bundles are in the OSGi runtime and their state is Active. - * - */ - public void testSlf4jNopBundles() { - Logger log = LoggerFactory.getLogger(SimpleBundleTest.class); - assertNotNull(log); - BundleContext context = getBundleContext(); - List symNames = new ArrayList(); - - Bundle[] bundles = context.getBundles(); - log.info("Loaded bundles:"); - for (int i = 0; i < bundles.length; i++) { - Bundle bundle = bundles[i]; - assertEquals("Bundle " + bundle.getSymbolicName() - + " is not active.", Bundle.ACTIVE, bundle.getState()); - symNames.add(bundle.getSymbolicName()); - if (bundle.getHeaders().get(Constants.BUNDLE_ACTIVATOR) != null) { - log.info("Symbolic Name:" + bundle.getSymbolicName() - + ", Activator:" - + bundle.getHeaders().get(Constants.BUNDLE_ACTIVATOR)); - } else { - log.info("Symbolic Name:" + bundle.getSymbolicName()); - } - } - - assertTrue(symNames.contains(SIMPLE_BINDING_BUNDLE_SYM_NAME)); - assertTrue(symNames.contains(TEST_BUNDLE_SYM_NAME)); - assertTrue(symNames.contains(JCL_ADAPTER_BUNDLE_SYM_NAME)); - - } - - public void testProbeService() { - Logger log = LoggerFactory.getLogger(NopBundleTest.class); - log.debug("Testing probe"); - BundleContext context = getBundleContext(); - ServiceReference ref = context.getServiceReference(Probe.class.getName()); - assertNotNull("Service Reference is null", ref); - Probe probe = null; - - probe = (Probe) context.getService(ref); - assertNotNull("Cannot find the probe service", probe); - - try { - probe.testCommonslogging(); - - } catch (Throwable t) { - fail("Failed to execute the probe.testCommonsLogging. "+t); - } - context.ungetService(ref); - } - -} diff --git a/slf4j-osgi-integration-test/src/test/resources/log4j.properties b/slf4j-osgi-integration-test/src/test/resources/log4j.properties deleted file mode 100644 index 24c9317..0000000 --- a/slf4j-osgi-integration-test/src/test/resources/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -log4j.rootCategory=DEBUG,console - -# Console Appender -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.target=System.out -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%-5p %l - %m%n - -log4j.logger.org.springframework.osgi=DEBUG \ No newline at end of file diff --git a/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/jdk/test/MANIFEST.MF b/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/jdk/test/MANIFEST.MF deleted file mode 100644 index e5f850b..0000000 --- a/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/jdk/test/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Name: simple-service-integration-tests -Bundle-SymbolicName: org.slf4j.osgi.integration.jdk.test -Bundle-Vendor: SLF4J ORG -Bundle-Activator: org.springframework.osgi.test.JUnitTestActivator -Import-Package: junit.framework, - org.osgi.framework;specification-version="1.3.0", - org.springframework.core.io;specification-version="2.1.0", - org.springframework.osgi.test, - org.slf4j, - org.slf4j.osgi.test.service - - - diff --git a/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/log4j/test/MANIFEST.MF b/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/log4j/test/MANIFEST.MF deleted file mode 100644 index cb1bd92..0000000 --- a/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/log4j/test/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Name: simple-service-integration-tests -Bundle-SymbolicName: org.slf4j.osgi.integration.log4j.test -Bundle-Vendor: SLF4J ORG -Bundle-Activator: org.springframework.osgi.test.JUnitTestActivator -Import-Package: junit.framework, - org.osgi.framework;specification-version="1.3.0", - org.springframework.core.io;specification-version="2.1.0", - org.springframework.osgi.test, - org.slf4j, - org.slf4j.osgi.test.service - - - diff --git a/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/logservice/test/MANIFEST.MF b/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/logservice/test/MANIFEST.MF deleted file mode 100644 index a2742be..0000000 --- a/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/logservice/test/MANIFEST.MF +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Name: simple-service-integration-tests -Bundle-SymbolicName: org.slf4j.osgi.integration.logservice.test -Bundle-Version: 1.3.0 -Bundle-Vendor: SLF4J ORG -Bundle-Activator: org.springframework.osgi.test.JUnitTestActivator -Import-Package: junit.framework, - org.osgi.framework;specification-version="1.3.0", - org.springframework.core.io;specification-version="2.1.0", - org.springframework.osgi.test, - org.slf4j, - org.osgi.service.log - - - diff --git a/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/nop/test/MANIFEST.MF b/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/nop/test/MANIFEST.MF deleted file mode 100644 index 9be5535..0000000 --- a/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/nop/test/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Name: simple-service-integration-tests -Bundle-SymbolicName: org.slf4j.osgi.integration.nop.test -Bundle-Vendor: SLF4J ORG -Bundle-Activator: org.springframework.osgi.test.JUnitTestActivator -Import-Package: junit.framework, - org.osgi.framework;specification-version="1.3.0", - org.springframework.core.io;specification-version="2.1.0", - org.springframework.osgi.test, - org.slf4j, - org.slf4j.osgi.test.service - - - diff --git a/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/simple/test/MANIFEST.MF b/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/simple/test/MANIFEST.MF deleted file mode 100644 index 987f81f..0000000 --- a/slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/simple/test/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Name: simple-service-integration-tests -Bundle-SymbolicName: org.slf4j.osgi.integration.simple.test -Bundle-Vendor: SLF4J ORG -Bundle-Activator: org.springframework.osgi.test.JUnitTestActivator -Import-Package: junit.framework, - org.osgi.framework;specification-version="1.3.0", - org.springframework.core.io;specification-version="2.1.0", - org.springframework.osgi.test, - org.slf4j, - org.slf4j.osgi.test.service - - - diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml deleted file mode 100644 index 5e522a0..0000000 --- a/slf4j-osgi-test-bundle/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ -<project - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <parent> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <groupId>org.slf4j</groupId> - <artifactId>slf4j-osgi-test-bundle</artifactId> - <packaging>bundle</packaging> - <name>SLF4J Testing Bundle</name> - <description>SLF4J OSGi testing bundle.</description> - <url>http://www.slf4j.org</url> - - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-nop</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <!-- To get org.apache.commons.logging package for - commons logging testing.--> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.core</artifactId> - <version>0.8.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>0.9.0-incubator-SNAPSHOT</version> - <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package> - org.slf4j.osgi.test.service - </Export-Package> - <Private-Package>org.slf4j.osgi.test</Private-Package> - <Import-Package> - org.osgi.framework,org.slf4j;version="[1.3,1.4)" - </Import-Package> - <Bundle-Activator>org.slf4j.osgi.test.Activator</Bundle-Activator> - <DynamicImport-Package>org.apache.commons.logging</DynamicImport-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - -</project> \ No newline at end of file diff --git a/slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/Activator.java b/slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/Activator.java deleted file mode 100644 index cd95f28..0000000 --- a/slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/Activator.java +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Copyright (c) 2004-2005 SLF4J.ORG - * - * 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, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * 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 - * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY - * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Except as contained in this notice, the name of a copyright holder - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * of the copyright holder. - * - */ - -package org.slf4j.osgi.test; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceListener; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.Marker; -import org.slf4j.MarkerFactory; -import org.slf4j.osgi.test.service.Probe; - -import java.util.Hashtable; - -/** - * <code>Activator</code> implements a simple bundle to test OSGi slf4j - * logging components. - * - * Upon startup, shutdown, and receiving a service event, it logs event - * details. - * - * On startup it logs a series of messages. - * - * @author John Conlon - */ -public class Activator implements BundleActivator, ServiceListener { - - private final Logger log = LoggerFactory.getLogger(Activator.class); - - /** - * Implements <code>BundleActivator.start()</code>. Logs a message adds - * itself to the bundle context as a service listener, and exercises the - * logger. - * - * @param bundleContext - * the framework context for the bundle - * @throws Exception - */ - public void start(BundleContext bundleContext) throws Exception { - log.info("Starting to listen for service events."); - bundleContext.addServiceListener(this); - - Probe probe = new ProbeImpl(); - Hashtable props = new Hashtable(); - props.put("description", "Service for testing slf4j components."); - bundleContext.registerService(Probe.class.getName(),probe, props); - - test1(); - test2(); - testNull(); - testMarker(); - } - - /** - * Implements <code>BundleActivator.stop()</code>. Prints a message and - * removes itself from the bundle context as a service listener. - * - * @param bundleContext - * the framework context for the bundle - * @throws Exception - */ - public void stop(BundleContext bundleContext) throws Exception { - bundleContext.removeServiceListener(this); - log.info("Stopped listening for service events."); - - // Note: It is not required that we remove the listener here, since - // the framework will do it automatically anyway. - } - - /** - * Implements <code>ServiceListener.serviceChanges()</code>. Logs the - * details of any service event from the framework. - * - * @param event - * the fired service event - */ - public void serviceChanged(ServiceEvent event) { - String[] objectClass = (String[]) event.getServiceReference() - .getProperty("objectClass"); - if (event.getType() == ServiceEvent.REGISTERED) { - log.info("SimpleBundle: Service of type {} registered.", - objectClass[0]); - } else if (event.getType() == ServiceEvent.UNREGISTERING) { - log.info("SimpleBundle: Service of type {} unregistered.", - objectClass[0]); - } else if (event.getType() == ServiceEvent.MODIFIED) { - log.info("SimpleBundle: Service of type {} modified.", - objectClass[0]); - } - } - - public void test1() { - Logger logger = LoggerFactory.getLogger("test1"); - logger.debug("Hello world."); - } - - public void test2() { - Integer i1 = new Integer(1); - Integer i2 = new Integer(2); - Integer i3 = new Integer(3); - Exception e = new Exception("This is a test exception."); - Logger logger = LoggerFactory.getLogger("test2"); - - logger.debug("Hello world 1."); - logger.debug("Hello world {}", i1); - logger.debug("val={} val={}", i1, i2); - logger.debug("val={} val={} val={}", new Object[] { i1, i2, i3 }); - - logger.debug("Hello world 2", e); - logger.info("Hello world 2."); - - logger.warn("Hello world 3."); - logger.warn("Hello world 3", e); - - logger.error("Hello world 4."); - logger.error("Hello world {}", new Integer(3)); - logger.error("Hello world 4.", e); - } - - public void testNull() { - Logger logger = LoggerFactory.getLogger("testNull"); - logger.debug(null); - logger.info(null); - logger.warn(null); - logger.error(null); - - Exception e = new Exception("This is a test exception."); - logger.debug(null, e); - logger.info(null, e); - logger.warn(null, e); - logger.error(null, e); - } - - public void testMarker() { - Logger logger = LoggerFactory.getLogger("testMarker"); - Marker blue = MarkerFactory.getMarker("BLUE"); - logger.debug(blue, "hello"); - logger.info(blue, "hello"); - logger.warn(blue, "hello"); - logger.error(blue, "hello"); - - logger.debug(blue, "hello {}", "world"); - logger.info(blue, "hello {}", "world"); - logger.warn(blue, "hello {}", "world"); - logger.error(blue, "hello {}", "world"); - - logger.debug(blue, "hello {} and {} ", "world", "universe"); - logger.info(blue, "hello {} and {} ", "world", "universe"); - logger.warn(blue, "hello {} and {} ", "world", "universe"); - logger.error(blue, "hello {} and {} ", "world", "universe"); - } -} diff --git a/slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/CommonsLoggingTester.java b/slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/CommonsLoggingTester.java deleted file mode 100644 index ad1ba13..0000000 --- a/slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/CommonsLoggingTester.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2004-2005 SLF4J.ORG - * - * 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, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * 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 - * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY - * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Except as contained in this notice, the name of a copyright holder - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * of the copyright holder. - * - */ - -package org.slf4j.osgi.test; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * <code>CommonsLoggingTester</code> tests org.apache.commons.logging functionality. - * - * @author John Conlon - */ -public class CommonsLoggingTester { - - boolean testCommonslogging() throws Exception { - testIsEnabledAPI(); - testPrintAPI(); - return true; - } - - public void testIsEnabledAPI() { - // assume that we are running over slf4j-simple - Log log = LogFactory.getLog(CommonsLoggingTester.class); - assertFalse("Trace was enabled", log.isTraceEnabled()); - assertFalse("Debug was enabled", log.isDebugEnabled()); - assertTrue("Info was not enabled", log.isInfoEnabled()); - assertTrue("Warn was not enabled", log.isWarnEnabled()); - assertTrue("Error was not enabled", log.isErrorEnabled()); - assertTrue("Fatal was not enabled", log.isFatalEnabled()); - } - - private void assertFalse(String failureMessage, boolean value) { - if (value) { - throw new IllegalStateException(failureMessage); - } - } - - private void assertTrue(String failureMessage, boolean value) { - if (!value) { - throw new IllegalStateException(failureMessage); - } - } - - public void testPrintAPI() { - Log log = LogFactory.getLog(CommonsLoggingTester.class); - Exception e = new Exception("just testing"); - - log.trace(null); - log.trace("trace message"); - - log.debug(null); - log.debug("debug message"); - - log.info(null); - log.info("info message"); - - log.warn(null); - log.warn("warn message"); - - log.error(null); - log.error("error message"); - - log.fatal(null); - log.fatal("fatal message"); - - log.trace(null, e); - log.trace("trace message", e); - - log.debug(null, e); - log.debug("debug message", e); - - log.info(null, e); - log.info("info message", e); - - log.warn(null, e); - log.warn("warn message", e); - - log.error(null, e); - log.error("error message", e); - - log.fatal(null, e); - log.fatal("fatal message", e); - } -} diff --git a/slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/ProbeImpl.java b/slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/ProbeImpl.java deleted file mode 100644 index e5ea67f..0000000 --- a/slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/ProbeImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2004-2005 SLF4J.ORG - * - * 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, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * 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 - * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY - * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Except as contained in this notice, the name of a copyright holder - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * of the copyright holder. - * - */ - -package org.slf4j.osgi.test; - -import org.slf4j.osgi.test.service.Probe; - -/** - * <code>ProbeImpl</code> a simple implementation of the Probe interface for testing - * Slf4j components. - * - * @author John Conlon - */ -public class ProbeImpl implements Probe{ - - /** - * - * @throws ClassNotFoundException If there is not a bundle exporting - * the org.apache.commons.logging package - * - */ - public boolean testCommonslogging() throws Exception{ - return new CommonsLoggingTester().testCommonslogging(); - } - -} diff --git a/slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/service/Probe.java b/slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/service/Probe.java deleted file mode 100644 index 1229d2e..0000000 --- a/slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/service/Probe.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2004-2005 SLF4J.ORG - * - * 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, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * 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 - * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY - * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Except as contained in this notice, the name of a copyright holder - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * of the copyright holder. - * - */ - -package org.slf4j.osgi.test.service; - -/** - * <code>Probe</code> is a service for testing accessibility of - * Slf4j components from the test bundle. - * - * @author John Conlon - * @version $Rev$, $Date$ - */ -public interface Probe { - - /** - * - * testCommonslogging - * - * @return true if all the tests were executed. - * @throws ClassNotFoundError if a org.apache.commons.logging package - * could not be dynamically imported from the OSGi runtime. - * @throws Exception if testing fails - */ - boolean testCommonslogging() throws Exception; - -} diff --git a/slf4j-scala-api/pom.xml b/slf4j-scala-api/pom.xml deleted file mode 100644 index 8ba7134..0000000 --- a/slf4j-scala-api/pom.xml +++ /dev/null @@ -1,201 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <parent> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-parent</artifactId> - <version>1.6.2-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <groupId>org.slf4j</groupId> - <artifactId>slf4j-scala-api</artifactId> - <packaging>bundle</packaging> - <name>SLF4J Scala API Module</name> - - <url>http://www.slf4j.org</url> - <description>The slf4j Scala API</description> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <scala.version>2.8.0</scala.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.scala-lang</groupId> - <artifactId>scala-library</artifactId> - <version>${scala.version}</version> - </dependency> - <dependency> - <groupId>org.scala-tools.testing</groupId> - <artifactId>specs_2.8.0</artifactId> - <version>1.6.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.8.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - - <plugin> - <groupId>org.scala-tools</groupId> - <artifactId>maven-scala-plugin</artifactId> - <version>2.14.1</version> - <configuration> - <scalaVersion>${scala.version}</scalaVersion> - <charset>${project.build.sourceEncoding}</charset> - <jvmArgs> - <jvmArg>-Xmx1024m</jvmArg> - </jvmArgs> - <args> - <arg>-make:changed</arg> - <arg>-deprecation</arg> - <arg>-unchecked</arg> - </args> - </configuration> - <executions> - <execution> - <goals> - <goal>compile</goal> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - <configuration> - <includes> - <include>**/*Spec.java</include> - <include>**/*Test.java</include> - </includes> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.1.0</version> - <extensions>true</extensions> - <!--executions> - <execution> - <goals> - <goal>bundle</goal> - </goals> - </execution> - </executions--> - <configuration> - <instructions> - <Bundle-RequiredExecutionEnvironment>J2SE-1.5,JavaSE-1.6</Bundle-RequiredExecutionEnvironment> - <Export-Package>org.slf4j.scala.*;version="${project.version}"</Export-Package> - <Import-Package> - scala.*;version="[${scala.version},${scala.version}]", - * - </Import-Package> - <_versionpolicy>[$(@),$(version;=+;$(@)))</_versionpolicy> - </instructions> - </configuration> - </plugin> - - <!--plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <reportFormat>plain</reportFormat> - <trimStackTrace>false</trimStackTrace> - <excludes> - <exclude>**/AllTest.java</exclude> - <exclude>**/PackageTest.java</exclude> - </excludes> - </configuration> - </plugin--> - - <!--plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestEntries> - <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version> - <Bundle-Description>${project.description}</Bundle-Description> - <Implementation-Version>${project.version}</Implementation-Version> - </manifestEntries> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> - <executions> - <execution> - <id>bundle-test-jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin--> - - <!--plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>process-classes</phase> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <configuration> - <tasks> - <echo>Removing slf4j-api's dummy StaticLoggerBinder and StaticMarkerBinder</echo> - <delete dir="target/classes/org/slf4j/impl"/> - </tasks> - </configuration> - </plugin--> - - </plugins> - - </build> - - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>clirr-maven-plugin</artifactId> - <configuration> - <comparisonVersion>1.5.6</comparisonVersion> - </configuration> - </plugin> - </plugins> - </reporting> - -</project> \ No newline at end of file diff --git a/slf4j-scala-api/src/main/scala/Logging.scala b/slf4j-scala-api/src/main/scala/Logging.scala deleted file mode 100644 index a67c717..0000000 --- a/slf4j-scala-api/src/main/scala/Logging.scala +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2010 Weigle Wilczek GmbH - * 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 org.slf4j.scala - -import org.slf4j.LoggerFactory - -/** - * Mixin providing a Logger for the type mixed into. - */ -trait Logging { - - /** - * Logger for the type mixed into. - */ - protected[scala] lazy val logger = Logger(this.getClass) -} diff --git a/slf4j-scala-api/src/main/scala/logger.scala b/slf4j-scala-api/src/main/scala/logger.scala deleted file mode 100644 index 1503e95..0000000 --- a/slf4j-scala-api/src/main/scala/logger.scala +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Copyright (c) 2010 Weigle Wilczek GmbH - * 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 org.slf4j.scala - -import org.slf4j.{ Logger => SLF4JLogger, LoggerFactory } - -/** - * Factory for Loggers. - */ -object Logger { - - /** - * Creates a Logger named corresponding to the given class. - * @param clazz Class used for the Logger's name. Must not be null! - */ - def apply(clazz: Class[_]) = { - require(clazz != null, "clazz must not be null!") - new DefaultLogger(LoggerFactory getLogger clazz) - } - - /** - * Creates a Logger with the given name. - * @param name The Logger's name. Must not be null! - */ - def apply(name: String) = { - require(name != null, "loggerName must not be null!") - new DefaultLogger(LoggerFactory getLogger name) - } -} - -/** - * Thin wrapper for SLF4J making use of by-name parameters to improve performance. - */ -trait Logger { - - /** - * The name of this Logger. - */ - lazy val name = slf4jLogger.getName - - /** - * Log a message with ERROR level. - * @param msg The message to be logged - */ - def error(msg: => String) { - if (slf4jLogger.isErrorEnabled) slf4jLogger error msg - } - - /** - * Log a message with ERROR level. - * @param msg The message to be logged - * @param t The Throwable to be logged - */ - def error(msg: => String, t: Throwable) { - if (slf4jLogger.isErrorEnabled) slf4jLogger.error(msg, t) - } - - /** - * Log a message with WARN level. - * @param msg The message to be logged - */ - def warn(msg: => String) { - if (slf4jLogger.isWarnEnabled) slf4jLogger warn msg - } - - /** - * Log a message with WARN level. - * @param msg The message to be logged - * @param t The Throwable to be logged - */ - def warn(msg: => String, t: Throwable) { - if (slf4jLogger.isWarnEnabled) slf4jLogger.warn(msg, t) - } - - /** - * Log a message with INFO level. - * @param msg The message to be logged - */ - def info(msg: => String) { - if (slf4jLogger.isInfoEnabled) slf4jLogger info msg - } - - /** - * Log a message with INFO level. - * @param msg The message to be logged - * @param t The Throwable to be logged - */ - def info(msg: => String, t: Throwable) { - if (slf4jLogger.isInfoEnabled) slf4jLogger.info(msg, t) - } - - /** - * Log a message with DEBUG level. - * @param msg The message to be logged - */ - def debug(msg: => String) { - if (slf4jLogger.isDebugEnabled) slf4jLogger debug msg - } - - /** - * Log a message with DEBUG level. - * @param msg The message to be logged - * @param t The Throwable to be logged - */ - def debug(msg: => String, t: Throwable) { - if (slf4jLogger.isDebugEnabled) slf4jLogger.debug(msg, t) - } - - /** - * Log a message with TRACE level. - * @param msg The message to be logged - */ - def trace(msg: => String) { - if (slf4jLogger.isTraceEnabled) slf4jLogger trace msg - } - - /** - * Log a message with TRACE level. - * @param msg The message to be logged - * @param t The Throwable to be logged - */ - def trace(msg: => String, t: Throwable) { - if (slf4jLogger.isTraceEnabled) slf4jLogger.trace(msg, t) - } - - /** - * The wrapped SLF4J Logger. - */ - protected val slf4jLogger: SLF4JLogger -} - -private[scala] class DefaultLogger(override protected val slf4jLogger: SLF4JLogger) extends Logger diff --git a/slf4j-scala-api/src/test/scala/LoggerSpec.scala b/slf4j-scala-api/src/test/scala/LoggerSpec.scala deleted file mode 100644 index e48fd13..0000000 --- a/slf4j-scala-api/src/test/scala/LoggerSpec.scala +++ /dev/null @@ -1,297 +0,0 @@ -/* - * Copyright (c) 2010 Weigle Wilczek GmbH - * 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 org.slf4j.scala - -import org.slf4j.{ Logger => SLF4JLogger } -import org.specs.SpecificationWithJUnit -import org.specs.mock.Mockito - -class LoggerSpec extends SpecificationWithJUnit with Mockito { - - "Creating a Logger using Logger(clazz: Class[_])" should { - - "return a Logger namend like the given class" in { - val clazz = classOf[String] - Logger(clazz).name mustEqual clazz.getName - } - - "throw an IAE when creating a Logger with a null class" in { - Logger(null: Class[_]) must throwA[IllegalArgumentException] - } - } - - "Creating a Logger using Logger(name: String)" should { - - "return a Logger namend like the given name" in { - val name = "MyLogger" - Logger(name).name mustEqual name - } - - "throw an IAE when creating a Logger with a null String" in { - Logger(null: String) must throwA [IllegalArgumentException] - } - } - - "Calling Logger.error(msg)" should { - val (logger, slf4jLogger) = loggers - var evaluated = false - def msg = { - evaluated = true - Msg - } - - "not call SLF4JLogger.error when error not enabled" in { - slf4jLogger.isErrorEnabled returns false - logger error msg - there was no(slf4jLogger).error(Msg) - evaluated mustBe false - } - - "call SLF4JLogger.error when error enabled" in { - slf4jLogger.isErrorEnabled returns true - logger error msg - there was one(slf4jLogger).error(Msg) - evaluated mustBe true - } - } - - "Calling Logger.error(msg, t)" should { - val (logger, slf4jLogger) = loggers - var evaluated = false - def msg = { - evaluated = true - Msg - } - - "not call SLF4JLogger.error when error not enabled" in { - slf4jLogger.isErrorEnabled returns false - logger.error(msg, t) - there was no(slf4jLogger).error(Msg, t) - evaluated mustBe false - } - - "call SLF4JLogger.error when error enabled" in { - slf4jLogger.isErrorEnabled returns true - logger.error(msg, t) - there was one(slf4jLogger).error(Msg ,t) - evaluated mustBe true - } - } - - "Calling Logger.warn(msg)" should { - val (logger, slf4jLogger) = loggers - var evaluated = false - def msg = { - evaluated = true - Msg - } - - "not call SLF4JLogger.warn when warn not enabled" in { - slf4jLogger.isWarnEnabled returns false - logger warn msg - there was no(slf4jLogger).warn(Msg) - evaluated mustBe false - } - - "call SLF4JLogger.warn when warn enabled" in { - slf4jLogger.isWarnEnabled returns true - logger warn msg - there was one(slf4jLogger).warn(Msg) - evaluated mustBe true - } - } - - "Calling Logger.warn(msg, t)" should { - val (logger, slf4jLogger) = loggers - var evaluated = false - def msg = { - evaluated = true - Msg - } - - "not call SLF4JLogger.warn when warn not enabled" in { - slf4jLogger.isErrorEnabled returns false - logger.warn(msg, t) - there was no(slf4jLogger).warn(Msg, t) - evaluated mustBe false - } - - "call SLF4JLogger.warn when warn enabled" in { - slf4jLogger.isWarnEnabled returns true - logger.warn(msg, t) - there was one(slf4jLogger).warn(Msg ,t) - evaluated mustBe true - } - } - - "Calling Logger.info(msg)" should { - val (logger, slf4jLogger) = loggers - var evaluated = false - def msg = { - evaluated = true - Msg - } - - "not call SLF4JLogger.info when info not enabled" in { - slf4jLogger.isInfoEnabled returns false - logger info msg - there was no(slf4jLogger).info(Msg) - evaluated mustBe false - } - - "call SLF4JLogger.info when info enabled" in { - slf4jLogger.isInfoEnabled returns true - logger info msg - there was one(slf4jLogger).info(Msg) - evaluated mustBe true - } - } - - "Calling Logger.info(msg, t)" should { - val (logger, slf4jLogger) = loggers - var evaluated = false - def msg = { - evaluated = true - Msg - } - - "not call SLF4JLogger.info when info not enabled" in { - slf4jLogger.isInfoEnabled returns false - logger.info(msg, t) - there was no(slf4jLogger).info(Msg, t) - evaluated mustBe false - } - - "call SLF4JLogger.info when info enabled" in { - slf4jLogger.isInfoEnabled returns true - logger.info(msg, t) - there was one(slf4jLogger).info(Msg, t) - evaluated mustBe true - } - } - - "Calling Logger.debug(msg)" should { - val (logger, slf4jLogger) = loggers - var evaluated = false - def msg = { - evaluated = true - Msg - } - - "not call SLF4JLogger.debug when debug not enabled" in { - slf4jLogger.isDebugEnabled returns false - logger debug msg - there was no(slf4jLogger).debug(Msg) - evaluated mustBe false - } - - "call SLF4JLogger.debug when debug enabled" in { - slf4jLogger.isDebugEnabled returns true - logger debug msg - there was one(slf4jLogger).debug(Msg) - evaluated mustBe true - } - } - - "Calling Logger.debug(msg ,t)" should { - val (logger, slf4jLogger) = loggers - var evaluated = false - def msg = { - evaluated = true - Msg - } - - "not call SLF4JLogger.debug when debug not enabled" in { - slf4jLogger.isDebugEnabled returns false - logger.debug(msg, t) - there was no(slf4jLogger).debug(Msg, t) - evaluated mustBe false - } - - "call SLF4JLogger.debug when debug enabled" in { - slf4jLogger.isDebugEnabled returns true - logger.debug(msg, t) - there was one(slf4jLogger).debug(Msg, t) - evaluated mustBe true - } - } - - "Calling Logger.trace(msg)" should { - val (logger, slf4jLogger) = loggers - var evaluated = false - def msg = { - evaluated = true - Msg - } - - "not call SLF4JLogger.trace when trace not enabled" in { - slf4jLogger.isTraceEnabled returns false - logger trace msg - there was no(slf4jLogger).trace(Msg) - evaluated mustBe false - } - - "call SLF4JLogger.trace when trace enabled" in { - slf4jLogger.isTraceEnabled returns true - logger trace msg - there was one(slf4jLogger).trace(Msg) - evaluated mustBe true - } - } - - "Calling Logger.trace(msg, t)" should { - val (logger, slf4jLogger) = loggers - var evaluated = false - def msg = { - evaluated = true - Msg - } - - "not call SLF4JLogger.trace when trace not enabled" in { - slf4jLogger.isTraceEnabled returns false - logger.trace(msg, t) - there was no(slf4jLogger).trace(Msg, t) - evaluated mustBe false - } - - "call SLF4JLogger.trace when trace enabled" in { - slf4jLogger.isTraceEnabled returns true - logger.trace(msg, t) - there was one(slf4jLogger).trace(Msg, t) - evaluated mustBe true - } - } - - private lazy val Msg = "MESSAGE" - - private lazy val t = new Throwable - - private def loggers = { - val mockSLF4JLogger = mock[SLF4JLogger] - val logger = new Logger { - override protected val slf4jLogger = mockSLF4JLogger - } - (logger, mockSLF4JLogger) - } -} diff --git a/slf4j-scala-api/src/test/scala/LoggingSpec.scala b/slf4j-scala-api/src/test/scala/LoggingSpec.scala deleted file mode 100644 index b4599e0..0000000 --- a/slf4j-scala-api/src/test/scala/LoggingSpec.scala +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2010 Weigle Wilczek GmbH - * 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 org.slf4j.scala - -import org.specs.SpecificationWithJUnit - -class LoggingSpec extends SpecificationWithJUnit { - - "Mixing Logging into SomeClass" should { - "yield a Logger named to SomeClass's FQCN" in { - val someClass = new SomeClass - someClass.logger.name mustEqual classOf[SomeClass].getName - } - } -} - -class SomeClass extends Logging diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index 059336a..adf2eff 100644 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java index a8587a8..05d7e75 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java @@ -1,25 +1,25 @@ -/** - * Copyright (c) 2004-2011 QOS.ch +/** + * 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. + * 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. + * 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. * */ @@ -364,8 +364,8 @@ public class SimpleLogger extends MarkerIgnoringBase { * * @param level * @param format - * @param param1 - * @param param2 + * @param arg1 + * @param arg2 */ private void formatAndLog(int level, String format, Object arg1, Object arg2) { @@ -381,13 +381,13 @@ public class SimpleLogger extends MarkerIgnoringBase { * * @param level * @param format - * @param argArray + * @param arguments a list of 3 ore more arguments */ - private void formatAndLog(int level, String format, Object[] argArray) { + private void formatAndLog(int level, String format, Object... arguments) { if (! isLevelEnabled(level)) { return; } - FormattingTuple tp = MessageFormatter.arrayFormat(format, argArray); + FormattingTuple tp = MessageFormatter.arrayFormat(format, arguments); log(level, tp.getMessage(), tp.getThrowable()); } diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java index d39a4fe..28980a9 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/StaticLoggerBinder.java @@ -58,7 +58,7 @@ public class StaticLoggerBinder implements LoggerFactoryBinder { * against. The value of this field is usually modified with each release. */ // to avoid constant folding by the compiler, this field must *not* be final - public static String REQUESTED_API_VERSION = "1.6"; // !final + public static String REQUESTED_API_VERSION = "1.7"; // !final private static final String loggerFactoryClassStr = SimpleLoggerFactory.class.getName(); diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index ed14fc9..4418586 100644 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j.composite b/slf4j.composite deleted file mode 100644 index 07f98f6..0000000 --- a/slf4j.composite +++ /dev/null @@ -1,4 +0,0 @@ -scan-bundle:file:slf4j-api/target/slf4j-api-1.6.2-SNAPSHOT.jar -scan-bundle:file:slf4j-simple/target/slf4j-simple-1.6.2-SNAPSHOT.jar -scan-bundle:file:slf4j-scala-api/target/slf4j-scala-api-1.6.2-SNAPSHOT.jar -scan-bundle:mvn:http://scala-tools.org/repo-releases!com.weiglewilczek.scala-lang-osgi/scala... ----------------------------------------------------------------------- Summary of changes: integration/pom.xml | 18 +- jcl-over-slf4j/pom.xml | 22 +-- jul-to-slf4j/pom.xml | 2 +- log4j-over-slf4j/pom.xml | 2 +- pom.xml | 11 +- slf4j-api/pom.xml | 2 +- slf4j-api/src/main/java/org/slf4j/Logger.java | 48 ++-- .../src/main/java/org/slf4j/LoggerFactory.java | 2 +- .../java/org/slf4j/helpers/MarkerIgnoringBase.java | 20 +- .../java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-ext/pom.xml | 2 +- slf4j-jcl/pom.xml | 2 +- .../main/java/org/slf4j/impl/JCLLoggerAdapter.java | 30 +- .../java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-jdk14/pom.xml | 12 +- .../java/org/slf4j/impl/JDK14LoggerAdapter.java | 14 +- .../java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-log4j12/pom.xml | 2 +- .../java/org/slf4j/impl/Log4jLoggerAdapter.java | 19 +- .../java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-migrator/pom.xml | 2 +- slf4j-nop/pom.xml | 2 +- .../java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-osgi-integration-test/pom.xml | 241 ---------------- .../osgi/integration/IntegrationTestConstants.java | 78 ----- .../osgi/integration/jdk/test/JdkBundleTest.java | 176 ------------ .../integration/log4j/test/Log4JBundleTest.java | 181 ------------ .../logservice/test/LogServiceBundleTest.java | 188 ------------- .../osgi/integration/nop/test/NopBundleTest.java | 174 ------------ .../integration/simple/test/SimpleBundleTest.java | 177 ------------ .../src/test/resources/log4j.properties | 9 - .../slf4j/osgi/integration/jdk/test/MANIFEST.MF | 14 - .../slf4j/osgi/integration/log4j/test/MANIFEST.MF | 14 - .../osgi/integration/logservice/test/MANIFEST.MF | 15 - .../slf4j/osgi/integration/nop/test/MANIFEST.MF | 14 - .../slf4j/osgi/integration/simple/test/MANIFEST.MF | 14 - slf4j-osgi-test-bundle/pom.xml | 76 ----- .../main/java/org/slf4j/osgi/test/Activator.java | 184 ------------ .../org/slf4j/osgi/test/CommonsLoggingTester.java | 114 -------- .../main/java/org/slf4j/osgi/test/ProbeImpl.java | 55 ---- .../java/org/slf4j/osgi/test/service/Probe.java | 55 ---- slf4j-scala-api/pom.xml | 201 ------------- slf4j-scala-api/src/main/scala/Logging.scala | 37 --- slf4j-scala-api/src/main/scala/logger.scala | 153 ---------- slf4j-scala-api/src/test/scala/LoggerSpec.scala | 297 -------------------- slf4j-scala-api/src/test/scala/LoggingSpec.scala | 38 --- slf4j-simple/pom.xml | 2 +- .../src/main/java/org/slf4j/impl/SimpleLogger.java | 36 ++-- .../java/org/slf4j/impl/StaticLoggerBinder.java | 2 +- slf4j-site/pom.xml | 2 +- slf4j.composite | 4 - 51 files changed, 116 insertions(+), 2657 deletions(-) delete mode 100644 slf4j-osgi-integration-test/pom.xml delete mode 100644 slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/IntegrationTestConstants.java delete mode 100644 slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/jdk/test/JdkBundleTest.java delete mode 100644 slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/log4j/test/Log4JBundleTest.java delete mode 100644 slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/logservice/test/LogServiceBundleTest.java delete mode 100644 slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/nop/test/NopBundleTest.java delete mode 100644 slf4j-osgi-integration-test/src/test/java/org/slf4j/osgi/integration/simple/test/SimpleBundleTest.java delete mode 100644 slf4j-osgi-integration-test/src/test/resources/log4j.properties delete mode 100644 slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/jdk/test/MANIFEST.MF delete mode 100644 slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/log4j/test/MANIFEST.MF delete mode 100644 slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/logservice/test/MANIFEST.MF delete mode 100644 slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/nop/test/MANIFEST.MF delete mode 100644 slf4j-osgi-integration-test/src/test/resources/org/slf4j/osgi/integration/simple/test/MANIFEST.MF delete mode 100644 slf4j-osgi-test-bundle/pom.xml delete mode 100644 slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/Activator.java delete mode 100644 slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/CommonsLoggingTester.java delete mode 100644 slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/ProbeImpl.java delete mode 100644 slf4j-osgi-test-bundle/src/main/java/org/slf4j/osgi/test/service/Probe.java delete mode 100644 slf4j-scala-api/pom.xml delete mode 100644 slf4j-scala-api/src/main/scala/Logging.scala delete mode 100644 slf4j-scala-api/src/main/scala/logger.scala delete mode 100644 slf4j-scala-api/src/test/scala/LoggerSpec.scala delete mode 100644 slf4j-scala-api/src/test/scala/LoggingSpec.scala delete mode 100644 slf4j.composite hooks/post-receive -- SLF4J: Simple Logging Facade for Java