From f7dc0aa32162e0960d93844e43f61e6d76091b33 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <edouard.dupin@proton.me>
Date: Sat, 24 May 2025 00:24:25 +0200
Subject: [PATCH] [FIX] arbo

---
 pom.xml                                       | 47 ++++++++++---------
 .../org/atriasoft/loader3d/Face.java          |  0
 .../org/atriasoft/loader3d/FaceIndexing.java  |  0
 .../org/atriasoft/loader3d/Loader3d.java      |  0
 .../org/atriasoft/loader3d/NormalMode.java    |  0
 .../org/atriasoft/loader3d/OBJFileLoader.java |  0
 .../atriasoft/loader3d/model/Material.java    |  0
 .../loader3d/model/MaterialBase.java          |  0
 .../loader3d/model/MaterialGlId.java          |  0
 .../atriasoft/loader3d/model/ModelData.java   |  0
 .../atriasoft/loader3d/model/PhysicShape.java |  0
 .../org/atriasoft/loader3d/model/Vertex.java  |  0
 .../resources/ResourceListTexturedMesh.java   |  0
 .../loader3d/resources/ResourceMesh.java      |  0
 .../loader3d/resources/ResourceMeshEmf.java   |  0
 .../resources/ResourceMeshHeightMap.java      |  0
 .../resources/ResourcePaletteFile.java        |  0
 .../resources/ResourceStaticColoredMesh.java  |  0
 .../resources/ResourceStaticMesh.java         |  0
 .../resources/ResourceStaticMeshObj.java      |  0
 .../ResourceStaticMeshObjDynamic.java         |  0
 .../resources/ResourceStaticTexturedMesh.java |  0
 src/module-info.java                          | 12 -----
 .../test/atriasoft/loader3d/TestBasicLog.java | 36 --------------
 24 files changed, 26 insertions(+), 69 deletions(-)
 rename src/{ => main}/org/atriasoft/loader3d/Face.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/FaceIndexing.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/Loader3d.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/NormalMode.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/OBJFileLoader.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/model/Material.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/model/MaterialBase.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/model/MaterialGlId.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/model/ModelData.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/model/PhysicShape.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/model/Vertex.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/resources/ResourceListTexturedMesh.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/resources/ResourceMesh.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/resources/ResourceMeshEmf.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/resources/ResourceMeshHeightMap.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/resources/ResourcePaletteFile.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/resources/ResourceStaticColoredMesh.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/resources/ResourceStaticMesh.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/resources/ResourceStaticMeshObj.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/resources/ResourceStaticMeshObjDynamic.java (100%)
 rename src/{ => main}/org/atriasoft/loader3d/resources/ResourceStaticTexturedMesh.java (100%)
 delete mode 100644 src/module-info.java
 delete mode 100644 test/src/test/atriasoft/loader3d/TestBasicLog.java

diff --git a/pom.xml b/pom.xml
index 251271f..c7ed629 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,14 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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>loader3d</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>
+	<licenses>
+		<license>
+			<name>Mozilla Public License 2.0</name>
+			<url>https://opensource.org/licenses/MPL-2.0</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<developers>
+		<developer>
+			<id>dev1</id>
+			<name>Edouard DUPIN</name>
+			<email>edouard.dupin@proton.me</email>
+			<roles>
+				<role>Lead Developer</role>
+			</roles>
+		</developer>
+	</developers>
 
 	<repositories>
 	  <repository>
@@ -46,7 +58,7 @@
 		<dependency>
 		    <groupId>org.junit.jupiter</groupId>
 		    <artifactId>junit-jupiter-api</artifactId>
-		    <version>5.11.0-M2</version>
+		    <version>5.11.0</version>
 		    <scope>test</scope>
 		</dependency>
 		<dependency>
@@ -58,27 +70,20 @@
     </dependencies>
 
 	<build>
-		<sourceDirectory>src</sourceDirectory>
+		<sourceDirectory>src/main</sourceDirectory>
 		<resources>
 			<resource>
-				
+				<directory>${basedir}/src/resources</directory>
 			</resource>
 		</resources>
-		<testSourceDirectory>test/src</testSourceDirectory>
-		<testResources>
-			<testResource>
-				
-			</testResource>
-		</testResources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven.compiler.version}</version>
+				<version>3.14.0</version>
 				<configuration>
-					<source>${maven.compiler.source}</source>
-					<target>${maven.compiler.target}</target>
-					<!--<encoding>${project.build.sourceEncoding}</encoding>-->
+					<source>21</source>
+					<target>21</target>
 				</configuration>
 			</plugin>
 			<!-- Create the source bundle -->
@@ -99,7 +104,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M5</version>
+				<version>3.2.5</version>
 			</plugin>
 		    <plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -132,7 +137,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.3.0</version>
 				<configuration>
 					<show>public</show>
 				</configuration>
diff --git a/src/org/atriasoft/loader3d/Face.java b/src/main/org/atriasoft/loader3d/Face.java
similarity index 100%
rename from src/org/atriasoft/loader3d/Face.java
rename to src/main/org/atriasoft/loader3d/Face.java
diff --git a/src/org/atriasoft/loader3d/FaceIndexing.java b/src/main/org/atriasoft/loader3d/FaceIndexing.java
similarity index 100%
rename from src/org/atriasoft/loader3d/FaceIndexing.java
rename to src/main/org/atriasoft/loader3d/FaceIndexing.java
diff --git a/src/org/atriasoft/loader3d/Loader3d.java b/src/main/org/atriasoft/loader3d/Loader3d.java
similarity index 100%
rename from src/org/atriasoft/loader3d/Loader3d.java
rename to src/main/org/atriasoft/loader3d/Loader3d.java
diff --git a/src/org/atriasoft/loader3d/NormalMode.java b/src/main/org/atriasoft/loader3d/NormalMode.java
similarity index 100%
rename from src/org/atriasoft/loader3d/NormalMode.java
rename to src/main/org/atriasoft/loader3d/NormalMode.java
diff --git a/src/org/atriasoft/loader3d/OBJFileLoader.java b/src/main/org/atriasoft/loader3d/OBJFileLoader.java
similarity index 100%
rename from src/org/atriasoft/loader3d/OBJFileLoader.java
rename to src/main/org/atriasoft/loader3d/OBJFileLoader.java
diff --git a/src/org/atriasoft/loader3d/model/Material.java b/src/main/org/atriasoft/loader3d/model/Material.java
similarity index 100%
rename from src/org/atriasoft/loader3d/model/Material.java
rename to src/main/org/atriasoft/loader3d/model/Material.java
diff --git a/src/org/atriasoft/loader3d/model/MaterialBase.java b/src/main/org/atriasoft/loader3d/model/MaterialBase.java
similarity index 100%
rename from src/org/atriasoft/loader3d/model/MaterialBase.java
rename to src/main/org/atriasoft/loader3d/model/MaterialBase.java
diff --git a/src/org/atriasoft/loader3d/model/MaterialGlId.java b/src/main/org/atriasoft/loader3d/model/MaterialGlId.java
similarity index 100%
rename from src/org/atriasoft/loader3d/model/MaterialGlId.java
rename to src/main/org/atriasoft/loader3d/model/MaterialGlId.java
diff --git a/src/org/atriasoft/loader3d/model/ModelData.java b/src/main/org/atriasoft/loader3d/model/ModelData.java
similarity index 100%
rename from src/org/atriasoft/loader3d/model/ModelData.java
rename to src/main/org/atriasoft/loader3d/model/ModelData.java
diff --git a/src/org/atriasoft/loader3d/model/PhysicShape.java b/src/main/org/atriasoft/loader3d/model/PhysicShape.java
similarity index 100%
rename from src/org/atriasoft/loader3d/model/PhysicShape.java
rename to src/main/org/atriasoft/loader3d/model/PhysicShape.java
diff --git a/src/org/atriasoft/loader3d/model/Vertex.java b/src/main/org/atriasoft/loader3d/model/Vertex.java
similarity index 100%
rename from src/org/atriasoft/loader3d/model/Vertex.java
rename to src/main/org/atriasoft/loader3d/model/Vertex.java
diff --git a/src/org/atriasoft/loader3d/resources/ResourceListTexturedMesh.java b/src/main/org/atriasoft/loader3d/resources/ResourceListTexturedMesh.java
similarity index 100%
rename from src/org/atriasoft/loader3d/resources/ResourceListTexturedMesh.java
rename to src/main/org/atriasoft/loader3d/resources/ResourceListTexturedMesh.java
diff --git a/src/org/atriasoft/loader3d/resources/ResourceMesh.java b/src/main/org/atriasoft/loader3d/resources/ResourceMesh.java
similarity index 100%
rename from src/org/atriasoft/loader3d/resources/ResourceMesh.java
rename to src/main/org/atriasoft/loader3d/resources/ResourceMesh.java
diff --git a/src/org/atriasoft/loader3d/resources/ResourceMeshEmf.java b/src/main/org/atriasoft/loader3d/resources/ResourceMeshEmf.java
similarity index 100%
rename from src/org/atriasoft/loader3d/resources/ResourceMeshEmf.java
rename to src/main/org/atriasoft/loader3d/resources/ResourceMeshEmf.java
diff --git a/src/org/atriasoft/loader3d/resources/ResourceMeshHeightMap.java b/src/main/org/atriasoft/loader3d/resources/ResourceMeshHeightMap.java
similarity index 100%
rename from src/org/atriasoft/loader3d/resources/ResourceMeshHeightMap.java
rename to src/main/org/atriasoft/loader3d/resources/ResourceMeshHeightMap.java
diff --git a/src/org/atriasoft/loader3d/resources/ResourcePaletteFile.java b/src/main/org/atriasoft/loader3d/resources/ResourcePaletteFile.java
similarity index 100%
rename from src/org/atriasoft/loader3d/resources/ResourcePaletteFile.java
rename to src/main/org/atriasoft/loader3d/resources/ResourcePaletteFile.java
diff --git a/src/org/atriasoft/loader3d/resources/ResourceStaticColoredMesh.java b/src/main/org/atriasoft/loader3d/resources/ResourceStaticColoredMesh.java
similarity index 100%
rename from src/org/atriasoft/loader3d/resources/ResourceStaticColoredMesh.java
rename to src/main/org/atriasoft/loader3d/resources/ResourceStaticColoredMesh.java
diff --git a/src/org/atriasoft/loader3d/resources/ResourceStaticMesh.java b/src/main/org/atriasoft/loader3d/resources/ResourceStaticMesh.java
similarity index 100%
rename from src/org/atriasoft/loader3d/resources/ResourceStaticMesh.java
rename to src/main/org/atriasoft/loader3d/resources/ResourceStaticMesh.java
diff --git a/src/org/atriasoft/loader3d/resources/ResourceStaticMeshObj.java b/src/main/org/atriasoft/loader3d/resources/ResourceStaticMeshObj.java
similarity index 100%
rename from src/org/atriasoft/loader3d/resources/ResourceStaticMeshObj.java
rename to src/main/org/atriasoft/loader3d/resources/ResourceStaticMeshObj.java
diff --git a/src/org/atriasoft/loader3d/resources/ResourceStaticMeshObjDynamic.java b/src/main/org/atriasoft/loader3d/resources/ResourceStaticMeshObjDynamic.java
similarity index 100%
rename from src/org/atriasoft/loader3d/resources/ResourceStaticMeshObjDynamic.java
rename to src/main/org/atriasoft/loader3d/resources/ResourceStaticMeshObjDynamic.java
diff --git a/src/org/atriasoft/loader3d/resources/ResourceStaticTexturedMesh.java b/src/main/org/atriasoft/loader3d/resources/ResourceStaticTexturedMesh.java
similarity index 100%
rename from src/org/atriasoft/loader3d/resources/ResourceStaticTexturedMesh.java
rename to src/main/org/atriasoft/loader3d/resources/ResourceStaticTexturedMesh.java
diff --git a/src/module-info.java b/src/module-info.java
deleted file mode 100644
index dff9787..0000000
--- a/src/module-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-
-open module org.atriasoft.loader3d {
-
-	exports org.atriasoft.loader3d;
-	exports org.atriasoft.loader3d.model;
-	exports org.atriasoft.loader3d.resources;
-
-	requires transitive org.atriasoft.etk;
-	requires org.atriasoft.egami;
-	requires transitive org.atriasoft.gale;
-	requires org.atriasoft.ejson;
-}
\ No newline at end of file
diff --git a/test/src/test/atriasoft/loader3d/TestBasicLog.java b/test/src/test/atriasoft/loader3d/TestBasicLog.java
deleted file mode 100644
index 97b0291..0000000
--- a/test/src/test/atriasoft/loader3d/TestBasicLog.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * Contributors:
- *     Edouard DUPIN - initial API and implementation
- ******************************************************************************/
-package test.atriasoft.loader3d;
-
-import org.atriasoft.etk.Uri;
-import org.atriasoft.gale.Gale;
-import org.atriasoft.gale.context.GaleContextTest;
-import org.atriasoft.loader3d.resources.ResourceMeshHeightMap;
-import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
-
-@TestMethodOrder(OrderAnnotation.class)
-public class TestBasicLog {
-
-	@Test
-	@Order(1)
-	public void aaFirstInitialisation() {
-		Gale.init();
-		final GaleContextTest tmpContext = new GaleContextTest();
-		Uri.setGroup("EMF", "emf");
-		Uri.addLibrary("test", ResourceMeshHeightMap.class, "/resources");
-
-		//ResourceMeshEmf tmp = new ResourceMeshEmf(new Uri("EMF", "tree1.emf", "test"));
-		//ResourceMeshHeightMap tmp = new ResourceMeshHeightMap(new Uri("FILE", "/home/heero/dev/workspace-game/atriasoft/loader3d/out/eclipse/classes/resources/emf/tree1.emf"));
-
-	}
-
-}