From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 13 Oct 2020 12:06:36 +0000 (+0200)
Subject: Introduce plain RWT RAP dependencies.
X-Git-Tag: argeo-commons-2.1.89~69
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=0c9de3a0cbb02716f792ebed542b67f0edbe1f4b

Introduce plain RWT RAP dependencies.
---

diff --git a/dep/org.argeo.dep.cms.e4.rap/pom.xml b/dep/org.argeo.dep.cms.e4.rap/pom.xml
index 33df7c396..b3550c055 100644
--- a/dep/org.argeo.dep.cms.e4.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.e4.rap/pom.xml
@@ -14,55 +14,11 @@
 		<!-- Argeo Commons -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.dep.cms.node</artifactId>
+			<artifactId>org.argeo.dep.cms.ui.rap</artifactId>
 			<version>2.1.89-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 
-		<!-- RWT -->
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.rap.rwt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.core.commands</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.rap.jface</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.rap.filedialog</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.rap.fileupload</artifactId>
-		</dependency>
-
-		<!-- Argeo Commons UI -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui</artifactId>
-			<version>2.1.89-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
-			<version>2.1.89-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.cms.ui</artifactId>
-			<version>2.1.89-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.cms.ui.theme</artifactId>
-			<version>2.1.89-SNAPSHOT</version>
-		</dependency>
-
 		<!-- E4 Specific -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
@@ -178,10 +134,6 @@
 			<groupId>org.argeo.tp.rap.e4</groupId>
 			<artifactId>org.eclipse.core.contenttype</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.rap.rwt.osgi</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.rap.e4</groupId>
 			<artifactId>org.eclipse.rap.jface.databinding</artifactId>
@@ -203,25 +155,6 @@
 			<artifactId>org.eclipse.help</artifactId>
 		</dependency>
 
-		<!-- RAP Workbench -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-		<!-- <artifactId>org.eclipse.rap.ui</artifactId> -->
-		<!-- </dependency> -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-		<!-- <artifactId>org.eclipse.rap.ui.forms</artifactId> -->
-		<!-- </dependency> -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-		<!-- <artifactId>org.eclipse.rap.ui.views</artifactId> -->
-		<!-- </dependency> -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.rap.platform</groupId> -->
-		<!-- <artifactId>org.eclipse.rap.ui.workbench</artifactId> -->
-		<!-- </dependency> -->
-
-
 		<!-- Dependencies required / provided by Eclipse 4 -->
 		<dependency>
 			<groupId>org.argeo.tp.rap.e4</groupId>
@@ -315,13 +248,6 @@
 			<artifactId>org.eclipse.e4.ui.workbench</artifactId>
 		</dependency>
 
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp</groupId> -->
-		<!-- <artifactId>argeo-tp-rap-e4</artifactId> -->
-		<!-- <version>${version.argeo-tp}</version> -->
-		<!-- <scope>provided</scope> -->
-		<!-- </dependency> -->
-
 		<!-- SDK -->
 		<dependency>
 			<groupId>org.argeo.tp.sdk</groupId>
@@ -389,7 +315,7 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-node</require>
+										<require>argeo-cms-ui-rap</require>
 										<require>argeo-cms-e4-rap-tp</require>
 									</requires>
 								</configuration>
@@ -452,7 +378,7 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-node-tp</require>
+										<require>argeo-cms-ui-rap-tp</require>
 									</requires>
 								</configuration>
 							</execution>
diff --git a/dep/org.argeo.dep.cms.ui.rap/.gitignore b/dep/org.argeo.dep.cms.ui.rap/.gitignore
new file mode 100644
index 000000000..7bfff59a8
--- /dev/null
+++ b/dep/org.argeo.dep.cms.ui.rap/.gitignore
@@ -0,0 +1,4 @@
+/target/
+/feature.xml
+/modularDistribution.csv
+/*.target
diff --git a/dep/org.argeo.dep.cms.ui.rap/META-INF/.gitignore b/dep/org.argeo.dep.cms.ui.rap/META-INF/.gitignore
new file mode 100644
index 000000000..4854a41b9
--- /dev/null
+++ b/dep/org.argeo.dep.cms.ui.rap/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF
diff --git a/dep/org.argeo.dep.cms.ui.rap/bnd.bnd b/dep/org.argeo.dep.cms.ui.rap/bnd.bnd
new file mode 100644
index 000000000..e69de29bb
diff --git a/dep/org.argeo.dep.cms.ui.rap/p2.inf b/dep/org.argeo.dep.cms.ui.rap/p2.inf
new file mode 100644
index 000000000..0423aa509
--- /dev/null
+++ b/dep/org.argeo.dep.cms.ui.rap/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.dep.cms.ui.rap/pom.xml b/dep/org.argeo.dep.cms.ui.rap/pom.xml
new file mode 100644
index 000000000..c9b195d0a
--- /dev/null
+++ b/dep/org.argeo.dep.cms.ui.rap/pom.xml
@@ -0,0 +1,210 @@
+<?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>
+		<version>2.1.89-SNAPSHOT</version>
+		<artifactId>dep</artifactId>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.dep.cms.ui.rap</artifactId>
+	<name>CMS Platform UI RAP</name>
+	<dependencies>
+
+		<!-- Argeo Commons -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.dep.cms.node</artifactId>
+			<version>2.1.89-SNAPSHOT</version>
+			<type>pom</type>
+		</dependency>
+
+		<!-- RWT -->
+		<dependency>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.rwt</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.rwt.osgi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.core.commands</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.jface</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.filedialog</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.fileupload</artifactId>
+		</dependency>
+
+		<!-- Argeo Commons UI -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.eclipse.ui</artifactId>
+			<version>2.1.89-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
+			<version>2.1.89-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.cms.ui</artifactId>
+			<version>2.1.89-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.cms.ui.theme</artifactId>
+			<version>2.1.89-SNAPSHOT</version>
+		</dependency>
+
+		<!-- SDK -->
+		<dependency>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.hamcrest</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+	<dependencyManagement>
+	</dependencyManagement>
+	<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.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-cms-ui-rap</name>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</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-node</require>
+										<require>argeo-cms-ui-rap-tp</require>
+									</requires>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>rpmbuild-tp</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>prepare-source-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptorRefs>
+										<descriptorRef>a2-source-tp</descriptorRef>
+									</descriptorRefs>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>argeo-cms-ui-rap-tp</name>
+									<projversion>${version.argeo-tp}</projversion>
+									<release>${maven.build.timestamp}</release>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source-tp</location>
+													<includes>
+														<include>**/*.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+									<requires>
+										<require>argeo-cms-node-tp</require>
+									</requires>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
\ No newline at end of file
diff --git a/dep/pom.xml b/dep/pom.xml
index 364f12e5e..02848418f 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -13,6 +13,7 @@
 	<modules>
 		<module>org.argeo.dep.cms.client</module>
 		<module>org.argeo.dep.cms.node</module>
+		<module>org.argeo.dep.cms.ui.rap</module>
 		<module>org.argeo.dep.cms.e4.rap</module>
 		<module>org.argeo.dep.cms.sdk</module>
 	</modules>