split out messaging to a different submodule

trex-paxos · Dec 27, 2024 · 9aa79f6 · 9aa79f6
1 parent 8af5ba1
commit 9aa79f6
Show file tree

Hide file tree

Showing 7 changed files with 103 additions and 65 deletions.
diff --git a/nodes.txt b/nodes.txt
@@ -1,9 +1,9 @@
-# run ust one test
-mvn test -Dtest=TrexLockLocalTests -pl trex-locks
-
 # fast tests
 mvn -DNO_LOGGING=true -B package
 
+# run ust one test
+mvn test -Dtest=TrexLockLocalTests -pl trex-locks
+
 # jshell
 
 jshell --enable-preview --class-path ./trex-locks/target/classes:./trex-locks/target/test-classes:./trex2-lib/target/classes:./trex2-lib/target/test-classes

diff --git a/pom.xml b/pom.xml
@@ -1,59 +1,58 @@
-<?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 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.github.trex-paxos</groupId>
-    <artifactId>trex</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>trex</name>
-    <url>https://github.com/trex-paxos/trex-paxos-jvm</url>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.release>23</maven.compiler.release>
-    </properties>
-    <description>This is an implementation of the Paxos Logarithm as written in Paxos Made Simple by Leslie Lamport
+<?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 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.github.trex-paxos</groupId>
+  <artifactId>trex</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>trex</name>
+  <url>https://github.com/trex-paxos/trex-paxos-jvm</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <maven.compiler.release>23</maven.compiler.release>
+  </properties>
+  <description>This is an implementation of the Paxos Logarithm as written in Paxos Made Simple by Leslie Lamport
     </description>
-    <modules>
-        <module>trex-lib</module>
-        <module>trex-locks</module>
-    </modules>
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>5.11.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>3.26.3</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
-                <configuration>
-                    <compilerArgs>
-                        <arg>-Werror</arg>
-                        <arg>--enable-preview</arg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.5</version>
-                <configuration>
-                    <argLine>--enable-preview</argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <modules>
+    <module>trex-lib</module>
+    <module>trex-locks</module>
+    <module>trex-paxe</module>
+  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.11.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.26.3</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.13.0</version>
+        <configuration>
+          <compilerArgs>
+            <arg>-Werror</arg>
+            <arg>--enable-preview</arg>
+          </compilerArgs>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.2.5</version>
+        <configuration>
+          <argLine>--enable-preview</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/trex-lib/pom.xml b/trex-lib/pom.xml
@@ -9,7 +9,7 @@
     <url>https://github.com/trex-paxos/trex-paxos-jvm</url>
     <parent>
         <groupId>com.github.trex-paxos</groupId>
-        <artifactId>trex2</artifactId>
+        <artifactId>trex</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

diff --git a/trex-locks/pom.xml b/trex-locks/pom.xml
@@ -14,7 +14,7 @@
     </description>
     <parent>
         <groupId>com.github.trex-paxos</groupId>
-        <artifactId>trex2</artifactId>
+        <artifactId>trex</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -33,7 +33,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.trex-paxos</groupId>
-            <artifactId>trex2-lib</artifactId>
+            <artifactId>trex-lib</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

diff --git a/trex-paxe/pom.xml b/trex-paxe/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.github.trex-paxos</groupId>
+    <artifactId>trex</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <groupId>com.github.trex_paxos.paxe</groupId>
+  <artifactId>trex-paxe</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>trex-paxe</name>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>com.github.trex-paxos</groupId>
+      <artifactId>trex-lib</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.11.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.26.3</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/...ava/com/github/trex_paxos/PicklePAXE.java → ...om/github/trex_paxos/paxe/PicklePAXE.java b/...ava/com/github/trex_paxos/PicklePAXE.java → ...om/github/trex_paxos/paxe/PicklePAXE.java
@@ -1,7 +1,9 @@
-package com.github.trex_paxos;
+package com.github.trex_paxos.paxe;
 
 import com.github.trex_paxos.msg.*;
 
+import com.github.trex_paxos.*;
+
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;

diff --git a/...va/com/github/trex_paxos/PickleTests.java → ...m/github/trex_paxos/paxe/PickleTests.java b/...va/com/github/trex_paxos/PickleTests.java → ...m/github/trex_paxos/paxe/PickleTests.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.github.trex_paxos;
+package com.github.trex_paxos.paxe;
 
 import com.github.trex_paxos.msg.*;
+import com.github.trex_paxos.*;
 import org.junit.jupiter.api.Test;
 
 import java.io.*;