From 9f729eeb8255a9d800ad2506735dda8cc215a135 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 5 Jan 2022 07:47:53 +0100
Subject: [PATCH] Rename enterprise into util

---
 demo/pom.xml                                  | 72 -------------------
 dep/org.argeo.dep.cms.minimal/pom.xml         |  2 +-
 .../assembly/osgi-boot.xml                    |  0
 dist/{osgi-boot => argeo-init}/base/bin/a2sh  |  0
 dist/{osgi-boot => argeo-init}/pom.xml        |  8 +--
 .../rpm/usr/bin/a2sh                          |  0
 .../rpm/usr/share/osgi/boot/framework.args    |  0
 dist/argeo-node/pom.xml                       |  2 +-
 dist/pom.xml                                  |  2 +-
 org.argeo.api/pom.xml                         |  2 +-
 org.argeo.cms/pom.xml                         |  2 +-
 .../.classpath                                |  0
 .../.project                                  |  2 +-
 .../META-INF/.gitignore                       |  0
 .../bnd.bnd                                   |  0
 .../build.properties                          |  0
 .../pom.xml                                   |  4 +-
 .../src/org/argeo/ident/IdentClient.java      |  0
 .../src/org/argeo/ident/OpenSslDecryptor.java |  0
 .../src/org/argeo/ident/package-info.java     |  0
 .../argeo/naming/AttributesDictionary.java    |  0
 .../src/org/argeo/naming/AuthPassword.java    |  0
 .../src/org/argeo/naming/Distinguished.java   |  0
 .../src/org/argeo/naming/DnsBrowser.java      |  0
 .../src/org/argeo/naming/LdapAttrs.csv        |  0
 .../src/org/argeo/naming/LdapAttrs.java       |  0
 .../src/org/argeo/naming/LdapObjs.csv         |  0
 .../src/org/argeo/naming/LdapObjs.java        |  0
 .../src/org/argeo/naming/LdifParser.java      |  0
 .../src/org/argeo/naming/LdifWriter.java      |  0
 .../src/org/argeo/naming/NamingUtils.java     |  0
 .../src/org/argeo/naming/SharedSecret.java    |  0
 .../src/org/argeo/naming/SpecifiedName.java   |  0
 .../src/org/argeo/naming/SrvRecord.java       |  0
 .../src/org/argeo/naming/package-info.java    |  0
 .../osgi/internal/EnterpriseActivator.java    |  0
 .../src/org/argeo/osgi/metatype/EnumAD.java   |  0
 .../src/org/argeo/osgi/metatype/EnumOCD.java  |  0
 .../org/argeo/osgi/metatype/package-info.java |  0
 .../SimpleProvisioningService.java            |  0
 .../argeo/osgi/provisioning/package-info.java |  0
 .../osgi/transaction/JtaStatusAdapter.java    |  0
 .../transaction/SimpleRollbackException.java  |  0
 .../osgi/transaction/SimpleTransaction.java   |  0
 .../transaction/SimpleTransactionManager.java |  0
 .../transaction/TransactionStatusAdapter.java |  0
 .../org/argeo/osgi/transaction/UuidXid.java   |  0
 .../argeo/osgi/transaction/WorkContext.java   |  0
 .../argeo/osgi/transaction/WorkControl.java   |  0
 .../osgi/transaction/WorkTransaction.java     |  0
 .../argeo/osgi/transaction/package-info.java  |  0
 .../osgi/useradmin/AbstractUserDirectory.java |  0
 .../useradmin/AggregatingAuthorization.java   |  0
 .../osgi/useradmin/AggregatingUserAdmin.java  |  0
 .../osgi/useradmin/AuthenticatingUser.java    |  0
 .../org/argeo/osgi/useradmin/DigestUtils.java |  0
 .../argeo/osgi/useradmin/DirectoryGroup.java  |  0
 .../argeo/osgi/useradmin/DirectoryUser.java   |  0
 .../org/argeo/osgi/useradmin/IpaUtils.java    |  0
 .../argeo/osgi/useradmin/LdapConnection.java  |  0
 .../argeo/osgi/useradmin/LdapUserAdmin.java   |  0
 .../osgi/useradmin/LdifAuthorization.java     |  0
 .../org/argeo/osgi/useradmin/LdifGroup.java   |  0
 .../org/argeo/osgi/useradmin/LdifUser.java    |  0
 .../argeo/osgi/useradmin/LdifUserAdmin.java   |  0
 .../argeo/osgi/useradmin/OsUserDirectory.java |  0
 .../org/argeo/osgi/useradmin/OsUserUtils.java |  0
 .../org/argeo/osgi/useradmin/TokenUtils.java  |  0
 .../argeo/osgi/useradmin/UserAdminConf.java   |  0
 .../argeo/osgi/useradmin/UserDirectory.java   |  0
 .../useradmin/UserDirectoryException.java     |  0
 .../useradmin/UserDirectoryWorkingCopy.java   |  0
 .../argeo/osgi/useradmin/WcXaResource.java    |  0
 .../src/org/argeo/osgi/useradmin/jaas-os.cfg  |  0
 .../argeo/osgi/useradmin/package-info.java    |  0
 .../argeo/osgi/util/FilterRequirement.java    |  0
 .../osgi/util/OnServiceRegistration.java      |  0
 .../src/org/argeo/osgi/util/OsgiRegister.java |  0
 .../src/org/argeo/util/CsvParser.java         |  0
 .../argeo/util/CsvParserWithLinesAsMap.java   |  0
 .../src/org/argeo/util/CsvWriter.java         |  0
 .../src/org/argeo/util/DictionaryKeys.java    |  0
 .../src/org/argeo/util/DigestUtils.java       |  0
 .../src/org/argeo/util/DirH.java              |  0
 .../src/org/argeo/util/LangUtils.java         |  0
 .../src/org/argeo/util/OS.java                |  0
 .../org/argeo/util/PasswordEncryption.java    |  0
 .../src/org/argeo/util/ServiceChannel.java    |  0
 .../src/org/argeo/util/StreamUtils.java       |  0
 .../src/org/argeo/util/Tester.java            |  0
 .../src/org/argeo/util/TesterStatus.java      |  0
 .../src/org/argeo/util/Throughput.java        |  0
 .../src/org/argeo/util/UuidUtils.java         |  0
 .../src/org/argeo/util/package-info.java      |  0
 .../org/argeo/util/register/Component.java    |  0
 .../src/org/argeo/util/register/Register.java |  0
 .../org/argeo/util/register/Singleton.java    |  0
 .../argeo/util/register/StaticRegister.java   |  0
 pom.xml                                       |  3 +-
 99 files changed, 13 insertions(+), 86 deletions(-)
 delete mode 100644 demo/pom.xml
 rename dist/{osgi-boot => argeo-init}/assembly/osgi-boot.xml (100%)
 rename dist/{osgi-boot => argeo-init}/base/bin/a2sh (100%)
 rename dist/{osgi-boot => argeo-init}/pom.xml (95%)
 rename dist/{osgi-boot => argeo-init}/rpm/usr/bin/a2sh (100%)
 rename dist/{osgi-boot => argeo-init}/rpm/usr/share/osgi/boot/framework.args (100%)
 rename {org.argeo.enterprise => org.argeo.util}/.classpath (100%)
 rename {org.argeo.enterprise => org.argeo.util}/.project (94%)
 rename {org.argeo.enterprise => org.argeo.util}/META-INF/.gitignore (100%)
 rename {org.argeo.enterprise => org.argeo.util}/bnd.bnd (100%)
 rename {org.argeo.enterprise => org.argeo.util}/build.properties (100%)
 rename {org.argeo.enterprise => org.argeo.util}/pom.xml (83%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/ident/IdentClient.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/ident/OpenSslDecryptor.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/ident/package-info.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/naming/AttributesDictionary.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/naming/AuthPassword.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/naming/Distinguished.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/naming/DnsBrowser.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/naming/LdapAttrs.csv (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/naming/LdapAttrs.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/naming/LdapObjs.csv (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/naming/LdapObjs.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/naming/LdifParser.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/naming/LdifWriter.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/naming/NamingUtils.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/naming/SharedSecret.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/naming/SpecifiedName.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/naming/SrvRecord.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/naming/package-info.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/internal/EnterpriseActivator.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/metatype/EnumAD.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/metatype/EnumOCD.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/metatype/package-info.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/provisioning/SimpleProvisioningService.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/provisioning/package-info.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/transaction/JtaStatusAdapter.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/transaction/SimpleRollbackException.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/transaction/SimpleTransaction.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/transaction/SimpleTransactionManager.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/transaction/TransactionStatusAdapter.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/transaction/UuidXid.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/transaction/WorkContext.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/transaction/WorkControl.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/transaction/WorkTransaction.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/transaction/package-info.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/AggregatingAuthorization.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/AuthenticatingUser.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/DigestUtils.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/DirectoryGroup.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/DirectoryUser.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/IpaUtils.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/LdapConnection.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/LdapUserAdmin.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/LdifAuthorization.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/LdifGroup.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/LdifUser.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/LdifUserAdmin.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/OsUserDirectory.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/OsUserUtils.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/TokenUtils.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/UserAdminConf.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/UserDirectory.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/UserDirectoryException.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/UserDirectoryWorkingCopy.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/WcXaResource.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/jaas-os.cfg (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/useradmin/package-info.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/util/FilterRequirement.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/util/OnServiceRegistration.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/osgi/util/OsgiRegister.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/CsvParser.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/CsvParserWithLinesAsMap.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/CsvWriter.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/DictionaryKeys.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/DigestUtils.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/DirH.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/LangUtils.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/OS.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/PasswordEncryption.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/ServiceChannel.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/StreamUtils.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/Tester.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/TesterStatus.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/Throughput.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/UuidUtils.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/package-info.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/register/Component.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/register/Register.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/register/Singleton.java (100%)
 rename {org.argeo.enterprise => org.argeo.util}/src/org/argeo/util/register/StaticRegister.java (100%)

diff --git a/demo/pom.xml b/demo/pom.xml
deleted file mode 100644
index f152523a1..000000000
--- a/demo/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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>
-	<parent>
-		<groupId>org.argeo.commons</groupId>
-		<artifactId>argeo-commons</artifactId>
-		<version>2.3-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>demo</artifactId>
-	<name>Commons Demo</name>
-	<packaging>pom</packaging>
-	<build>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.argeo.tp.equinox</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>2.3-SNAPSHOT</version>
-		</dependency>
-	</dependencies>
-	<profiles>
-		<profile>
-			<id>argeo_node_rap</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.argeo.maven.plugins</groupId>
-						<artifactId>argeo-osgi-plugin</artifactId>
-						<configuration>
-							<systemPropertiesFile>argeo_node_rap.properties</systemPropertiesFile>
-							<execDir>exec/argeo_node_rap</execDir>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-			<dependencies>
-				<dependency>
-					<groupId>org.argeo.commons</groupId>
-					<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
-					<version>2.3-SNAPSHOT</version>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>cms-e4-rap</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.argeo.maven.plugins</groupId>
-						<artifactId>argeo-osgi-plugin</artifactId>
-						<configuration>
-							<systemPropertiesFile>cms-e4-rap.properties</systemPropertiesFile>
-							<execDir>exec/cms-e4-rap</execDir>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-			<dependencies>
-				<dependency>
-					<groupId>org.argeo.commons</groupId>
-					<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
-					<version>2.3-SNAPSHOT</version>
-				</dependency>
-			</dependencies>
-		</profile>
-	</profiles>
-</project>
\ No newline at end of file
diff --git a/dep/org.argeo.dep.cms.minimal/pom.xml b/dep/org.argeo.dep.cms.minimal/pom.xml
index 1594c0a24..9042eabab 100644
--- a/dep/org.argeo.dep.cms.minimal/pom.xml
+++ b/dep/org.argeo.dep.cms.minimal/pom.xml
@@ -21,7 +21,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.enterprise</artifactId>
+			<artifactId>org.argeo.util</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<!-- <dependency> -->
diff --git a/dist/osgi-boot/assembly/osgi-boot.xml b/dist/argeo-init/assembly/osgi-boot.xml
similarity index 100%
rename from dist/osgi-boot/assembly/osgi-boot.xml
rename to dist/argeo-init/assembly/osgi-boot.xml
diff --git a/dist/osgi-boot/base/bin/a2sh b/dist/argeo-init/base/bin/a2sh
similarity index 100%
rename from dist/osgi-boot/base/bin/a2sh
rename to dist/argeo-init/base/bin/a2sh
diff --git a/dist/osgi-boot/pom.xml b/dist/argeo-init/pom.xml
similarity index 95%
rename from dist/osgi-boot/pom.xml
rename to dist/argeo-init/pom.xml
index 021710088..39f3dd3ed 100644
--- a/dist/osgi-boot/pom.xml
+++ b/dist/argeo-init/pom.xml
@@ -22,7 +22,7 @@
 		<!-- OSGi Boot (and Equinox) -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.osgi.boot</artifactId>
+			<artifactId>org.argeo.init</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
@@ -69,7 +69,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-osgi-boot${argeo.rpm.suffix}</name>
+									<name>argeo-init${argeo.rpm.suffix}</name>
 									<mappings>
 										<mapping>
 											<directory>/usr/bin</directory>
@@ -117,7 +117,7 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-osgi-boot-equinox${argeo.rpm.suffix}</require>
+										<require>argeo-init-tp-equinox${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -141,7 +141,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-osgi-boot-equinox${argeo.rpm.suffix}</name>
+									<name>argeo-init-tp-equinox${argeo.rpm.suffix}</name>
 									<projversion>${version.argeo-tp}</projversion>
 									<release>${argeo.rpm.release.tp}</release>
 									<mappings>
diff --git a/dist/osgi-boot/rpm/usr/bin/a2sh b/dist/argeo-init/rpm/usr/bin/a2sh
similarity index 100%
rename from dist/osgi-boot/rpm/usr/bin/a2sh
rename to dist/argeo-init/rpm/usr/bin/a2sh
diff --git a/dist/osgi-boot/rpm/usr/share/osgi/boot/framework.args b/dist/argeo-init/rpm/usr/share/osgi/boot/framework.args
similarity index 100%
rename from dist/osgi-boot/rpm/usr/share/osgi/boot/framework.args
rename to dist/argeo-init/rpm/usr/share/osgi/boot/framework.args
diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml
index c066a6481..e1c8b2163 100644
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -183,7 +183,7 @@
 									</mappings>
 									<requires>
 										<require>argeo-cms-node${argeo.rpm.suffix}</require>
-										<require>argeo-osgi-boot${argeo.rpm.suffix}</require>
+										<require>argeo-init${argeo.rpm.suffix}</require>
 										<!-- do not explicitely require java -->
 									</requires>
 								</configuration>
diff --git a/dist/pom.xml b/dist/pom.xml
index 5ed36895c..65b186ab6 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -11,7 +11,7 @@
 	<name>Commons Deployable Distributions</name>
 	<packaging>pom</packaging>
 	<modules>
-		<module>osgi-boot</module>
+		<module>argeo-init</module>
 		<!-- <module>argeo-cli</module> -->
 		<module>argeo-node</module>
 	</modules>
diff --git a/org.argeo.api/pom.xml b/org.argeo.api/pom.xml
index e8b2b78fd..82ad85552 100644
--- a/org.argeo.api/pom.xml
+++ b/org.argeo.api/pom.xml
@@ -8,7 +8,7 @@
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.api</artifactId>
-	<name>CMS API</name>
+	<name>CMS APIs</name>
 	<packaging>jar</packaging>
 	<dependencies>
 	</dependencies>
diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml
index d30d45e2e..237af520b 100644
--- a/org.argeo.cms/pom.xml
+++ b/org.argeo.cms/pom.xml
@@ -18,7 +18,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.enterprise</artifactId>
+			<artifactId>org.argeo.util</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
 <!-- 		<dependency> -->
diff --git a/org.argeo.enterprise/.classpath b/org.argeo.util/.classpath
similarity index 100%
rename from org.argeo.enterprise/.classpath
rename to org.argeo.util/.classpath
diff --git a/org.argeo.enterprise/.project b/org.argeo.util/.project
similarity index 94%
rename from org.argeo.enterprise/.project
rename to org.argeo.util/.project
index 5de2f0acf..171ff88dc 100644
--- a/org.argeo.enterprise/.project
+++ b/org.argeo.util/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.argeo.enterprise</name>
+	<name>org.argeo.util</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.argeo.enterprise/META-INF/.gitignore b/org.argeo.util/META-INF/.gitignore
similarity index 100%
rename from org.argeo.enterprise/META-INF/.gitignore
rename to org.argeo.util/META-INF/.gitignore
diff --git a/org.argeo.enterprise/bnd.bnd b/org.argeo.util/bnd.bnd
similarity index 100%
rename from org.argeo.enterprise/bnd.bnd
rename to org.argeo.util/bnd.bnd
diff --git a/org.argeo.enterprise/build.properties b/org.argeo.util/build.properties
similarity index 100%
rename from org.argeo.enterprise/build.properties
rename to org.argeo.util/build.properties
diff --git a/org.argeo.enterprise/pom.xml b/org.argeo.util/pom.xml
similarity index 83%
rename from org.argeo.enterprise/pom.xml
rename to org.argeo.util/pom.xml
index 92cdebb08..1494e321c 100644
--- a/org.argeo.enterprise/pom.xml
+++ b/org.argeo.util/pom.xml
@@ -7,6 +7,6 @@
 		<version>2.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
-	<artifactId>org.argeo.enterprise</artifactId>
-	<name>Argeo Enterprise</name>
+	<artifactId>org.argeo.util</artifactId>
+	<name>Java and OSGi utilities</name>
 </project>
\ No newline at end of file
diff --git a/org.argeo.enterprise/src/org/argeo/ident/IdentClient.java b/org.argeo.util/src/org/argeo/ident/IdentClient.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/ident/IdentClient.java
rename to org.argeo.util/src/org/argeo/ident/IdentClient.java
diff --git a/org.argeo.enterprise/src/org/argeo/ident/OpenSslDecryptor.java b/org.argeo.util/src/org/argeo/ident/OpenSslDecryptor.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/ident/OpenSslDecryptor.java
rename to org.argeo.util/src/org/argeo/ident/OpenSslDecryptor.java
diff --git a/org.argeo.enterprise/src/org/argeo/ident/package-info.java b/org.argeo.util/src/org/argeo/ident/package-info.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/ident/package-info.java
rename to org.argeo.util/src/org/argeo/ident/package-info.java
diff --git a/org.argeo.enterprise/src/org/argeo/naming/AttributesDictionary.java b/org.argeo.util/src/org/argeo/naming/AttributesDictionary.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/naming/AttributesDictionary.java
rename to org.argeo.util/src/org/argeo/naming/AttributesDictionary.java
diff --git a/org.argeo.enterprise/src/org/argeo/naming/AuthPassword.java b/org.argeo.util/src/org/argeo/naming/AuthPassword.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/naming/AuthPassword.java
rename to org.argeo.util/src/org/argeo/naming/AuthPassword.java
diff --git a/org.argeo.enterprise/src/org/argeo/naming/Distinguished.java b/org.argeo.util/src/org/argeo/naming/Distinguished.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/naming/Distinguished.java
rename to org.argeo.util/src/org/argeo/naming/Distinguished.java
diff --git a/org.argeo.enterprise/src/org/argeo/naming/DnsBrowser.java b/org.argeo.util/src/org/argeo/naming/DnsBrowser.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/naming/DnsBrowser.java
rename to org.argeo.util/src/org/argeo/naming/DnsBrowser.java
diff --git a/org.argeo.enterprise/src/org/argeo/naming/LdapAttrs.csv b/org.argeo.util/src/org/argeo/naming/LdapAttrs.csv
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/naming/LdapAttrs.csv
rename to org.argeo.util/src/org/argeo/naming/LdapAttrs.csv
diff --git a/org.argeo.enterprise/src/org/argeo/naming/LdapAttrs.java b/org.argeo.util/src/org/argeo/naming/LdapAttrs.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/naming/LdapAttrs.java
rename to org.argeo.util/src/org/argeo/naming/LdapAttrs.java
diff --git a/org.argeo.enterprise/src/org/argeo/naming/LdapObjs.csv b/org.argeo.util/src/org/argeo/naming/LdapObjs.csv
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/naming/LdapObjs.csv
rename to org.argeo.util/src/org/argeo/naming/LdapObjs.csv
diff --git a/org.argeo.enterprise/src/org/argeo/naming/LdapObjs.java b/org.argeo.util/src/org/argeo/naming/LdapObjs.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/naming/LdapObjs.java
rename to org.argeo.util/src/org/argeo/naming/LdapObjs.java
diff --git a/org.argeo.enterprise/src/org/argeo/naming/LdifParser.java b/org.argeo.util/src/org/argeo/naming/LdifParser.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/naming/LdifParser.java
rename to org.argeo.util/src/org/argeo/naming/LdifParser.java
diff --git a/org.argeo.enterprise/src/org/argeo/naming/LdifWriter.java b/org.argeo.util/src/org/argeo/naming/LdifWriter.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/naming/LdifWriter.java
rename to org.argeo.util/src/org/argeo/naming/LdifWriter.java
diff --git a/org.argeo.enterprise/src/org/argeo/naming/NamingUtils.java b/org.argeo.util/src/org/argeo/naming/NamingUtils.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/naming/NamingUtils.java
rename to org.argeo.util/src/org/argeo/naming/NamingUtils.java
diff --git a/org.argeo.enterprise/src/org/argeo/naming/SharedSecret.java b/org.argeo.util/src/org/argeo/naming/SharedSecret.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/naming/SharedSecret.java
rename to org.argeo.util/src/org/argeo/naming/SharedSecret.java
diff --git a/org.argeo.enterprise/src/org/argeo/naming/SpecifiedName.java b/org.argeo.util/src/org/argeo/naming/SpecifiedName.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/naming/SpecifiedName.java
rename to org.argeo.util/src/org/argeo/naming/SpecifiedName.java
diff --git a/org.argeo.enterprise/src/org/argeo/naming/SrvRecord.java b/org.argeo.util/src/org/argeo/naming/SrvRecord.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/naming/SrvRecord.java
rename to org.argeo.util/src/org/argeo/naming/SrvRecord.java
diff --git a/org.argeo.enterprise/src/org/argeo/naming/package-info.java b/org.argeo.util/src/org/argeo/naming/package-info.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/naming/package-info.java
rename to org.argeo.util/src/org/argeo/naming/package-info.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/internal/EnterpriseActivator.java b/org.argeo.util/src/org/argeo/osgi/internal/EnterpriseActivator.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/internal/EnterpriseActivator.java
rename to org.argeo.util/src/org/argeo/osgi/internal/EnterpriseActivator.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/metatype/EnumAD.java b/org.argeo.util/src/org/argeo/osgi/metatype/EnumAD.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/metatype/EnumAD.java
rename to org.argeo.util/src/org/argeo/osgi/metatype/EnumAD.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/metatype/EnumOCD.java b/org.argeo.util/src/org/argeo/osgi/metatype/EnumOCD.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/metatype/EnumOCD.java
rename to org.argeo.util/src/org/argeo/osgi/metatype/EnumOCD.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/metatype/package-info.java b/org.argeo.util/src/org/argeo/osgi/metatype/package-info.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/metatype/package-info.java
rename to org.argeo.util/src/org/argeo/osgi/metatype/package-info.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/provisioning/SimpleProvisioningService.java b/org.argeo.util/src/org/argeo/osgi/provisioning/SimpleProvisioningService.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/provisioning/SimpleProvisioningService.java
rename to org.argeo.util/src/org/argeo/osgi/provisioning/SimpleProvisioningService.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/provisioning/package-info.java b/org.argeo.util/src/org/argeo/osgi/provisioning/package-info.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/provisioning/package-info.java
rename to org.argeo.util/src/org/argeo/osgi/provisioning/package-info.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/transaction/JtaStatusAdapter.java b/org.argeo.util/src/org/argeo/osgi/transaction/JtaStatusAdapter.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/transaction/JtaStatusAdapter.java
rename to org.argeo.util/src/org/argeo/osgi/transaction/JtaStatusAdapter.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/transaction/SimpleRollbackException.java b/org.argeo.util/src/org/argeo/osgi/transaction/SimpleRollbackException.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/transaction/SimpleRollbackException.java
rename to org.argeo.util/src/org/argeo/osgi/transaction/SimpleRollbackException.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/transaction/SimpleTransaction.java b/org.argeo.util/src/org/argeo/osgi/transaction/SimpleTransaction.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/transaction/SimpleTransaction.java
rename to org.argeo.util/src/org/argeo/osgi/transaction/SimpleTransaction.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/transaction/SimpleTransactionManager.java b/org.argeo.util/src/org/argeo/osgi/transaction/SimpleTransactionManager.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/transaction/SimpleTransactionManager.java
rename to org.argeo.util/src/org/argeo/osgi/transaction/SimpleTransactionManager.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/transaction/TransactionStatusAdapter.java b/org.argeo.util/src/org/argeo/osgi/transaction/TransactionStatusAdapter.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/transaction/TransactionStatusAdapter.java
rename to org.argeo.util/src/org/argeo/osgi/transaction/TransactionStatusAdapter.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/transaction/UuidXid.java b/org.argeo.util/src/org/argeo/osgi/transaction/UuidXid.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/transaction/UuidXid.java
rename to org.argeo.util/src/org/argeo/osgi/transaction/UuidXid.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/transaction/WorkContext.java b/org.argeo.util/src/org/argeo/osgi/transaction/WorkContext.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/transaction/WorkContext.java
rename to org.argeo.util/src/org/argeo/osgi/transaction/WorkContext.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/transaction/WorkControl.java b/org.argeo.util/src/org/argeo/osgi/transaction/WorkControl.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/transaction/WorkControl.java
rename to org.argeo.util/src/org/argeo/osgi/transaction/WorkControl.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/transaction/WorkTransaction.java b/org.argeo.util/src/org/argeo/osgi/transaction/WorkTransaction.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/transaction/WorkTransaction.java
rename to org.argeo.util/src/org/argeo/osgi/transaction/WorkTransaction.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/transaction/package-info.java b/org.argeo.util/src/org/argeo/osgi/transaction/package-info.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/transaction/package-info.java
rename to org.argeo.util/src/org/argeo/osgi/transaction/package-info.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java b/org.argeo.util/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingAuthorization.java b/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingAuthorization.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingAuthorization.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingAuthorization.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java b/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AuthenticatingUser.java b/org.argeo.util/src/org/argeo/osgi/useradmin/AuthenticatingUser.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/AuthenticatingUser.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/AuthenticatingUser.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/DigestUtils.java b/org.argeo.util/src/org/argeo/osgi/useradmin/DigestUtils.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/DigestUtils.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/DigestUtils.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/DirectoryGroup.java b/org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryGroup.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/DirectoryGroup.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryGroup.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/DirectoryUser.java b/org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryUser.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/DirectoryUser.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryUser.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/IpaUtils.java b/org.argeo.util/src/org/argeo/osgi/useradmin/IpaUtils.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/IpaUtils.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/IpaUtils.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdapConnection.java b/org.argeo.util/src/org/argeo/osgi/useradmin/LdapConnection.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdapConnection.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/LdapConnection.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdapUserAdmin.java b/org.argeo.util/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/LdapUserAdmin.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifAuthorization.java b/org.argeo.util/src/org/argeo/osgi/useradmin/LdifAuthorization.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifAuthorization.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/LdifAuthorization.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifGroup.java b/org.argeo.util/src/org/argeo/osgi/useradmin/LdifGroup.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifGroup.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/LdifGroup.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUser.java b/org.argeo.util/src/org/argeo/osgi/useradmin/LdifUser.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUser.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/LdifUser.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUserAdmin.java b/org.argeo.util/src/org/argeo/osgi/useradmin/LdifUserAdmin.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/LdifUserAdmin.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/LdifUserAdmin.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/OsUserDirectory.java b/org.argeo.util/src/org/argeo/osgi/useradmin/OsUserDirectory.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/OsUserDirectory.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/OsUserDirectory.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/OsUserUtils.java b/org.argeo.util/src/org/argeo/osgi/useradmin/OsUserUtils.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/OsUserUtils.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/OsUserUtils.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/TokenUtils.java b/org.argeo.util/src/org/argeo/osgi/useradmin/TokenUtils.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/TokenUtils.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/TokenUtils.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserAdminConf.java b/org.argeo.util/src/org/argeo/osgi/useradmin/UserAdminConf.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserAdminConf.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/UserAdminConf.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserDirectory.java b/org.argeo.util/src/org/argeo/osgi/useradmin/UserDirectory.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserDirectory.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/UserDirectory.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserDirectoryException.java b/org.argeo.util/src/org/argeo/osgi/useradmin/UserDirectoryException.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserDirectoryException.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/UserDirectoryException.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserDirectoryWorkingCopy.java b/org.argeo.util/src/org/argeo/osgi/useradmin/UserDirectoryWorkingCopy.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/UserDirectoryWorkingCopy.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/UserDirectoryWorkingCopy.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/WcXaResource.java b/org.argeo.util/src/org/argeo/osgi/useradmin/WcXaResource.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/WcXaResource.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/WcXaResource.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/jaas-os.cfg b/org.argeo.util/src/org/argeo/osgi/useradmin/jaas-os.cfg
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/jaas-os.cfg
rename to org.argeo.util/src/org/argeo/osgi/useradmin/jaas-os.cfg
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/package-info.java b/org.argeo.util/src/org/argeo/osgi/useradmin/package-info.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/useradmin/package-info.java
rename to org.argeo.util/src/org/argeo/osgi/useradmin/package-info.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/util/FilterRequirement.java b/org.argeo.util/src/org/argeo/osgi/util/FilterRequirement.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/util/FilterRequirement.java
rename to org.argeo.util/src/org/argeo/osgi/util/FilterRequirement.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/util/OnServiceRegistration.java b/org.argeo.util/src/org/argeo/osgi/util/OnServiceRegistration.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/util/OnServiceRegistration.java
rename to org.argeo.util/src/org/argeo/osgi/util/OnServiceRegistration.java
diff --git a/org.argeo.enterprise/src/org/argeo/osgi/util/OsgiRegister.java b/org.argeo.util/src/org/argeo/osgi/util/OsgiRegister.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/osgi/util/OsgiRegister.java
rename to org.argeo.util/src/org/argeo/osgi/util/OsgiRegister.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/CsvParser.java b/org.argeo.util/src/org/argeo/util/CsvParser.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/CsvParser.java
rename to org.argeo.util/src/org/argeo/util/CsvParser.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/CsvParserWithLinesAsMap.java b/org.argeo.util/src/org/argeo/util/CsvParserWithLinesAsMap.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/CsvParserWithLinesAsMap.java
rename to org.argeo.util/src/org/argeo/util/CsvParserWithLinesAsMap.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/CsvWriter.java b/org.argeo.util/src/org/argeo/util/CsvWriter.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/CsvWriter.java
rename to org.argeo.util/src/org/argeo/util/CsvWriter.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/DictionaryKeys.java b/org.argeo.util/src/org/argeo/util/DictionaryKeys.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/DictionaryKeys.java
rename to org.argeo.util/src/org/argeo/util/DictionaryKeys.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/DigestUtils.java b/org.argeo.util/src/org/argeo/util/DigestUtils.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/DigestUtils.java
rename to org.argeo.util/src/org/argeo/util/DigestUtils.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/DirH.java b/org.argeo.util/src/org/argeo/util/DirH.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/DirH.java
rename to org.argeo.util/src/org/argeo/util/DirH.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/LangUtils.java b/org.argeo.util/src/org/argeo/util/LangUtils.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/LangUtils.java
rename to org.argeo.util/src/org/argeo/util/LangUtils.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/OS.java b/org.argeo.util/src/org/argeo/util/OS.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/OS.java
rename to org.argeo.util/src/org/argeo/util/OS.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/PasswordEncryption.java b/org.argeo.util/src/org/argeo/util/PasswordEncryption.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/PasswordEncryption.java
rename to org.argeo.util/src/org/argeo/util/PasswordEncryption.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/ServiceChannel.java b/org.argeo.util/src/org/argeo/util/ServiceChannel.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/ServiceChannel.java
rename to org.argeo.util/src/org/argeo/util/ServiceChannel.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/StreamUtils.java b/org.argeo.util/src/org/argeo/util/StreamUtils.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/StreamUtils.java
rename to org.argeo.util/src/org/argeo/util/StreamUtils.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/Tester.java b/org.argeo.util/src/org/argeo/util/Tester.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/Tester.java
rename to org.argeo.util/src/org/argeo/util/Tester.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/TesterStatus.java b/org.argeo.util/src/org/argeo/util/TesterStatus.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/TesterStatus.java
rename to org.argeo.util/src/org/argeo/util/TesterStatus.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/Throughput.java b/org.argeo.util/src/org/argeo/util/Throughput.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/Throughput.java
rename to org.argeo.util/src/org/argeo/util/Throughput.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/UuidUtils.java b/org.argeo.util/src/org/argeo/util/UuidUtils.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/UuidUtils.java
rename to org.argeo.util/src/org/argeo/util/UuidUtils.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/package-info.java b/org.argeo.util/src/org/argeo/util/package-info.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/package-info.java
rename to org.argeo.util/src/org/argeo/util/package-info.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/register/Component.java b/org.argeo.util/src/org/argeo/util/register/Component.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/register/Component.java
rename to org.argeo.util/src/org/argeo/util/register/Component.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/register/Register.java b/org.argeo.util/src/org/argeo/util/register/Register.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/register/Register.java
rename to org.argeo.util/src/org/argeo/util/register/Register.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/register/Singleton.java b/org.argeo.util/src/org/argeo/util/register/Singleton.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/register/Singleton.java
rename to org.argeo.util/src/org/argeo/util/register/Singleton.java
diff --git a/org.argeo.enterprise/src/org/argeo/util/register/StaticRegister.java b/org.argeo.util/src/org/argeo/util/register/StaticRegister.java
similarity index 100%
rename from org.argeo.enterprise/src/org/argeo/util/register/StaticRegister.java
rename to org.argeo.util/src/org/argeo/util/register/StaticRegister.java
diff --git a/pom.xml b/pom.xml
index 619b9a73e..5113e3462 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 	<modules>
 		<!-- Base -->
 		<module>org.argeo.init</module>
-		<module>org.argeo.enterprise</module>
+		<module>org.argeo.util</module>
 		<!-- Eclipse -->
 		<!-- CMS -->
 		<module>org.argeo.api</module>
@@ -37,7 +37,6 @@
 		<module>rap</module>
 		<!-- Distribution -->
 		<module>dep</module>
-		<module>demo</module>
 		<module>dist</module>
 		<module>sdk</module>
 	</modules>
-- 
2.30.2