From eb9d140028ee071464bd50bc5d5ce471e9e8bd6c Mon Sep 17 00:00:00 2001
From: Willem <willemtsade.git.5785@distributedrebirth.love>
Date: Wed, 15 Jan 2025 14:40:03 +0100
Subject: [PATCH] Moved x4o-meta back into x4o-driver

---
 .../xml/lang/meta/ELIDAttributeHandler.java   |  0
 .../x4o/xml/lang/meta/ELReferenceElement.java |  0
 .../lang/meta/MetaLanguageSiblingLoader.java  |  0
 .../org/x4o/xml/lang/meta/MethodElement.java  |  0
 .../xml/lang/meta/ParentObjectElement.java    |  0
 .../x4o/xml/lang/meta/PropertyElement.java    |  0
 .../org/x4o/xml/lang/meta/package-info.java   |  0
 .../resources/META-INF/meta/meta-lang.eld     |  0
 .../resources/META-INF/meta/meta-modules.xml  |  0
 .../org/x4o/xml/lang/meta/MTestDriver.java    |  0
 .../x4o/xml/lang/meta/ParentObjectTest.java   |  0
 .../x4o/xml/lang/meta/ReferenceStoreTest.java |  0
 .../resources/META-INF/mtest/mtest-lang.eld   |  0
 .../META-INF/mtest/mtest-modules.xml          |  0
 .../template/test-meta-template-bean.xml      |  0
 .../template/test-meta-template-parent.xml    |  0
 .../resources/junit/test-meta-generic.xml     |  0
 .../junit/test-meta-parent-element.xml        |  0
 .../resources/junit/test-meta-reference.xml   |  0
 nx01-x4o-meta/pom.xml                         | 21 -------------------
 pom.xml                                       |  6 ------
 21 files changed, 27 deletions(-)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/main/java/org/x4o/xml/lang/meta/ELIDAttributeHandler.java (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/main/java/org/x4o/xml/lang/meta/ELReferenceElement.java (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/main/java/org/x4o/xml/lang/meta/MetaLanguageSiblingLoader.java (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/main/java/org/x4o/xml/lang/meta/MethodElement.java (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/main/java/org/x4o/xml/lang/meta/ParentObjectElement.java (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/main/java/org/x4o/xml/lang/meta/PropertyElement.java (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/main/java/org/x4o/xml/lang/meta/package-info.java (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/main/resources/META-INF/meta/meta-lang.eld (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/main/resources/META-INF/meta/meta-modules.xml (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/test/java/org/x4o/xml/lang/meta/MTestDriver.java (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/test/java/org/x4o/xml/lang/meta/ParentObjectTest.java (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/test/java/org/x4o/xml/lang/meta/ReferenceStoreTest.java (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/test/resources/META-INF/mtest/mtest-lang.eld (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/test/resources/META-INF/mtest/mtest-modules.xml (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/test/resources/junit/template/test-meta-template-bean.xml (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/test/resources/junit/template/test-meta-template-parent.xml (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/test/resources/junit/test-meta-generic.xml (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/test/resources/junit/test-meta-parent-element.xml (100%)
 rename {nx01-x4o-meta => nx01-x4o-driver}/src/test/resources/junit/test-meta-reference.xml (100%)
 delete mode 100644 nx01-x4o-meta/pom.xml

diff --git a/nx01-x4o-meta/src/main/java/org/x4o/xml/lang/meta/ELIDAttributeHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELIDAttributeHandler.java
similarity index 100%
rename from nx01-x4o-meta/src/main/java/org/x4o/xml/lang/meta/ELIDAttributeHandler.java
rename to nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELIDAttributeHandler.java
diff --git a/nx01-x4o-meta/src/main/java/org/x4o/xml/lang/meta/ELReferenceElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELReferenceElement.java
similarity index 100%
rename from nx01-x4o-meta/src/main/java/org/x4o/xml/lang/meta/ELReferenceElement.java
rename to nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELReferenceElement.java
diff --git a/nx01-x4o-meta/src/main/java/org/x4o/xml/lang/meta/MetaLanguageSiblingLoader.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/MetaLanguageSiblingLoader.java
similarity index 100%
rename from nx01-x4o-meta/src/main/java/org/x4o/xml/lang/meta/MetaLanguageSiblingLoader.java
rename to nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/MetaLanguageSiblingLoader.java
diff --git a/nx01-x4o-meta/src/main/java/org/x4o/xml/lang/meta/MethodElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/MethodElement.java
similarity index 100%
rename from nx01-x4o-meta/src/main/java/org/x4o/xml/lang/meta/MethodElement.java
rename to nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/MethodElement.java
diff --git a/nx01-x4o-meta/src/main/java/org/x4o/xml/lang/meta/ParentObjectElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ParentObjectElement.java
similarity index 100%
rename from nx01-x4o-meta/src/main/java/org/x4o/xml/lang/meta/ParentObjectElement.java
rename to nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ParentObjectElement.java
diff --git a/nx01-x4o-meta/src/main/java/org/x4o/xml/lang/meta/PropertyElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/PropertyElement.java
similarity index 100%
rename from nx01-x4o-meta/src/main/java/org/x4o/xml/lang/meta/PropertyElement.java
rename to nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/PropertyElement.java
diff --git a/nx01-x4o-meta/src/main/java/org/x4o/xml/lang/meta/package-info.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/package-info.java
similarity index 100%
rename from nx01-x4o-meta/src/main/java/org/x4o/xml/lang/meta/package-info.java
rename to nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/package-info.java
diff --git a/nx01-x4o-meta/src/main/resources/META-INF/meta/meta-lang.eld b/nx01-x4o-driver/src/main/resources/META-INF/meta/meta-lang.eld
similarity index 100%
rename from nx01-x4o-meta/src/main/resources/META-INF/meta/meta-lang.eld
rename to nx01-x4o-driver/src/main/resources/META-INF/meta/meta-lang.eld
diff --git a/nx01-x4o-meta/src/main/resources/META-INF/meta/meta-modules.xml b/nx01-x4o-driver/src/main/resources/META-INF/meta/meta-modules.xml
similarity index 100%
rename from nx01-x4o-meta/src/main/resources/META-INF/meta/meta-modules.xml
rename to nx01-x4o-driver/src/main/resources/META-INF/meta/meta-modules.xml
diff --git a/nx01-x4o-meta/src/test/java/org/x4o/xml/lang/meta/MTestDriver.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/MTestDriver.java
similarity index 100%
rename from nx01-x4o-meta/src/test/java/org/x4o/xml/lang/meta/MTestDriver.java
rename to nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/MTestDriver.java
diff --git a/nx01-x4o-meta/src/test/java/org/x4o/xml/lang/meta/ParentObjectTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/ParentObjectTest.java
similarity index 100%
rename from nx01-x4o-meta/src/test/java/org/x4o/xml/lang/meta/ParentObjectTest.java
rename to nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/ParentObjectTest.java
diff --git a/nx01-x4o-meta/src/test/java/org/x4o/xml/lang/meta/ReferenceStoreTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/ReferenceStoreTest.java
similarity index 100%
rename from nx01-x4o-meta/src/test/java/org/x4o/xml/lang/meta/ReferenceStoreTest.java
rename to nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/ReferenceStoreTest.java
diff --git a/nx01-x4o-meta/src/test/resources/META-INF/mtest/mtest-lang.eld b/nx01-x4o-driver/src/test/resources/META-INF/mtest/mtest-lang.eld
similarity index 100%
rename from nx01-x4o-meta/src/test/resources/META-INF/mtest/mtest-lang.eld
rename to nx01-x4o-driver/src/test/resources/META-INF/mtest/mtest-lang.eld
diff --git a/nx01-x4o-meta/src/test/resources/META-INF/mtest/mtest-modules.xml b/nx01-x4o-driver/src/test/resources/META-INF/mtest/mtest-modules.xml
similarity index 100%
rename from nx01-x4o-meta/src/test/resources/META-INF/mtest/mtest-modules.xml
rename to nx01-x4o-driver/src/test/resources/META-INF/mtest/mtest-modules.xml
diff --git a/nx01-x4o-meta/src/test/resources/junit/template/test-meta-template-bean.xml b/nx01-x4o-driver/src/test/resources/junit/template/test-meta-template-bean.xml
similarity index 100%
rename from nx01-x4o-meta/src/test/resources/junit/template/test-meta-template-bean.xml
rename to nx01-x4o-driver/src/test/resources/junit/template/test-meta-template-bean.xml
diff --git a/nx01-x4o-meta/src/test/resources/junit/template/test-meta-template-parent.xml b/nx01-x4o-driver/src/test/resources/junit/template/test-meta-template-parent.xml
similarity index 100%
rename from nx01-x4o-meta/src/test/resources/junit/template/test-meta-template-parent.xml
rename to nx01-x4o-driver/src/test/resources/junit/template/test-meta-template-parent.xml
diff --git a/nx01-x4o-meta/src/test/resources/junit/test-meta-generic.xml b/nx01-x4o-driver/src/test/resources/junit/test-meta-generic.xml
similarity index 100%
rename from nx01-x4o-meta/src/test/resources/junit/test-meta-generic.xml
rename to nx01-x4o-driver/src/test/resources/junit/test-meta-generic.xml
diff --git a/nx01-x4o-meta/src/test/resources/junit/test-meta-parent-element.xml b/nx01-x4o-driver/src/test/resources/junit/test-meta-parent-element.xml
similarity index 100%
rename from nx01-x4o-meta/src/test/resources/junit/test-meta-parent-element.xml
rename to nx01-x4o-driver/src/test/resources/junit/test-meta-parent-element.xml
diff --git a/nx01-x4o-meta/src/test/resources/junit/test-meta-reference.xml b/nx01-x4o-driver/src/test/resources/junit/test-meta-reference.xml
similarity index 100%
rename from nx01-x4o-meta/src/test/resources/junit/test-meta-reference.xml
rename to nx01-x4o-driver/src/test/resources/junit/test-meta-reference.xml
diff --git a/nx01-x4o-meta/pom.xml b/nx01-x4o-meta/pom.xml
deleted file mode 100644
index 0ba8d42..0000000
--- a/nx01-x4o-meta/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<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>
-	<parent>
-		<groupId>love.distributedrebirth.nx01</groupId>
-		<artifactId>nx01</artifactId>
-		<version>〇一。壬寅。一〄-SNAPSHOT</version>
-	</parent>
-	<artifactId>nx01-x4o-meta</artifactId>
-	<dependencies>
-		<dependency>
-			<groupId>love.distributedrebirth.nx01</groupId>
-			<artifactId>nx01-x4o-driver</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f8069af..5040383 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,6 @@
 		<module>nx01-warp-manifestor</module>
 		<module>nx01-x4o-driver</module>
 		<module>nx01-x4o-fc18</module>
-		<module>nx01-x4o-meta</module>
 		<module>nx01-x4o-o2o</module>
 		<module>nx01-x4o-tool-ant-plugin</module>
 		<module>nx01-x4o-tool-maven-plugin</module>
@@ -389,11 +388,6 @@
 				<artifactId>nx01-x4o-fc18</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>love.distributedrebirth.nx01</groupId>
-				<artifactId>nx01-x4o-meta</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>love.distributedrebirth.nx01</groupId>
 				<artifactId>nx01-x4o-o2o</artifactId>