From 11ea094a63803e02d19fdea0b2b35f9a8dbdef7b Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Fri, 7 Jun 2024 09:26:18 +0200
Subject: [PATCH] [FEAT] use Maven a build system root tool

---
 .checkstyle                               |   2 +-
 .classpath                                |  12 ++-
 .project                                  |  11 ++
 lutin_org-atriasoft-egami.py              |   2 +-
 pom.xml                                   | 123 ++++++++++++++++++++++
 src/module-info.java                      |   3 +-
 src/org/atriasoft/egami/internal/Log.java |  76 -------------
 7 files changed, 145 insertions(+), 84 deletions(-)
 create mode 100644 pom.xml
 delete mode 100644 src/org/atriasoft/egami/internal/Log.java

diff --git a/.checkstyle b/.checkstyle
index 428926e..5783bc0 100644
--- a/.checkstyle
+++ b/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <fileset name="all" enabled="true" check-config-name="Ewol" local="false">
+  <fileset name="all" enabled="true" check-config-name="Google Checks" local="false">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/.classpath b/.classpath
index c1b4392..50809b8 100644
--- a/.classpath
+++ b/.classpath
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src">
+	<classpathentry including="**/*.java" kind="src" output="out/maven/classes" path="src">
 		<attributes>
 			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-15">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">
@@ -15,10 +17,10 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/atriasoft-etk">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
-			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="out/eclipse/classes"/>
+	<classpathentry kind="output" path="out/maven/classes"/>
 </classpath>
diff --git a/.project b/.project
index 1dffbe9..10a2ec6 100644
--- a/.project
+++ b/.project
@@ -6,6 +6,11 @@
 		<project>atriasoft-egami</project>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -16,8 +21,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
diff --git a/lutin_org-atriasoft-egami.py b/lutin_org-atriasoft-egami.py
index 10af6c9..19278bc 100644
--- a/lutin_org-atriasoft-egami.py
+++ b/lutin_org-atriasoft-egami.py
@@ -37,7 +37,7 @@ def configure(target, my_module):
 	    'src/org/atriasoft/egami/ImageByte.java',
 	    'src/org/atriasoft/egami/ImageFloatRGB.java',
 	    'src/org/atriasoft/egami/ImageByteRGB.java',
-	    'src/org/atriasoft/egami/internal/Log.java',
+	    'src/org/atriasoft/egami/internal/LOGGER.java',
 	    'src/org/atriasoft/egami/ImageFloat.java',
 	    'src/org/atriasoft/egami/Image.java',
 	    'src/org/atriasoft/egami/ImageType.java',
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..7c56081
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,123 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.atriasoft</groupId>
+  <artifactId>egami</artifactId>
+  <version>0.1.0</version>
+	<properties>
+		<maven.compiler.version>3.13.0</maven.compiler.version>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
+		<maven.dependency.version>3.1.1</maven.dependency.version>
+	</properties>
+
+	<repositories>
+	  <repository>
+	    <id>gitea</id>
+	    <url>https://gitea.atria-soft.org/api/packages/org.atriasoft/maven</url>
+	  </repository>
+	</repositories>
+	<distributionManagement>
+	  <repository>
+	    <id>gitea</id>
+	    <url>https://gitea.atria-soft.org/api/packages/org.atriasoft/maven</url>
+	  </repository>
+	  <snapshotRepository>
+	    <id>gitea</id>
+	    <url>https://gitea.atria-soft.org/api/packages/org.atriasoft/maven</url>
+	  </snapshotRepository>
+	</distributionManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.atriasoft</groupId>
+			<artifactId>etk</artifactId>
+			<version>0.1.0</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.junit.jupiter</groupId>
+		    <artifactId>junit-jupiter-api</artifactId>
+		    <version>5.9.3</version>
+		    <scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>2.0.7</version>
+			<scope>test</scope>
+		</dependency>
+    </dependencies>
+
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<testSourceDirectory>test/src</testSourceDirectory>
+    	<directory>${project.basedir}/out/maven/</directory>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>${maven.compiler.version}</version>
+				<configuration>
+					<source>${maven.compiler.source}</source>
+					<target>${maven.compiler.target}</target>
+					<!--<encoding>${project.build.sourceEncoding}</encoding>-->
+				</configuration>
+			</plugin>
+			<!-- Create the source bundle -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<!-- junit results -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.0.0-M5</version>
+			</plugin>
+		    <plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>fully.qualified.MainClass</mainClass>
+						</manifest>
+					</archive>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+				</configuration>
+		    </plugin>
+			<!-- Java-doc generation for stand-alone site -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.2.0</version>
+				<configuration>
+					<show>private</show>
+					<nohelp>true</nohelp>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<!-- Generate Java-docs As Part Of Project Reports -->
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.2.0</version>
+				<configuration>
+					<show>public</show>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+
+</project>
diff --git a/src/module-info.java b/src/module-info.java
index bb3d4d3..bec9944 100644
--- a/src/module-info.java
+++ b/src/module-info.java
@@ -4,6 +4,7 @@
 
 open module org.atriasoft.egami {
 	exports org.atriasoft.egami;
+	
 	requires transitive org.atriasoft.etk;
-	requires transitive org.atriasoft.reggol;
+	//requires transitive org.atriasoft.reggol;
 }
diff --git a/src/org/atriasoft/egami/internal/Log.java b/src/org/atriasoft/egami/internal/Log.java
deleted file mode 100644
index d1f3165..0000000
--- a/src/org/atriasoft/egami/internal/Log.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.atriasoft.egami.internal;
-
-import org.atriasoft.reggol.LogLevel;
-import org.atriasoft.reggol.Logger;
-
-public class Log {
-	private static final boolean FORCE_ALL = false;
-	private static final String LIB_NAME = "egami";
-	private static final String LIB_NAME_DRAW = Logger.getDrawableName(Log.LIB_NAME);
-	private static final boolean PRINT_CRITICAL = Logger.getNeedPrint(Log.LIB_NAME, LogLevel.CRITICAL);
-	private static final boolean PRINT_DEBUG = Logger.getNeedPrint(Log.LIB_NAME, LogLevel.DEBUG);
-	private static final boolean PRINT_ERROR = Logger.getNeedPrint(Log.LIB_NAME, LogLevel.ERROR);
-	private static final boolean PRINT_INFO = Logger.getNeedPrint(Log.LIB_NAME, LogLevel.INFO);
-	private static final boolean PRINT_PRINT = Logger.getNeedPrint(Log.LIB_NAME, LogLevel.PRINT);
-	private static final boolean PRINT_TODO = Logger.getNeedPrint(Log.LIB_NAME, LogLevel.TODO);
-	private static final boolean PRINT_VERBOSE = Logger.getNeedPrint(Log.LIB_NAME, LogLevel.VERBOSE);
-	private static final boolean PRINT_WARNING = Logger.getNeedPrint(Log.LIB_NAME, LogLevel.WARNING);
-	
-	public static void critical(final Exception e, final String data) {
-		e.printStackTrace();
-		if (PRINT_CRITICAL || FORCE_ALL) {
-			Logger.critical(LIB_NAME_DRAW, data + " : " + e.getMessage());
-		}
-	}
-	
-	public static void critical(final String data, final Object... objects) {
-		if (PRINT_CRITICAL || FORCE_ALL) {
-			Logger.critical(LIB_NAME_DRAW, data, objects);
-		}
-	}
-	
-	public static void debug(final String data, final Object... objects) {
-		if (PRINT_DEBUG || FORCE_ALL) {
-			Logger.debug(LIB_NAME_DRAW, data, objects);
-		}
-	}
-	
-	public static void error(final String data, final Object... objects) {
-		if (PRINT_ERROR || FORCE_ALL) {
-			Logger.error(LIB_NAME_DRAW, data, objects);
-		}
-	}
-	
-	public static void info(final String data, final Object... objects) {
-		if (PRINT_INFO || FORCE_ALL) {
-			Logger.info(LIB_NAME_DRAW, data, objects);
-		}
-	}
-	
-	public static void print(final String data, final Object... objects) {
-		if (PRINT_PRINT || FORCE_ALL) {
-			Logger.print(LIB_NAME_DRAW, data, objects);
-		}
-	}
-	
-	public static void todo(final String data, final Object... objects) {
-		if (PRINT_TODO || FORCE_ALL) {
-			Logger.todo(LIB_NAME_DRAW, data, objects);
-		}
-	}
-	
-	public static void verbose(final String data, final Object... objects) {
-		if (PRINT_VERBOSE || FORCE_ALL) {
-			Logger.verbose(LIB_NAME_DRAW, data, objects);
-		}
-	}
-	
-	public static void warning(final String data, final Object... objects) {
-		if (PRINT_WARNING || FORCE_ALL) {
-			Logger.warning(LIB_NAME_DRAW, data, objects);
-		}
-	}
-	
-	private Log() {}
-	
-}