From 07aa1b1fd667c3c61459f4140b1cf7448c0c36d4 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 5 Jan 2022 09:27:36 +0100
Subject: [PATCH] Adapt to changes in Argeo Commons

---
 .../.gitignore                                     |  0
 .../META-INF/.gitignore                            |  0
 .../bnd.bnd                                        |  0
 .../p2.inf                                         |  0
 .../pom.xml                                        | 14 +++++++-------
 dep/pom.xml                                        |  2 +-
 org.argeo.entity.api/pom.xml                       |  2 +-
 org.argeo.entity.ui/pom.xml                        |  2 +-
 org.argeo.geo.ui/pom.xml                           |  2 +-
 org.argeo.library.ui/pom.xml                       |  2 +-
 org.argeo.people.ui/pom.xml                        |  2 +-
 org.argeo.publishing.ui/pom.xml                    |  2 +-
 org.argeo.suite.ui.rap/bnd.bnd                     |  6 +++---
 org.argeo.suite.ui/pom.xml                         |  2 +-
 org.argeo.support.odk/pom.xml                      | 11 ++++++++++-
 pom.xml                                            |  1 -
 16 files changed, 28 insertions(+), 20 deletions(-)
 rename dep/{org.argeo.suite.dep.e4.rcp => org.argeo.suite.dep.ui.rcp}/.gitignore (100%)
 rename dep/{org.argeo.suite.dep.e4.rcp => org.argeo.suite.dep.ui.rcp}/META-INF/.gitignore (100%)
 rename dep/{org.argeo.suite.dep.e4.rcp => org.argeo.suite.dep.ui.rcp}/bnd.bnd (100%)
 rename dep/{org.argeo.suite.dep.e4.rcp => org.argeo.suite.dep.ui.rcp}/p2.inf (100%)
 rename dep/{org.argeo.suite.dep.e4.rcp => org.argeo.suite.dep.ui.rcp}/pom.xml (91%)

diff --git a/dep/org.argeo.suite.dep.e4.rcp/.gitignore b/dep/org.argeo.suite.dep.ui.rcp/.gitignore
similarity index 100%
rename from dep/org.argeo.suite.dep.e4.rcp/.gitignore
rename to dep/org.argeo.suite.dep.ui.rcp/.gitignore
diff --git a/dep/org.argeo.suite.dep.e4.rcp/META-INF/.gitignore b/dep/org.argeo.suite.dep.ui.rcp/META-INF/.gitignore
similarity index 100%
rename from dep/org.argeo.suite.dep.e4.rcp/META-INF/.gitignore
rename to dep/org.argeo.suite.dep.ui.rcp/META-INF/.gitignore
diff --git a/dep/org.argeo.suite.dep.e4.rcp/bnd.bnd b/dep/org.argeo.suite.dep.ui.rcp/bnd.bnd
similarity index 100%
rename from dep/org.argeo.suite.dep.e4.rcp/bnd.bnd
rename to dep/org.argeo.suite.dep.ui.rcp/bnd.bnd
diff --git a/dep/org.argeo.suite.dep.e4.rcp/p2.inf b/dep/org.argeo.suite.dep.ui.rcp/p2.inf
similarity index 100%
rename from dep/org.argeo.suite.dep.e4.rcp/p2.inf
rename to dep/org.argeo.suite.dep.ui.rcp/p2.inf
diff --git a/dep/org.argeo.suite.dep.e4.rcp/pom.xml b/dep/org.argeo.suite.dep.ui.rcp/pom.xml
similarity index 91%
rename from dep/org.argeo.suite.dep.e4.rcp/pom.xml
rename to dep/org.argeo.suite.dep.ui.rcp/pom.xml
index b4c4229..7e5d1d7 100644
--- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml
+++ b/dep/org.argeo.suite.dep.ui.rcp/pom.xml
@@ -9,15 +9,15 @@
 		<version>2.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
-	<artifactId>org.argeo.suite.dep.e4.rcp</artifactId>
-	<name>Suite E4 Platform RCP</name>
+	<artifactId>org.argeo.suite.dep.ui.rcp</artifactId>
+	<name>Suite Platform RCP</name>
 	<packaging>jar</packaging>
 	<dependencies>
 		<!-- Base Argeo platform distribution -->
 		<dependency>
-			<groupId>org.argeo.commons.rcp</groupId>
-			<artifactId>org.argeo.dep.cms.e4.rcp</artifactId>
-			<version>${version.argeo-rcp}</version>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.dep.cms.ui.rcp</artifactId>
+			<version>${version.argeo-commons}</version>
 			<type>pom</type>
 		</dependency>
 
@@ -101,8 +101,8 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-e4-rcp</require>
-										<require>argeo-connect-tp</require>
+										<require>argeo-cms-ui-rcp</require>
+										<require>argeo-cms-ext-tp</require>
 									</requires>
 								</configuration>
 							</execution>
diff --git a/dep/pom.xml b/dep/pom.xml
index 5695608..e4afd0a 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -13,7 +13,7 @@
 	<modules>
 		<module>org.argeo.suite.dep.ui.rap</module>
 		<module>org.argeo.suite.dep.e4.rap</module>
-		<!-- <module>org.argeo.suite.dep.e4.rcp</module> -->
+		<module>org.argeo.suite.dep.ui.rcp</module>
 	</modules>
 	<build>
 		<plugins>
diff --git a/org.argeo.entity.api/pom.xml b/org.argeo.entity.api/pom.xml
index d20f3f6..14eb34a 100644
--- a/org.argeo.entity.api/pom.xml
+++ b/org.argeo.entity.api/pom.xml
@@ -14,7 +14,7 @@
 		<!-- Argeo Commons -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.enterprise</artifactId>
+			<artifactId>org.argeo.util</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
 	</dependencies>
diff --git a/org.argeo.entity.ui/pom.xml b/org.argeo.entity.ui/pom.xml
index 563c8c5..99910b0 100644
--- a/org.argeo.entity.ui/pom.xml
+++ b/org.argeo.entity.ui/pom.xml
@@ -26,7 +26,7 @@
 
 		<!-- Specific -->
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
+			<groupId>org.argeo.commons.rap</groupId>
 			<artifactId>org.argeo.swt.specific.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 			<scope>provided</scope>
diff --git a/org.argeo.geo.ui/pom.xml b/org.argeo.geo.ui/pom.xml
index 18a51a1..f6ee642 100644
--- a/org.argeo.geo.ui/pom.xml
+++ b/org.argeo.geo.ui/pom.xml
@@ -19,7 +19,7 @@
 
 		<!-- Specific -->
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
+			<groupId>org.argeo.commons.rap</groupId>
 			<artifactId>org.argeo.swt.specific.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 			<scope>provided</scope>
diff --git a/org.argeo.library.ui/pom.xml b/org.argeo.library.ui/pom.xml
index 0e95c3d..e6fec1e 100644
--- a/org.argeo.library.ui/pom.xml
+++ b/org.argeo.library.ui/pom.xml
@@ -19,7 +19,7 @@
 
 		<!-- Specific -->
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
+			<groupId>org.argeo.commons.rap</groupId>
 			<artifactId>org.argeo.swt.specific.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 			<scope>provided</scope>
diff --git a/org.argeo.people.ui/pom.xml b/org.argeo.people.ui/pom.xml
index 72e8705..7e75596 100644
--- a/org.argeo.people.ui/pom.xml
+++ b/org.argeo.people.ui/pom.xml
@@ -19,7 +19,7 @@
 
 		<!-- Specific -->
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
+			<groupId>org.argeo.commons.rap</groupId>
 			<artifactId>org.argeo.swt.specific.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 			<scope>provided</scope>
diff --git a/org.argeo.publishing.ui/pom.xml b/org.argeo.publishing.ui/pom.xml
index 84c2155..6bf2359 100644
--- a/org.argeo.publishing.ui/pom.xml
+++ b/org.argeo.publishing.ui/pom.xml
@@ -19,7 +19,7 @@
 
 		<!-- Specific -->
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
+			<groupId>org.argeo.commons.rap</groupId>
 			<artifactId>org.argeo.swt.specific.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 			<scope>provided</scope>
diff --git a/org.argeo.suite.ui.rap/bnd.bnd b/org.argeo.suite.ui.rap/bnd.bnd
index 35b671b..140b5e0 100644
--- a/org.argeo.suite.ui.rap/bnd.bnd
+++ b/org.argeo.suite.ui.rap/bnd.bnd
@@ -1,6 +1,6 @@
 Service-Component: OSGI-INF/cmsWebApp.xml
 
 Import-Package:\
-org.argeo.cms.web,\
-org.eclipse.rap.rwt.application,\
-*
+org.argeo.cms.web;resolution:=optional,\
+org.eclipse.rap.rwt.application;resolution:=optional,\
+*;resolution:=optional
diff --git a/org.argeo.suite.ui/pom.xml b/org.argeo.suite.ui/pom.xml
index 5d3f932..408fb9c 100644
--- a/org.argeo.suite.ui/pom.xml
+++ b/org.argeo.suite.ui/pom.xml
@@ -30,7 +30,7 @@
 		</dependency>
 		<!-- Specific -->
 		<dependency>
-			<groupId>org.argeo.commons</groupId>
+			<groupId>org.argeo.commons.rap</groupId>
 			<artifactId>org.argeo.swt.specific.rap</artifactId>
 			<version>${version.argeo-commons}</version>
 			<scope>provided</scope>
diff --git a/org.argeo.support.odk/pom.xml b/org.argeo.support.odk/pom.xml
index 2f97176..a161267 100644
--- a/org.argeo.support.odk/pom.xml
+++ b/org.argeo.support.odk/pom.xml
@@ -1,5 +1,7 @@
 <?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">
+<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.suite</groupId>
@@ -21,5 +23,12 @@
 			<artifactId>org.argeo.support.xforms</artifactId>
 			<version>2.3-SNAPSHOT</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.cms.servlet</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+
 	</dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 2512e4c..2829432 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,6 @@
 		<version.argeo-tp>2.1.27</version.argeo-tp>
 		<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
 		<version.argeo-suite-icons>2.3.1</version.argeo-suite-icons>
-		<!-- <version.argeo-rcp>2.3-SNAPSHOT</version.argeo-rcp> -->
 		<git.rw />
 	</properties>
 	<modules>
-- 
2.30.2