From 39704ee3eac691423e74a6b3cfc11cb85feeb215 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 11 Mar 2023 13:50:18 +0100 Subject: [PATCH] Remove moved component --- Makefile | 14 +- rebuild/Makefile | 2 - rebuild/org.argeo.tp/Makefile | 16 -- .../org.argeo.ext.slf4j/.classpath | 7 - .../org.argeo.ext.slf4j/.gitignore | 1 - .../org.argeo.tp/org.argeo.ext.slf4j/.project | 28 --- .../org.argeo.ext.slf4j/META-INF/.gitignore | 1 - .../org.argeo.tp/org.argeo.ext.slf4j/bnd.bnd | 3 - .../org.argeo.ext.slf4j/build.properties | 4 - .../src/org/slf4j/impl/ArgeoLogger.java | 180 ---------------- .../org/slf4j/impl/StaticLoggerBinder.java | 41 ---- .../org/slf4j/impl/SystemLoggingAdapter.java | 203 ------------------ 12 files changed, 1 insertion(+), 499 deletions(-) delete mode 100644 rebuild/org.argeo.tp/Makefile delete mode 100644 rebuild/org.argeo.tp/org.argeo.ext.slf4j/.classpath delete mode 100644 rebuild/org.argeo.tp/org.argeo.ext.slf4j/.gitignore delete mode 100644 rebuild/org.argeo.tp/org.argeo.ext.slf4j/.project delete mode 100644 rebuild/org.argeo.tp/org.argeo.ext.slf4j/META-INF/.gitignore delete mode 100644 rebuild/org.argeo.tp/org.argeo.ext.slf4j/bnd.bnd delete mode 100644 rebuild/org.argeo.tp/org.argeo.ext.slf4j/build.properties delete mode 100644 rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/ArgeoLogger.java delete mode 100644 rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/StaticLoggerBinder.java delete mode 100644 rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/SystemLoggingAdapter.java diff --git a/Makefile b/Makefile index a919ea9..bdab034 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,7 @@ include sdk.mk .PHONY: clean all bootstrap -all: bootstrap distribution - -BOOTSTRAP_BASE=$(SDK_BUILD_BASE)/bootstrap +all: distribution A2_OUTPUT = $(SDK_BUILD_BASE)/a2 @@ -11,17 +9,7 @@ distribution: make -C repackage all make -C rebuild all -bootstrap: - make -C bootstrap bootstrap-download-sources all - -bootstrap-old : - mkdir -p $(SDK_BUILD_BASE)/bootstrap - wget -c -O $(BOOTSTRAP_BASE)/ecj.jar https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.32.0/ecj-3.32.0.jar - wget -c -O $(BOOTSTRAP_BASE)/slf4j-api.jar https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar - wget -c -O $(BOOTSTRAP_BASE)/bndlib.jar https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.3.0/biz.aQute.bndlib-5.3.0.jar - clean: - make -C bootstrap clean make -C repackage clean make -C rebuild clean diff --git a/rebuild/Makefile b/rebuild/Makefile index 7ef8ec0..bdeb875 100644 --- a/rebuild/Makefile +++ b/rebuild/Makefile @@ -1,10 +1,8 @@ .PHONY: clean all all: - make -C org.argeo.tp all make -C org.argeo.tp.utils all clean: - make -C org.argeo.tp clean make -C org.argeo.tp.utils clean \ No newline at end of file diff --git a/rebuild/org.argeo.tp/Makefile b/rebuild/org.argeo.tp/Makefile deleted file mode 100644 index 6dbcfa4..0000000 --- a/rebuild/org.argeo.tp/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -include ../../sdk.mk -.PHONY: clean all osgi - -all: osgi - -A2_CATEGORY = org.argeo.tp - -BUNDLES = \ -org.argeo.ext.slf4j \ - -clean: - rm -rf $(BUILD_BASE) - -DEP_CATEGORIES = org.argeo.tp - -include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk \ No newline at end of file diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/.classpath b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/.classpath deleted file mode 100644 index e801ebf..0000000 --- a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/.gitignore b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/.gitignore deleted file mode 100644 index 65776c3..0000000 --- a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin/ \ No newline at end of file diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/.project b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/.project deleted file mode 100644 index 3ed363d..0000000 --- a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.argeo.ext.slf4j - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/META-INF/.gitignore b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/META-INF/.gitignore deleted file mode 100644 index 4854a41..0000000 --- a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/bnd.bnd b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/bnd.bnd deleted file mode 100644 index 37061df..0000000 --- a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/bnd.bnd +++ /dev/null @@ -1,3 +0,0 @@ -Export-Package: org.slf4j.impl - -Import-Package: * diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/build.properties b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/build.properties deleted file mode 100644 index 34d2e4d..0000000 --- a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/ArgeoLogger.java b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/ArgeoLogger.java deleted file mode 100644 index 5c4889a..0000000 --- a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/ArgeoLogger.java +++ /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/rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/StaticLoggerBinder.java b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/StaticLoggerBinder.java deleted file mode 100644 index 8c5b3ad..0000000 --- a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/StaticLoggerBinder.java +++ /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/rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/SystemLoggingAdapter.java b/rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/SystemLoggingAdapter.java deleted file mode 100644 index 7a6c865..0000000 --- a/rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/org/slf4j/impl/SystemLoggingAdapter.java +++ /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 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 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 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 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 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; - } - - } - -} -- 2.30.2