From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 5 Jan 2022 06:21:32 +0000 (+0100)
Subject: Rename transtion bundle to cms.tp
X-Git-Tag: argeo-commons-2.3.5~106
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=af817c9bebfa3187f9a64c3e6aadb933dac148c8;p=lgpl%2Fargeo-commons.git

Rename transtion bundle to cms.tp
---

diff --git a/dep/org.argeo.dep.cms.minimal/pom.xml b/dep/org.argeo.dep.cms.minimal/pom.xml
index 7434e4289..1594c0a24 100644
--- a/dep/org.argeo.dep.cms.minimal/pom.xml
+++ b/dep/org.argeo.dep.cms.minimal/pom.xml
@@ -42,7 +42,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.transition</artifactId>
+			<artifactId>org.argeo.cms.tp</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
diff --git a/org.argeo.cms.tp/.classpath b/org.argeo.cms.tp/.classpath
new file mode 100644
index 000000000..e801ebfb4
--- /dev/null
+++ b/org.argeo.cms.tp/.classpath
@@ -0,0 +1,7 @@
+<?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
new file mode 100644
index 000000000..1c3ccb13a
--- /dev/null
+++ b/org.argeo.cms.tp/.project
@@ -0,0 +1,28 @@
+<?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
new file mode 100644
index 000000000..66c0c1b30
--- /dev/null
+++ b/org.argeo.cms.tp/bnd.bnd
@@ -0,0 +1,2 @@
+Import-Package: \
+*;resolution:=optional
diff --git a/org.argeo.cms.tp/build.properties b/org.argeo.cms.tp/build.properties
new file mode 100644
index 000000000..34d2e4d2d
--- /dev/null
+++ b/org.argeo.cms.tp/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/org.argeo.cms.tp/pom.xml b/org.argeo.cms.tp/pom.xml
new file mode 100644
index 000000000..2bc5b03d1
--- /dev/null
+++ b/org.argeo.cms.tp/pom.xml
@@ -0,0 +1,23 @@
+<?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 from some third parties, typically logging</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.api</artifactId>
+			<version>2.3-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/org.argeo.cms.tp/src/org/slf4j/impl/ArgeoLogger.java b/org.argeo.cms.tp/src/org/slf4j/impl/ArgeoLogger.java
new file mode 100644
index 000000000..676303750
--- /dev/null
+++ b/org.argeo.cms.tp/src/org/slf4j/impl/ArgeoLogger.java
@@ -0,0 +1,181 @@
+package org.slf4j.impl;
+
+import org.apache.commons.logging.Log;
+import org.slf4j.helpers.MarkerIgnoringBase;
+
+class ArgeoLogger extends MarkerIgnoringBase {
+	private static final long serialVersionUID = -7719157836932627307L;
+	private final Log log;
+
+	protected ArgeoLogger(String name, Log 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
new file mode 100644
index 000000000..19943a157
--- /dev/null
+++ b/org.argeo.cms.tp/src/org/slf4j/impl/StaticLoggerBinder.java
@@ -0,0 +1,43 @@
+package org.slf4j.impl;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+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) {
+			Log logger = LogFactory.getLog(name);
+			return new ArgeoLogger(name, logger);
+		}
+
+	}
+
+}
diff --git a/org.argeo.transition/.classpath b/org.argeo.transition/.classpath
deleted file mode 100644
index e801ebfb4..000000000
--- a/org.argeo.transition/.classpath
+++ /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.transition/.project b/org.argeo.transition/.project
deleted file mode 100644
index 1c1172e99..000000000
--- a/org.argeo.transition/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.argeo.transition</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.transition/bnd.bnd b/org.argeo.transition/bnd.bnd
deleted file mode 100644
index 66c0c1b30..000000000
--- a/org.argeo.transition/bnd.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Import-Package: \
-*;resolution:=optional
diff --git a/org.argeo.transition/build.properties b/org.argeo.transition/build.properties
deleted file mode 100644
index 34d2e4d2d..000000000
--- a/org.argeo.transition/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/org.argeo.transition/pom.xml b/org.argeo.transition/pom.xml
deleted file mode 100644
index eac492209..000000000
--- a/org.argeo.transition/pom.xml
+++ /dev/null
@@ -1,22 +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.transition</artifactId>
-	<packaging>jar</packaging>
-	<name>Legacy transition</name>
-	<dependencies>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.api</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
-	</dependencies>
-
-
-</project>
\ No newline at end of file
diff --git a/org.argeo.transition/src/org/slf4j/impl/ArgeoLogger.java b/org.argeo.transition/src/org/slf4j/impl/ArgeoLogger.java
deleted file mode 100644
index 676303750..000000000
--- a/org.argeo.transition/src/org/slf4j/impl/ArgeoLogger.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.slf4j.impl;
-
-import org.apache.commons.logging.Log;
-import org.slf4j.helpers.MarkerIgnoringBase;
-
-class ArgeoLogger extends MarkerIgnoringBase {
-	private static final long serialVersionUID = -7719157836932627307L;
-	private final Log log;
-
-	protected ArgeoLogger(String name, Log 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.transition/src/org/slf4j/impl/StaticLoggerBinder.java b/org.argeo.transition/src/org/slf4j/impl/StaticLoggerBinder.java
deleted file mode 100644
index 19943a157..000000000
--- a/org.argeo.transition/src/org/slf4j/impl/StaticLoggerBinder.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.slf4j.impl;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-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) {
-			Log logger = LogFactory.getLog(name);
-			return new ArgeoLogger(name, logger);
-		}
-
-	}
-
-}
diff --git a/pom.xml b/pom.xml
index 123fb1c9c..8ec1f0c83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,19 +22,15 @@
 		<!-- Base -->
 		<module>org.argeo.init</module>
 		<module>org.argeo.enterprise</module>
-		<!-- <module>org.argeo.jcr</module> -->
-		<!-- <module>org.argeo.core</module> -->
 		<!-- Eclipse -->
 		<module>org.argeo.swt.specific.rap</module>
 		<!-- CMS -->
 		<module>org.argeo.api</module>
-		<module>org.argeo.transition</module>
-		<!-- <module>org.argeo.maintenance</module> -->
+		<module>org.argeo.cms.tp</module>
 		<module>org.argeo.cms</module>
 		<module>org.argeo.cms.servlet</module>
 		<module>org.argeo.cms.swt</module>
 		<module>org.argeo.cms.jcr</module>
-		<!-- <module>org.argeo.cms.ui.theme</module> -->
 		<module>org.argeo.cms.ui</module>
 		<module>org.argeo.cms.ui.rap</module>
 		<!-- CMS E4 -->