From 580e8ff2af47001eb3e0947488395b48773be469 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 24 Jan 2022 05:45:39 +0100
Subject: [PATCH] Integrate UUID API

---
 dep/org.argeo.dep.cms.base/pom.xml                  | 10 +++++++++-
 org.argeo.api.acr/pom.xml                           |  7 +++++++
 org.argeo.api.cms/pom.xml                           |  7 +++++++
 org.argeo.api.uuid/bnd.bnd                          |  0
 org.argeo.api.uuid/pom.xml                          | 13 +++++++++++++
 .../src/org/argeo/api}/uuid/A2.java                 |  2 +-
 .../argeo/api}/uuid/AbstractAsyncUuidFactory.java   |  2 +-
 .../org/argeo/api}/uuid/AbstractUuidFactory.java    |  2 +-
 .../src/org/argeo/api}/uuid/AsyncUuidFactory.java   |  2 +-
 .../argeo/api}/uuid/ConcurrentTimeUuidState.java    |  2 +-
 .../src/org/argeo/api}/uuid/SimpleUuidFactory.java  |  2 +-
 .../src/org/argeo/api}/uuid/TimeUuidState.java      |  2 +-
 .../src/org/argeo/api}/uuid/UuidFactory.java        |  2 +-
 org.argeo.cms/pom.xml                               |  5 -----
 pom.xml                                             |  1 +
 15 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 org.argeo.api.uuid/bnd.bnd
 create mode 100644 org.argeo.api.uuid/pom.xml
 rename {org.argeo.api.acr/src/org/argeo/api/acr => org.argeo.api.uuid/src/org/argeo/api}/uuid/A2.java (91%)
 rename {org.argeo.api.acr/src/org/argeo/api/acr => org.argeo.api.uuid/src/org/argeo/api}/uuid/AbstractAsyncUuidFactory.java (99%)
 rename {org.argeo.api.acr/src/org/argeo/api/acr => org.argeo.api.uuid/src/org/argeo/api}/uuid/AbstractUuidFactory.java (99%)
 rename {org.argeo.api.acr/src/org/argeo/api/acr => org.argeo.api.uuid/src/org/argeo/api}/uuid/AsyncUuidFactory.java (97%)
 rename {org.argeo.api.acr/src/org/argeo/api/acr => org.argeo.api.uuid/src/org/argeo/api}/uuid/ConcurrentTimeUuidState.java (99%)
 rename {org.argeo.api.acr/src/org/argeo/api/acr => org.argeo.api.uuid/src/org/argeo/api}/uuid/SimpleUuidFactory.java (99%)
 rename {org.argeo.api.acr/src/org/argeo/api/acr => org.argeo.api.uuid/src/org/argeo/api}/uuid/TimeUuidState.java (96%)
 rename {org.argeo.api.acr/src/org/argeo/api/acr => org.argeo.api.uuid/src/org/argeo/api}/uuid/UuidFactory.java (99%)

diff --git a/dep/org.argeo.dep.cms.base/pom.xml b/dep/org.argeo.dep.cms.base/pom.xml
index 3a2af17f1..80ad7f793 100644
--- a/dep/org.argeo.dep.cms.base/pom.xml
+++ b/dep/org.argeo.dep.cms.base/pom.xml
@@ -13,7 +13,7 @@
 	<name>CMS Base</name>
 	<dependencies>
 
-		<!-- Argeo Commons -->
+		<!-- Base -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.init</artifactId>
@@ -25,6 +25,12 @@
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 
+		<!-- APIs -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.api.uuid</artifactId>
+			<version>2.3-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.api.acr</artifactId>
@@ -35,6 +41,8 @@
 			<artifactId>org.argeo.api.cms</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
+
+		<!-- CMS -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.cms.tp</artifactId>
diff --git a/org.argeo.api.acr/pom.xml b/org.argeo.api.acr/pom.xml
index bc2383831..dcb30e025 100644
--- a/org.argeo.api.acr/pom.xml
+++ b/org.argeo.api.acr/pom.xml
@@ -10,4 +10,11 @@
 	<artifactId>org.argeo.api.acr</artifactId>
 	<name>ACR API</name>
 	<packaging>jar</packaging>
+		<dependencies>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.api.uuid</artifactId>
+			<version>2.3-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.api.cms/pom.xml b/org.argeo.api.cms/pom.xml
index b1cfca0d3..6c0666140 100644
--- a/org.argeo.api.cms/pom.xml
+++ b/org.argeo.api.cms/pom.xml
@@ -12,4 +12,11 @@
 	<artifactId>org.argeo.api.cms</artifactId>
 	<name>CMS API</name>
 	<packaging>jar</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.api.acr</artifactId>
+			<version>2.3-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.api.uuid/bnd.bnd b/org.argeo.api.uuid/bnd.bnd
new file mode 100644
index 000000000..e69de29bb
diff --git a/org.argeo.api.uuid/pom.xml b/org.argeo.api.uuid/pom.xml
new file mode 100644
index 000000000..4db0ba67a
--- /dev/null
+++ b/org.argeo.api.uuid/pom.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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>
+	<parent>
+		<groupId>org.argeo.commons</groupId>
+		<artifactId>argeo-commons</artifactId>
+		<version>2.3-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.api.uuid</artifactId>
+	<name>UUID API</name>
+	<packaging>jar</packaging>
+</project>
\ No newline at end of file
diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/A2.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/A2.java
similarity index 91%
rename from org.argeo.api.acr/src/org/argeo/api/acr/uuid/A2.java
rename to org.argeo.api.uuid/src/org/argeo/api/uuid/A2.java
index 706edd160..e2d47278d 100644
--- a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/A2.java
+++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/A2.java
@@ -1,4 +1,4 @@
-package org.argeo.api.acr.uuid;
+package org.argeo.api.uuid;
 
 import java.io.Serializable;
 
diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/AbstractAsyncUuidFactory.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/AbstractAsyncUuidFactory.java
similarity index 99%
rename from org.argeo.api.acr/src/org/argeo/api/acr/uuid/AbstractAsyncUuidFactory.java
rename to org.argeo.api.uuid/src/org/argeo/api/uuid/AbstractAsyncUuidFactory.java
index 09becbaec..2cdb59f77 100644
--- a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/AbstractAsyncUuidFactory.java
+++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/AbstractAsyncUuidFactory.java
@@ -1,4 +1,4 @@
-package org.argeo.api.acr.uuid;
+package org.argeo.api.uuid;
 
 import java.security.SecureRandom;
 import java.util.UUID;
diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/AbstractUuidFactory.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/AbstractUuidFactory.java
similarity index 99%
rename from org.argeo.api.acr/src/org/argeo/api/acr/uuid/AbstractUuidFactory.java
rename to org.argeo.api.uuid/src/org/argeo/api/uuid/AbstractUuidFactory.java
index 1ecb64e12..ba2196add 100644
--- a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/AbstractUuidFactory.java
+++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/AbstractUuidFactory.java
@@ -1,4 +1,4 @@
-package org.argeo.api.acr.uuid;
+package org.argeo.api.uuid;
 
 import java.net.InetAddress;
 import java.net.NetworkInterface;
diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/AsyncUuidFactory.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/AsyncUuidFactory.java
similarity index 97%
rename from org.argeo.api.acr/src/org/argeo/api/acr/uuid/AsyncUuidFactory.java
rename to org.argeo.api.uuid/src/org/argeo/api/uuid/AsyncUuidFactory.java
index 97751a6b0..dd40f81e9 100644
--- a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/AsyncUuidFactory.java
+++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/AsyncUuidFactory.java
@@ -1,4 +1,4 @@
-package org.argeo.api.acr.uuid;
+package org.argeo.api.uuid;
 
 import java.util.UUID;
 import java.util.concurrent.CompletionStage;
diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/ConcurrentTimeUuidState.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/ConcurrentTimeUuidState.java
similarity index 99%
rename from org.argeo.api.acr/src/org/argeo/api/acr/uuid/ConcurrentTimeUuidState.java
rename to org.argeo.api.uuid/src/org/argeo/api/uuid/ConcurrentTimeUuidState.java
index db72a4b21..9a414e8fa 100644
--- a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/ConcurrentTimeUuidState.java
+++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/ConcurrentTimeUuidState.java
@@ -1,4 +1,4 @@
-package org.argeo.api.acr.uuid;
+package org.argeo.api.uuid;
 
 import java.security.SecureRandom;
 import java.time.Clock;
diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/SimpleUuidFactory.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/SimpleUuidFactory.java
similarity index 99%
rename from org.argeo.api.acr/src/org/argeo/api/acr/uuid/SimpleUuidFactory.java
rename to org.argeo.api.uuid/src/org/argeo/api/uuid/SimpleUuidFactory.java
index cffd446bd..71f8a134c 100644
--- a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/SimpleUuidFactory.java
+++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/SimpleUuidFactory.java
@@ -1,4 +1,4 @@
-package org.argeo.api.acr.uuid;
+package org.argeo.api.uuid;
 
 import static java.lang.System.Logger.Level.DEBUG;
 import static java.lang.System.Logger.Level.WARNING;
diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/TimeUuidState.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/TimeUuidState.java
similarity index 96%
rename from org.argeo.api.acr/src/org/argeo/api/acr/uuid/TimeUuidState.java
rename to org.argeo.api.uuid/src/org/argeo/api/uuid/TimeUuidState.java
index 74e6b6980..4c9eec5a6 100644
--- a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/TimeUuidState.java
+++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/TimeUuidState.java
@@ -1,4 +1,4 @@
-package org.argeo.api.acr.uuid;
+package org.argeo.api.uuid;
 
 import java.time.Instant;
 import java.time.ZoneOffset;
diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/UuidFactory.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/UuidFactory.java
similarity index 99%
rename from org.argeo.api.acr/src/org/argeo/api/acr/uuid/UuidFactory.java
rename to org.argeo.api.uuid/src/org/argeo/api/uuid/UuidFactory.java
index 94e5158df..a29706184 100644
--- a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/UuidFactory.java
+++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/UuidFactory.java
@@ -1,4 +1,4 @@
-package org.argeo.api.acr.uuid;
+package org.argeo.api.uuid;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml
index 38112fc3b..4b06b0132 100644
--- a/org.argeo.cms/pom.xml
+++ b/org.argeo.cms/pom.xml
@@ -16,11 +16,6 @@
 			<artifactId>org.argeo.api.cms</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.api.acr</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.util</artifactId>
diff --git a/pom.xml b/pom.xml
index c0edf6c4d..0a265cf64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
 		<module>org.argeo.init</module>
 		<module>org.argeo.util</module>
 		<!-- API -->
+		<module>org.argeo.api.uuid</module>
 		<module>org.argeo.api.acr</module>
 		<module>org.argeo.api.cms</module>
 		<!-- CMS -->
-- 
2.30.2