Move SLF4J implementation from Commons to SLC
authorMathieu Baudier <mbaudier@argeo.org>
Thu, 10 Feb 2022 08:40:16 +0000 (09:40 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Thu, 10 Feb 2022 08:40:16 +0000 (09:40 +0100)
org.argeo.cms.tp/.classpath [deleted file]
org.argeo.cms.tp/.project [deleted file]
org.argeo.cms.tp/bnd.bnd [deleted file]
org.argeo.cms.tp/build.properties [deleted file]
org.argeo.cms.tp/pom.xml [deleted file]
org.argeo.cms.tp/src/org/apache/commons/logging/Log.java [deleted file]
org.argeo.cms.tp/src/org/apache/commons/logging/LogFactory.java [deleted file]
org.argeo.cms.tp/src/org/slf4j/impl/ArgeoLogger.java [deleted file]
org.argeo.cms.tp/src/org/slf4j/impl/StaticLoggerBinder.java [deleted file]
org.argeo.cms.tp/src/org/slf4j/impl/SystemLoggingAdapter.java [deleted file]
pom.xml

diff --git a/org.argeo.cms.tp/.classpath b/org.argeo.cms.tp/.classpath
deleted file mode 100644 (file)
index e801ebf..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.argeo.cms.tp/.project b/org.argeo.cms.tp/.project
deleted file mode 100644 (file)
index 1c3ccb1..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.cms.tp</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>
diff --git a/org.argeo.cms.tp/bnd.bnd b/org.argeo.cms.tp/bnd.bnd
deleted file mode 100644 (file)
index 37061df..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Export-Package: org.slf4j.impl
-
-Import-Package: *
diff --git a/org.argeo.cms.tp/build.properties b/org.argeo.cms.tp/build.properties
deleted file mode 100644 (file)
index 34d2e4d..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/org.argeo.cms.tp/pom.xml b/org.argeo.cms.tp/pom.xml
deleted file mode 100644 (file)
index 7a39449..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.argeo.commons</groupId>
-               <version>2.3-SNAPSHOT</version>
-               <artifactId>argeo-commons</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.cms.tp</artifactId>
-       <packaging>jar</packaging>
-       <name>CMS Third Parties Adapters</name>
-       <description>Workarounds or trivial implementations of some third parties, typically logging</description>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.api.cms</artifactId>
-                       <version>2.3-SNAPSHOT</version>
-               </dependency>
-       </dependencies>
-</project>
\ No newline at end of file
diff --git a/org.argeo.cms.tp/src/org/apache/commons/logging/Log.java b/org.argeo.cms.tp/src/org/apache/commons/logging/Log.java
deleted file mode 100644 (file)
index eacce67..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.apache.commons.logging;
-
-/** An Apache logging facade. */
-@Deprecated
-public interface Log extends org.slf4j.impl.SystemLoggingAdapter {
-
-}
diff --git a/org.argeo.cms.tp/src/org/apache/commons/logging/LogFactory.java b/org.argeo.cms.tp/src/org/apache/commons/logging/LogFactory.java
deleted file mode 100644 (file)
index 6a2e8f8..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.apache.commons.logging;
-
-import java.lang.System.Logger;
-import java.util.Objects;
-
-/** A pseudo implementation of Apache Commons Logging. */
-@Deprecated
-public abstract class LogFactory {
-       public static Log getLog(Class<?> clss) {
-               return getLog(Objects.requireNonNull(clss).getName());
-       }
-
-       public static Log getLog(String name) {
-               Logger logger = System.getLogger(Objects.requireNonNull(name));
-               return new LoggerWrapper(logger);
-       }
-
-       static class LoggerWrapper implements Log {
-               private final Logger logger;
-
-               LoggerWrapper(Logger logger) {
-                       super();
-                       this.logger = logger;
-               }
-
-               @Override
-               public Logger getLogger() {
-                       return logger;
-               }
-
-       }
-}
diff --git a/org.argeo.cms.tp/src/org/slf4j/impl/ArgeoLogger.java b/org.argeo.cms.tp/src/org/slf4j/impl/ArgeoLogger.java
deleted file mode 100644 (file)
index 5c4889a..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-package org.slf4j.impl;
-
-import org.slf4j.helpers.MarkerIgnoringBase;
-
-class ArgeoLogger extends MarkerIgnoringBase {
-       private static final long serialVersionUID = -7719157836932627307L;
-       private final SystemLoggingAdapter log;
-
-       protected ArgeoLogger(String name, SystemLoggingAdapter log) {
-               this.name = name;
-               this.log = log;
-       }
-
-       @Override
-       public boolean isDebugEnabled() {
-               return log.isDebugEnabled();
-       }
-
-       @Override
-       public boolean isTraceEnabled() {
-               return log.isDebugEnabled();
-       }
-
-       @Override
-       public void trace(String msg) {
-               log.trace(msg);
-
-       }
-
-       @Override
-       public void trace(String format, Object... arguments) {
-               log.trace(format, arguments);
-
-       }
-
-       @Override
-       public void trace(String msg, Throwable t) {
-               log.trace(msg, t);
-
-       }
-
-       @Override
-       public void debug(String msg) {
-               log.debug(msg);
-
-       }
-
-       @Override
-       public void debug(String format, Object... arguments) {
-               log.debug(format, arguments);
-
-       }
-
-       @Override
-       public void debug(String msg, Throwable t) {
-               log.debug(msg, t);
-
-       }
-
-       @Override
-       public boolean isInfoEnabled() {
-               return log.isInfoEnabled();
-       }
-
-       @Override
-       public void info(String msg) {
-               log.info(msg);
-
-       }
-
-       @Override
-       public void info(String format, Object... arguments) {
-               log.info(format, arguments);
-       }
-
-       @Override
-       public void info(String msg, Throwable t) {
-               log.info(msg, t);
-
-       }
-
-       @Override
-       public boolean isWarnEnabled() {
-               return log.isWarnEnabled();
-       }
-
-       @Override
-       public void warn(String msg) {
-               log.warn(msg);
-
-       }
-
-       @Override
-       public void warn(String format, Object... arguments) {
-               log.warn(format, arguments);
-
-       }
-
-       @Override
-       public void warn(String msg, Throwable t) {
-               log.warn(msg, t);
-
-       }
-
-       @Override
-       public boolean isErrorEnabled() {
-
-               return log.isErrorEnabled();
-       }
-
-       @Override
-       public void error(String msg) {
-               log.error(msg);
-
-       }
-
-       @Override
-       public void error(String format, Object... arguments) {
-               log.error(format, arguments);
-
-       }
-
-       @Override
-       public void error(String msg, Throwable t) {
-               log.error(msg, t);
-
-       }
-
-       @Override
-       public void trace(String format, Object arg) {
-               trace(format, new Object[] { arg });
-
-       }
-
-       @Override
-       public void trace(String format, Object arg1, Object arg2) {
-               trace(format, new Object[] { arg1, arg2 });
-       }
-
-       @Override
-       public void debug(String format, Object arg) {
-               debug(format, new Object[] { arg });
-       }
-
-       @Override
-       public void debug(String format, Object arg1, Object arg2) {
-               debug(format, new Object[] { arg1, arg2 });
-       }
-
-       @Override
-       public void info(String format, Object arg) {
-               info(format, new Object[] { arg });
-       }
-
-       @Override
-       public void info(String format, Object arg1, Object arg2) {
-               info(format, new Object[] { arg1, arg2 });
-       }
-
-       @Override
-       public void warn(String format, Object arg) {
-               warn(format, new Object[] { arg });
-       }
-
-       @Override
-       public void warn(String format, Object arg1, Object arg2) {
-               warn(format, new Object[] { arg1, arg2 });
-       }
-
-       @Override
-       public void error(String format, Object arg) {
-               error(format, new Object[] { arg });
-       }
-
-       @Override
-       public void error(String format, Object arg1, Object arg2) {
-               error(format, new Object[] { arg1, arg2 });
-       }
-
-}
\ No newline at end of file
diff --git a/org.argeo.cms.tp/src/org/slf4j/impl/StaticLoggerBinder.java b/org.argeo.cms.tp/src/org/slf4j/impl/StaticLoggerBinder.java
deleted file mode 100644 (file)
index 8c5b3ad..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.slf4j.impl;
-
-import org.slf4j.ILoggerFactory;
-import org.slf4j.spi.LoggerFactoryBinder;
-
-public class StaticLoggerBinder implements LoggerFactoryBinder {
-       public static final String REQUESTED_API_VERSION = "1.7";
-
-       private static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder();
-
-       private final ILoggerFactory loggerFactory;
-
-       protected StaticLoggerBinder() {
-               loggerFactory = new SystemLoggerFactory();
-       }
-
-       @Override
-       public ILoggerFactory getLoggerFactory() {
-               return loggerFactory;
-       }
-
-       @Override
-       public String getLoggerFactoryClassStr() {
-               return SystemLoggerFactory.class.getName();
-       }
-
-       public static final StaticLoggerBinder getSingleton() {
-               return SINGLETON;
-       }
-
-       static class SystemLoggerFactory implements ILoggerFactory {
-
-               @Override
-               public org.slf4j.Logger getLogger(String name) {
-                       SystemLoggingAdapter logger = SystemLoggingAdapter.getLog(name);
-                       return new ArgeoLogger(name, logger);
-               }
-
-       }
-
-}
diff --git a/org.argeo.cms.tp/src/org/slf4j/impl/SystemLoggingAdapter.java b/org.argeo.cms.tp/src/org/slf4j/impl/SystemLoggingAdapter.java
deleted file mode 100644 (file)
index 7a6c865..0000000
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.slf4j.impl;
-
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
-import java.util.Objects;
-import java.util.function.Supplier;
-
-/**
- * A Commons Logging / SLF4J style logging utilities wrapping a standard Java
- * platform {@link Logger}.
- */
-public interface SystemLoggingAdapter {
-       Logger getLogger();
-
-       default boolean isDebugEnabled() {
-               return getLogger().isLoggable(Level.DEBUG);
-       }
-
-       default boolean isErrorEnabled() {
-               return getLogger().isLoggable(Level.ERROR);
-       }
-
-       default boolean isInfoEnabled() {
-               return getLogger().isLoggable(Level.INFO);
-       }
-
-       default boolean isTraceEnabled() {
-               return getLogger().isLoggable(Level.TRACE);
-       }
-
-       default boolean isWarnEnabled() {
-               return getLogger().isLoggable(Level.WARNING);
-       }
-
-       /*
-        * TRACE
-        */
-
-       default void trace(String message) {
-               getLogger().log(Level.TRACE, message);
-       }
-
-       default void trace(Supplier<String> message) {
-               getLogger().log(Level.TRACE, message);
-       }
-
-       default void trace(Object message) {
-               getLogger().log(Level.TRACE, Objects.requireNonNull(message));
-       }
-
-       default void trace(String message, Throwable t) {
-               getLogger().log(Level.TRACE, message, t);
-       }
-
-       default void trace(Object message, Throwable t) {
-               trace(Objects.requireNonNull(message).toString(), t);
-       }
-
-       default void trace(String format, Object... arguments) {
-               getLogger().log(Level.TRACE, format, arguments);
-       }
-
-       /*
-        * DEBUG
-        */
-
-       default void debug(String message) {
-               getLogger().log(Level.DEBUG, message);
-       }
-
-       default void debug(Supplier<String> message) {
-               getLogger().log(Level.DEBUG, message);
-       }
-
-       default void debug(Object message) {
-               getLogger().log(Level.DEBUG, message);
-       }
-
-       default void debug(String message, Throwable t) {
-               getLogger().log(Level.DEBUG, message, t);
-       }
-
-       default void debug(Object message, Throwable t) {
-               debug(Objects.requireNonNull(message).toString(), t);
-       }
-
-       default void debug(String format, Object... arguments) {
-               getLogger().log(Level.DEBUG, format, arguments);
-       }
-
-       /*
-        * INFO
-        */
-
-       default void info(String message) {
-               getLogger().log(Level.INFO, message);
-       }
-
-       default void info(Supplier<String> message) {
-               getLogger().log(Level.INFO, message);
-       }
-
-       default void info(Object message) {
-               getLogger().log(Level.INFO, message);
-       }
-
-       default void info(String message, Throwable t) {
-               getLogger().log(Level.INFO, message, t);
-       }
-
-       default void info(Object message, Throwable t) {
-               info(Objects.requireNonNull(message).toString(), t);
-       }
-
-       default void info(String format, Object... arguments) {
-               getLogger().log(Level.INFO, format, arguments);
-       }
-
-       /*
-        * WARN
-        */
-
-       default void warn(String message) {
-               getLogger().log(Level.WARNING, message);
-       }
-
-       default void warn(Supplier<String> message) {
-               getLogger().log(Level.WARNING, message);
-       }
-
-       default void warn(Object message) {
-               getLogger().log(Level.WARNING, message);
-       }
-
-       default void warn(String message, Throwable t) {
-               getLogger().log(Level.WARNING, message, t);
-       }
-
-       default void warn(Object message, Throwable t) {
-               warn(Objects.requireNonNull(message).toString(), t);
-       }
-
-       default void warn(String format, Object... arguments) {
-               getLogger().log(Level.WARNING, format, arguments);
-       }
-
-       /*
-        * ERROR
-        */
-
-       default void error(String message) {
-               getLogger().log(Level.ERROR, message);
-       }
-
-       default void error(Supplier<String> message) {
-               getLogger().log(Level.ERROR, message);
-       }
-
-       default void error(Object message) {
-               getLogger().log(Level.ERROR, message);
-       }
-
-       default void error(String message, Throwable t) {
-               getLogger().log(Level.ERROR, message, t);
-       }
-
-       default void error(Object message, Throwable t) {
-               error(Objects.requireNonNull(message).toString(), t);
-       }
-
-       default void error(String format, Object... arguments) {
-               getLogger().log(Level.ERROR, format, arguments);
-       }
-
-       /*
-        * STATIC UTILITIES
-        */
-
-       static SystemLoggingAdapter getLog(Class<?> clss) {
-               return getLog(Objects.requireNonNull(clss).getName());
-       }
-
-       static SystemLoggingAdapter getLog(String name) {
-               Logger logger = System.getLogger(Objects.requireNonNull(name));
-               return new LoggerWrapper(logger);
-       }
-
-       /** A trivial implementation wrapping a platform logger. */
-       static class LoggerWrapper implements SystemLoggingAdapter {
-               private final Logger logger;
-
-               LoggerWrapper(Logger logger) {
-                       this.logger = logger;
-               }
-
-               @Override
-               public Logger getLogger() {
-                       return logger;
-               }
-
-       }
-
-}
diff --git a/pom.xml b/pom.xml
index 9221b4720e1e53a8dad7d50f865473f4f4a7433c..d988fc8cd3a683c3ac815d7c81ae392795af2541 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,6 @@
                <module>org.argeo.api.acr</module>
                <module>org.argeo.api.cms</module>
                <!-- CMS -->
-               <module>org.argeo.cms.tp</module>
                <module>org.argeo.cms</module>
                <module>org.argeo.cms.pgsql</module>
                <!-- CMS SWT -->