From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 5 Jan 2022 08:27:36 +0000 (+0100)
Subject: Adapt to changes in Argeo Commons
X-Git-Tag: argeo-suite-2.3.3~37
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=07aa1b1fd667c3c61459f4140b1cf7448c0c36d4

Adapt to changes in Argeo Commons
---

diff --git a/dep/org.argeo.suite.dep.e4.rcp/.gitignore b/dep/org.argeo.suite.dep.e4.rcp/.gitignore
deleted file mode 100644
index 76df179..0000000
--- a/dep/org.argeo.suite.dep.e4.rcp/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target/
-/*.target
diff --git a/dep/org.argeo.suite.dep.e4.rcp/META-INF/.gitignore b/dep/org.argeo.suite.dep.e4.rcp/META-INF/.gitignore
deleted file mode 100644
index 4854a41..0000000
--- a/dep/org.argeo.suite.dep.e4.rcp/META-INF/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF
diff --git a/dep/org.argeo.suite.dep.e4.rcp/bnd.bnd b/dep/org.argeo.suite.dep.e4.rcp/bnd.bnd
deleted file mode 100644
index 991aa1a..0000000
--- a/dep/org.argeo.suite.dep.e4.rcp/bnd.bnd
+++ /dev/null
@@ -1 +0,0 @@
-    
\ No newline at end of file
diff --git a/dep/org.argeo.suite.dep.e4.rcp/p2.inf b/dep/org.argeo.suite.dep.e4.rcp/p2.inf
deleted file mode 100644
index 0423aa5..0000000
--- a/dep/org.argeo.suite.dep.e4.rcp/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=true
\ No newline at end of file
diff --git a/dep/org.argeo.suite.dep.e4.rcp/pom.xml b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
deleted file mode 100644
index b4c4229..0000000
--- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml
+++ /dev/null
@@ -1,115 +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.suite</groupId>
-		<artifactId>dep</artifactId>
-		<version>2.3-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>org.argeo.suite.dep.e4.rcp</artifactId>
-	<name>Suite E4 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>
-			<type>pom</type>
-		</dependency>
-
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.dep.cms.ext</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-		</dependency>
-	</dependencies>
-	<profiles>
-		<profile>
-			<id>rpmbuild</id>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-assembly-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>prepare-source</id>
-								<phase>package</phase>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<configuration>
-									<descriptorRefs>
-										<descriptorRef>a2-source</descriptorRef>
-									</descriptorRefs>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<!-- <plugin> -->
-					<!-- <groupId>org.apache.maven.plugins</groupId> -->
-					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
-					<!-- <executions> -->
-					<!-- <execution> -->
-					<!-- <id>copy-argeo</id> -->
-					<!-- <phase>package</phase> -->
-					<!-- <goals> -->
-					<!-- <goal>copy-dependencies</goal> -->
-					<!-- </goals> -->
-					<!-- <configuration> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
-					<!-- <includeGroupIds>org.argeo.suite</includeGroupIds> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <includeScope>runtime</includeScope> -->
-					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
-					<!-- </configuration> -->
-					<!-- </execution> -->
-					<!-- </executions> -->
-					<!-- </plugin> -->
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>rpm-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>rpm-argeo</id>
-								<phase>package</phase>
-								<goals>
-									<goal>rpm</goal>
-								</goals>
-								<configuration>
-									<name>argeo-suite-e4-rcp${argeo.rpm.suffix}</name>
-									<mappings>
-										<mapping>
-											<directory>/usr/share/osgi</directory>
-											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>true</directoryIncluded>
-											<sources>
-												<source>
-													<location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
-													<includes>
-														<include>**/*.jar</include>
-													</includes>
-												</source>
-											</sources>
-										</mapping>
-									</mappings>
-									<requires>
-										<require>argeo-cms-e4-rcp</require>
-										<require>argeo-connect-tp</require>
-									</requires>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
diff --git a/dep/org.argeo.suite.dep.ui.rcp/.gitignore b/dep/org.argeo.suite.dep.ui.rcp/.gitignore
new file mode 100644
index 0000000..76df179
--- /dev/null
+++ b/dep/org.argeo.suite.dep.ui.rcp/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/*.target
diff --git a/dep/org.argeo.suite.dep.ui.rcp/META-INF/.gitignore b/dep/org.argeo.suite.dep.ui.rcp/META-INF/.gitignore
new file mode 100644
index 0000000..4854a41
--- /dev/null
+++ b/dep/org.argeo.suite.dep.ui.rcp/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF
diff --git a/dep/org.argeo.suite.dep.ui.rcp/bnd.bnd b/dep/org.argeo.suite.dep.ui.rcp/bnd.bnd
new file mode 100644
index 0000000..991aa1a
--- /dev/null
+++ b/dep/org.argeo.suite.dep.ui.rcp/bnd.bnd
@@ -0,0 +1 @@
+    
\ No newline at end of file
diff --git a/dep/org.argeo.suite.dep.ui.rcp/p2.inf b/dep/org.argeo.suite.dep.ui.rcp/p2.inf
new file mode 100644
index 0000000..0423aa5
--- /dev/null
+++ b/dep/org.argeo.suite.dep.ui.rcp/p2.inf
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file
diff --git a/dep/org.argeo.suite.dep.ui.rcp/pom.xml b/dep/org.argeo.suite.dep.ui.rcp/pom.xml
new file mode 100644
index 0000000..7e5d1d7
--- /dev/null
+++ b/dep/org.argeo.suite.dep.ui.rcp/pom.xml
@@ -0,0 +1,115 @@
+<?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.suite</groupId>
+		<artifactId>dep</artifactId>
+		<version>2.3-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<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</groupId>
+			<artifactId>org.argeo.dep.cms.ui.rcp</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
+		</dependency>
+
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.dep.cms.ext</artifactId>
+			<version>${version.argeo-commons}</version>
+			<type>pom</type>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>prepare-source</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptorRefs>
+										<descriptorRef>a2-source</descriptorRef>
+									</descriptorRefs>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<!-- <plugin> -->
+					<!-- <groupId>org.apache.maven.plugins</groupId> -->
+					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
+					<!-- <executions> -->
+					<!-- <execution> -->
+					<!-- <id>copy-argeo</id> -->
+					<!-- <phase>package</phase> -->
+					<!-- <goals> -->
+					<!-- <goal>copy-dependencies</goal> -->
+					<!-- </goals> -->
+					<!-- <configuration> -->
+					<!-- <includeTypes>jar</includeTypes> -->
+					<!-- <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
+					<!-- <includeGroupIds>org.argeo.suite</includeGroupIds> -->
+					<!-- <includeTypes>jar</includeTypes> -->
+					<!-- <includeScope>runtime</includeScope> -->
+					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
+					<!-- </configuration> -->
+					<!-- </execution> -->
+					<!-- </executions> -->
+					<!-- </plugin> -->
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-argeo</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>argeo-suite-e4-rcp${argeo.rpm.suffix}</name>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>true</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
+													<includes>
+														<include>**/*.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+									<requires>
+										<require>argeo-cms-ui-rcp</require>
+										<require>argeo-cms-ext-tp</require>
+									</requires>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
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>