From ec6a03835d9da62186463331ab4124e35dd56a56 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

---
 .classpath                                    |  4 ++--
 .project                                      |  1 -
 lutin_org-atriasoft-ejson.py                  |  2 +-
 pom.xml                                       | 19 +++++++++----------
 src/module-info.java                          |  5 ++---
 src/org/atriasoft/ejson/parser/ParseJson.java |  6 +++---
 .../atriasoft/ejson/generic/EjsonTestAll.java |  2 +-
 7 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/.classpath b/.classpath
index bd326c0..6b33538 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="out/maven/classes" 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"/>
@@ -13,7 +13,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/.project b/.project
index efaf6cf..3e2fcde 100644
--- a/.project
+++ b/.project
@@ -36,7 +36,6 @@
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
-		<nature>org.python.pydev.pythonNature</nature>
 	</natures>
 	<filteredResources>
 		<filter>
diff --git a/lutin_org-atriasoft-ejson.py b/lutin_org-atriasoft-ejson.py
index 9752240..253a1fa 100644
--- a/lutin_org-atriasoft-ejson.py
+++ b/lutin_org-atriasoft-ejson.py
@@ -40,7 +40,7 @@ def configure(target, my_module):
 	    'src/org/atriasoft/ejson/model/JsonBoolean.java',
 	    'src/org/atriasoft/ejson/model/JsonString.java',
 	    'src/org/atriasoft/ejson/model/JsonObject.java',
-	    'src/org/atriasoft/ejson/internal/Log.java',
+	    'src/org/atriasoft/ejson/internal/LOGGER.java',
 	    'src/org/atriasoft/ejson/annotation/JsonManaged.java',
 	    'src/org/atriasoft/ejson/annotation/EjsonAnnotation.java',
 	    'src/org/atriasoft/ejson/annotation/JsonDefaultManaged.java',
diff --git a/pom.xml b/pom.xml
index bcc1acb..f1593aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,41 +1,40 @@
 <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>jatria-soft</groupId>
+  <groupId>org.atriasoft</groupId>
   <artifactId>ejson</artifactId>
   <version>0.1.0</version>
 	<properties>
-		<maven.compiler.version>3.1</maven.compiler.version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
-
+		<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/jatria-soft/maven</url>
+	    <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/jatria-soft/maven</url>
+	    <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/jatria-soft/maven</url>
+	    <url>https://gitea.atria-soft.org/api/packages/org.atriasoft/maven</url>
 	  </snapshotRepository>
 	</distributionManagement>
 
 	<dependencies>
 		<dependency>
-			<groupId>jatria-soft</groupId>
+			<groupId>org.atriasoft</groupId>
 			<artifactId>etk</artifactId>
 			<version>0.1.0</version>
 		</dependency>
 		<dependency>
-			<groupId>jatria-soft</groupId>
+			<groupId>org.atriasoft</groupId>
 			<artifactId>aknot</artifactId>
 			<version>0.1.0</version>
 		</dependency>
diff --git a/src/module-info.java b/src/module-info.java
index 0cde82b..411dab7 100644
--- a/src/module-info.java
+++ b/src/module-info.java
@@ -10,10 +10,9 @@ open module org.atriasoft.ejson {
 	exports org.atriasoft.ejson.exception;
 	exports org.atriasoft.ejson.builder;
 	exports org.atriasoft.ejson.parser;
-	
+
 	requires transitive org.atriasoft.etk;
-	requires transitive org.atriasoft.reggol;
 	requires java.base;
 	requires org.atriasoft.aknot;
-	
+
 }
diff --git a/src/org/atriasoft/ejson/parser/ParseJson.java b/src/org/atriasoft/ejson/parser/ParseJson.java
index 70158e3..a63ed45 100644
--- a/src/org/atriasoft/ejson/parser/ParseJson.java
+++ b/src/org/atriasoft/ejson/parser/ParseJson.java
@@ -23,7 +23,7 @@ public class ParseJson {
 	
 	boolean iParseArray(final Object parent, final String data, final PositionParsing pos, final FilePos filePos, final ParsingProperty parsingProperty) throws EjsonException, AknotException {
 		for (int iii = pos.value; iii < data.length(); iii++) {
-			//Log.verbose("parse Array: '{}'", data.charAt(iii));
+			//LOGGER.trace("parse Array: '{}'", data.charAt(iii));
 			filePos.check(data.charAt(iii));
 			if (data.charAt(iii) == ' ' || data.charAt(iii) == '\t' || data.charAt(iii) == '\n' || data.charAt(iii) == '\r') {
 				// white space  == > nothing to do ...
@@ -218,7 +218,7 @@ public class ParseJson {
 		boolean backslashPrevious = false;
 		final StringBuilder out = new StringBuilder();
 		for (int iii = pos.value + 1; iii < data.length(); iii++) {
-			//Log.verbose("parse String: '{}'", data.charAt(iii));
+			//LOGGER.trace("parse String: '{}'", data.charAt(iii));
 			filePos.check(data.charAt(iii));
 			if (data.charAt(iii) == '\\') {
 				if (backslashPrevious) {
@@ -275,7 +275,7 @@ public class ParseJson {
 			startPos = pos.value;
 		}
 		for (int iii = startPos; iii < data.length(); iii++) {
-			//Log.verbose("parse Object: '{}'", data.charAt(iii));
+			//LOGGER.trace("parse Object: '{}'", data.charAt(iii));
 			filePos.check(data.charAt(iii));
 			if (data.charAt(iii) == ' ' || data.charAt(iii) == '\t' || data.charAt(iii) == '\n' || data.charAt(iii) == '\r') {
 				// white space  == > nothing to do ...
diff --git a/test/src/test/atriasoft/ejson/generic/EjsonTestAll.java b/test/src/test/atriasoft/ejson/generic/EjsonTestAll.java
index a77f4cb..8347c6d 100644
--- a/test/src/test/atriasoft/ejson/generic/EjsonTestAll.java
+++ b/test/src/test/atriasoft/ejson/generic/EjsonTestAll.java
@@ -214,7 +214,7 @@ public class EjsonTestAll {
 									"logLocation": "/usr/local/tomcat/logs/CofaxTools.log",
 									"logMaxSize": "",
 									"dataLog": 1,
-									"dataLogLocation": "/usr/local/tomcat/logs/dataLog.log",
+									"dataLogLocation": "/usr/local/tomcat/logs/dataLOGGER.log",
 									"dataLogMaxSize": "",
 									"removePageCache": "/content/admin/remove?cache=pages&id=",
 									"removeTemplateCache": "/content/admin/remove?cache=templates&id=",