From f9efbe5228615951dd8482a4582aa24e00c10ce5 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 5 Jan 2022 07:32:11 +0100
Subject: [PATCH] Move RAP specific to subdirectory

---
 pom.xml                                        |  9 ++++-----
 rap/cnf/maven.bnd                              |  1 +
 .../org.argeo.cms.e4.rap}/.classpath           |  0
 .../org.argeo.cms.e4.rap}/.project             |  0
 .../org.argeo.cms.e4.rap}/META-INF/.gitignore  |  0
 .../OSGI-INF/cms-admin-rap.xml                 |  0
 .../org.argeo.cms.e4.rap}/bnd.bnd              |  0
 .../org.argeo.cms.e4.rap}/build.properties     |  0
 .../org.argeo.cms.e4.rap}/pom.xml              |  2 +-
 .../org/argeo/cms/e4/rap/AbstractRapE4App.java |  0
 .../org/argeo/cms/e4/rap/CmsE4AdminApp.java    |  0
 .../cms/e4/rap/CmsE4EntryPointFactory.java     |  0
 .../argeo/cms/e4/rap/CmsLoginLifecycle.java    |  0
 .../org/argeo/cms/e4/rap/SimpleRapE4App.java   |  0
 .../src/org/argeo/cms/e4/rap/package-info.java |  0
 .../org.argeo.cms.ui.rap}/.classpath           |  0
 .../org.argeo.cms.ui.rap}/.project             |  0
 .../org.argeo.cms.ui.rap}/META-INF/.gitignore  |  0
 .../org.argeo.cms.ui.rap}/bnd.bnd              |  0
 .../org.argeo.cms.ui.rap}/build.properties     |  0
 .../org.argeo.cms.ui.rap}/pom.xml              |  2 +-
 .../src/org/argeo/cms/ui/script/AppUi.java     |  0
 .../src/org/argeo/cms/ui/script/Branding.java  |  0
 .../org/argeo/cms/ui/script/CmsScriptApp.java  |  0
 .../cms/ui/script/CmsScriptRwtApplication.java |  0
 .../cms/ui/script/ScriptAppActivator.java      |  0
 .../src/org/argeo/cms/ui/script/ScriptUi.java  |  0
 .../src/org/argeo/cms/ui/script/cms.js         |  0
 .../org/argeo/cms/ui/script/package-info.java  |  0
 .../argeo/cms/web/AbstractCmsEntryPoint.java   |  0
 .../argeo/cms/web/BundleResourceLoader.java    |  0
 .../argeo/cms/web/CmsThemeResourceLoader.java  |  0
 .../src/org/argeo/cms/web/CmsWebApp.java       |  0
 .../org/argeo/cms/web/CmsWebEntryPoint.java    |  0
 .../src/org/argeo/cms/web/MinimalWebApp.java   |  0
 .../src/org/argeo/cms/web/SimpleApp.java       |  0
 .../org/argeo/cms/web/SimpleErgonomics.java    |  0
 .../src/org/argeo/cms/web/WebThemeUtils.java   |  0
 .../org/argeo/eclipse/ui/jetty/RwtRunner.java  |  0
 .../org.argeo.swt.specific.rap}/.classpath     |  0
 .../org.argeo.swt.specific.rap}/.project       |  0
 .../META-INF/.gitignore                        |  0
 .../org.argeo.swt.specific.rap}/bnd.bnd        |  0
 .../build.properties                           |  0
 .../org.argeo.swt.specific.rap}/pom.xml        |  2 +-
 .../eclipse/ui/specific/CmsFileDialog.java     |  0
 .../eclipse/ui/specific/CmsFileUpload.java     |  0
 .../ui/specific/EclipseUiSpecificUtils.java    |  0
 .../eclipse/ui/specific/FileDropAdapter.java   |  0
 .../argeo/eclipse/ui/specific/UiContext.java   |  0
 .../eclipse/ui/specific/package-info.java      |  0
 rap/pom.xml                                    | 18 ++++++++++++++++++
 52 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 rap/cnf/maven.bnd
 rename {org.argeo.cms.e4.rap => rap/org.argeo.cms.e4.rap}/.classpath (100%)
 rename {org.argeo.cms.e4.rap => rap/org.argeo.cms.e4.rap}/.project (100%)
 rename {org.argeo.cms.e4.rap => rap/org.argeo.cms.e4.rap}/META-INF/.gitignore (100%)
 rename {org.argeo.cms.e4.rap => rap/org.argeo.cms.e4.rap}/OSGI-INF/cms-admin-rap.xml (100%)
 rename {org.argeo.cms.e4.rap => rap/org.argeo.cms.e4.rap}/bnd.bnd (100%)
 rename {org.argeo.cms.e4.rap => rap/org.argeo.cms.e4.rap}/build.properties (100%)
 rename {org.argeo.cms.e4.rap => rap/org.argeo.cms.e4.rap}/pom.xml (96%)
 rename {org.argeo.cms.e4.rap => rap/org.argeo.cms.e4.rap}/src/org/argeo/cms/e4/rap/AbstractRapE4App.java (100%)
 rename {org.argeo.cms.e4.rap => rap/org.argeo.cms.e4.rap}/src/org/argeo/cms/e4/rap/CmsE4AdminApp.java (100%)
 rename {org.argeo.cms.e4.rap => rap/org.argeo.cms.e4.rap}/src/org/argeo/cms/e4/rap/CmsE4EntryPointFactory.java (100%)
 rename {org.argeo.cms.e4.rap => rap/org.argeo.cms.e4.rap}/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java (100%)
 rename {org.argeo.cms.e4.rap => rap/org.argeo.cms.e4.rap}/src/org/argeo/cms/e4/rap/SimpleRapE4App.java (100%)
 rename {org.argeo.cms.e4.rap => rap/org.argeo.cms.e4.rap}/src/org/argeo/cms/e4/rap/package-info.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/.classpath (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/.project (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/META-INF/.gitignore (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/bnd.bnd (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/build.properties (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/pom.xml (97%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/AppUi.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/Branding.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/CmsScriptApp.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/ScriptAppActivator.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/ScriptUi.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/cms.js (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/package-info.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/web/AbstractCmsEntryPoint.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/web/BundleResourceLoader.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/web/CmsThemeResourceLoader.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/web/CmsWebApp.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/web/CmsWebEntryPoint.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/web/MinimalWebApp.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/web/SimpleApp.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/web/SimpleErgonomics.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/cms/web/WebThemeUtils.java (100%)
 rename {org.argeo.cms.ui.rap => rap/org.argeo.cms.ui.rap}/src/org/argeo/eclipse/ui/jetty/RwtRunner.java (100%)
 rename {org.argeo.swt.specific.rap => rap/org.argeo.swt.specific.rap}/.classpath (100%)
 rename {org.argeo.swt.specific.rap => rap/org.argeo.swt.specific.rap}/.project (100%)
 rename {org.argeo.swt.specific.rap => rap/org.argeo.swt.specific.rap}/META-INF/.gitignore (100%)
 rename {org.argeo.swt.specific.rap => rap/org.argeo.swt.specific.rap}/bnd.bnd (100%)
 rename {org.argeo.swt.specific.rap => rap/org.argeo.swt.specific.rap}/build.properties (100%)
 rename {org.argeo.swt.specific.rap => rap/org.argeo.swt.specific.rap}/pom.xml (96%)
 rename {org.argeo.swt.specific.rap => rap/org.argeo.swt.specific.rap}/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java (100%)
 rename {org.argeo.swt.specific.rap => rap/org.argeo.swt.specific.rap}/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java (100%)
 rename {org.argeo.swt.specific.rap => rap/org.argeo.swt.specific.rap}/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java (100%)
 rename {org.argeo.swt.specific.rap => rap/org.argeo.swt.specific.rap}/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java (100%)
 rename {org.argeo.swt.specific.rap => rap/org.argeo.swt.specific.rap}/src/org/argeo/eclipse/ui/specific/UiContext.java (100%)
 rename {org.argeo.swt.specific.rap => rap/org.argeo.swt.specific.rap}/src/org/argeo/eclipse/ui/specific/package-info.java (100%)
 create mode 100644 rap/pom.xml

diff --git a/pom.xml b/pom.xml
index 8ec1f0c83..619b9a73e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,19 +23,18 @@
 		<module>org.argeo.init</module>
 		<module>org.argeo.enterprise</module>
 		<!-- Eclipse -->
-		<module>org.argeo.swt.specific.rap</module>
 		<!-- CMS -->
 		<module>org.argeo.api</module>
 		<module>org.argeo.cms.tp</module>
 		<module>org.argeo.cms</module>
 		<module>org.argeo.cms.servlet</module>
-		<module>org.argeo.cms.swt</module>
 		<module>org.argeo.cms.jcr</module>
+		<!-- CMS UX -->
+		<module>org.argeo.cms.swt</module>
 		<module>org.argeo.cms.ui</module>
-		<module>org.argeo.cms.ui.rap</module>
-		<!-- CMS E4 -->
 		<module>org.argeo.cms.e4</module>
-		<module>org.argeo.cms.e4.rap</module>
+		<!-- Eclipse RAP/RCP specific -->
+		<module>rap</module>
 		<!-- Distribution -->
 		<module>dep</module>
 		<module>demo</module>
diff --git a/rap/cnf/maven.bnd b/rap/cnf/maven.bnd
new file mode 100644
index 000000000..4bd5c0cfe
--- /dev/null
+++ b/rap/cnf/maven.bnd
@@ -0,0 +1 @@
+-include: ../../cnf/maven.bnd
\ No newline at end of file
diff --git a/org.argeo.cms.e4.rap/.classpath b/rap/org.argeo.cms.e4.rap/.classpath
similarity index 100%
rename from org.argeo.cms.e4.rap/.classpath
rename to rap/org.argeo.cms.e4.rap/.classpath
diff --git a/org.argeo.cms.e4.rap/.project b/rap/org.argeo.cms.e4.rap/.project
similarity index 100%
rename from org.argeo.cms.e4.rap/.project
rename to rap/org.argeo.cms.e4.rap/.project
diff --git a/org.argeo.cms.e4.rap/META-INF/.gitignore b/rap/org.argeo.cms.e4.rap/META-INF/.gitignore
similarity index 100%
rename from org.argeo.cms.e4.rap/META-INF/.gitignore
rename to rap/org.argeo.cms.e4.rap/META-INF/.gitignore
diff --git a/org.argeo.cms.e4.rap/OSGI-INF/cms-admin-rap.xml b/rap/org.argeo.cms.e4.rap/OSGI-INF/cms-admin-rap.xml
similarity index 100%
rename from org.argeo.cms.e4.rap/OSGI-INF/cms-admin-rap.xml
rename to rap/org.argeo.cms.e4.rap/OSGI-INF/cms-admin-rap.xml
diff --git a/org.argeo.cms.e4.rap/bnd.bnd b/rap/org.argeo.cms.e4.rap/bnd.bnd
similarity index 100%
rename from org.argeo.cms.e4.rap/bnd.bnd
rename to rap/org.argeo.cms.e4.rap/bnd.bnd
diff --git a/org.argeo.cms.e4.rap/build.properties b/rap/org.argeo.cms.e4.rap/build.properties
similarity index 100%
rename from org.argeo.cms.e4.rap/build.properties
rename to rap/org.argeo.cms.e4.rap/build.properties
diff --git a/org.argeo.cms.e4.rap/pom.xml b/rap/org.argeo.cms.e4.rap/pom.xml
similarity index 96%
rename from org.argeo.cms.e4.rap/pom.xml
rename to rap/org.argeo.cms.e4.rap/pom.xml
index 61b47c38f..49b40c4d0 100644
--- a/org.argeo.cms.e4.rap/pom.xml
+++ b/rap/org.argeo.cms.e4.rap/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<artifactId>argeo-commons</artifactId>
+		<artifactId>rap</artifactId>
 		<version>2.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java b/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java
similarity index 100%
rename from org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java
rename to rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java
diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4AdminApp.java b/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4AdminApp.java
similarity index 100%
rename from org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4AdminApp.java
rename to rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4AdminApp.java
diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4EntryPointFactory.java b/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4EntryPointFactory.java
similarity index 100%
rename from org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4EntryPointFactory.java
rename to rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsE4EntryPointFactory.java
diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java b/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
similarity index 100%
rename from org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
rename to rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/CmsLoginLifecycle.java
diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/SimpleRapE4App.java b/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/SimpleRapE4App.java
similarity index 100%
rename from org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/SimpleRapE4App.java
rename to rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/SimpleRapE4App.java
diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/package-info.java b/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/package-info.java
similarity index 100%
rename from org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/package-info.java
rename to rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/package-info.java
diff --git a/org.argeo.cms.ui.rap/.classpath b/rap/org.argeo.cms.ui.rap/.classpath
similarity index 100%
rename from org.argeo.cms.ui.rap/.classpath
rename to rap/org.argeo.cms.ui.rap/.classpath
diff --git a/org.argeo.cms.ui.rap/.project b/rap/org.argeo.cms.ui.rap/.project
similarity index 100%
rename from org.argeo.cms.ui.rap/.project
rename to rap/org.argeo.cms.ui.rap/.project
diff --git a/org.argeo.cms.ui.rap/META-INF/.gitignore b/rap/org.argeo.cms.ui.rap/META-INF/.gitignore
similarity index 100%
rename from org.argeo.cms.ui.rap/META-INF/.gitignore
rename to rap/org.argeo.cms.ui.rap/META-INF/.gitignore
diff --git a/org.argeo.cms.ui.rap/bnd.bnd b/rap/org.argeo.cms.ui.rap/bnd.bnd
similarity index 100%
rename from org.argeo.cms.ui.rap/bnd.bnd
rename to rap/org.argeo.cms.ui.rap/bnd.bnd
diff --git a/org.argeo.cms.ui.rap/build.properties b/rap/org.argeo.cms.ui.rap/build.properties
similarity index 100%
rename from org.argeo.cms.ui.rap/build.properties
rename to rap/org.argeo.cms.ui.rap/build.properties
diff --git a/org.argeo.cms.ui.rap/pom.xml b/rap/org.argeo.cms.ui.rap/pom.xml
similarity index 97%
rename from org.argeo.cms.ui.rap/pom.xml
rename to rap/org.argeo.cms.ui.rap/pom.xml
index 243d2c441..093c20852 100644
--- a/org.argeo.cms.ui.rap/pom.xml
+++ b/rap/org.argeo.cms.ui.rap/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<artifactId>argeo-commons</artifactId>
+		<artifactId>rap</artifactId>
 		<version>2.3-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/AppUi.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/AppUi.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/AppUi.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/AppUi.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/Branding.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/Branding.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/Branding.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/Branding.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptAppActivator.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptAppActivator.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptAppActivator.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptAppActivator.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptUi.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptUi.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptUi.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptUi.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/cms.js b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/cms.js
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/cms.js
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/cms.js
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/package-info.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/package-info.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/package-info.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/package-info.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/BundleResourceLoader.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/BundleResourceLoader.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/web/BundleResourceLoader.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/BundleResourceLoader.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsThemeResourceLoader.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsThemeResourceLoader.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsThemeResourceLoader.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsThemeResourceLoader.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/MinimalWebApp.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/MinimalWebApp.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/web/MinimalWebApp.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/MinimalWebApp.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleApp.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleApp.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleApp.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleApp.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleErgonomics.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleErgonomics.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleErgonomics.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleErgonomics.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/cms/web/WebThemeUtils.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/WebThemeUtils.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/cms/web/WebThemeUtils.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/cms/web/WebThemeUtils.java
diff --git a/org.argeo.cms.ui.rap/src/org/argeo/eclipse/ui/jetty/RwtRunner.java b/rap/org.argeo.cms.ui.rap/src/org/argeo/eclipse/ui/jetty/RwtRunner.java
similarity index 100%
rename from org.argeo.cms.ui.rap/src/org/argeo/eclipse/ui/jetty/RwtRunner.java
rename to rap/org.argeo.cms.ui.rap/src/org/argeo/eclipse/ui/jetty/RwtRunner.java
diff --git a/org.argeo.swt.specific.rap/.classpath b/rap/org.argeo.swt.specific.rap/.classpath
similarity index 100%
rename from org.argeo.swt.specific.rap/.classpath
rename to rap/org.argeo.swt.specific.rap/.classpath
diff --git a/org.argeo.swt.specific.rap/.project b/rap/org.argeo.swt.specific.rap/.project
similarity index 100%
rename from org.argeo.swt.specific.rap/.project
rename to rap/org.argeo.swt.specific.rap/.project
diff --git a/org.argeo.swt.specific.rap/META-INF/.gitignore b/rap/org.argeo.swt.specific.rap/META-INF/.gitignore
similarity index 100%
rename from org.argeo.swt.specific.rap/META-INF/.gitignore
rename to rap/org.argeo.swt.specific.rap/META-INF/.gitignore
diff --git a/org.argeo.swt.specific.rap/bnd.bnd b/rap/org.argeo.swt.specific.rap/bnd.bnd
similarity index 100%
rename from org.argeo.swt.specific.rap/bnd.bnd
rename to rap/org.argeo.swt.specific.rap/bnd.bnd
diff --git a/org.argeo.swt.specific.rap/build.properties b/rap/org.argeo.swt.specific.rap/build.properties
similarity index 100%
rename from org.argeo.swt.specific.rap/build.properties
rename to rap/org.argeo.swt.specific.rap/build.properties
diff --git a/org.argeo.swt.specific.rap/pom.xml b/rap/org.argeo.swt.specific.rap/pom.xml
similarity index 96%
rename from org.argeo.swt.specific.rap/pom.xml
rename to rap/org.argeo.swt.specific.rap/pom.xml
index cb73fcd32..b889b95d3 100644
--- a/org.argeo.swt.specific.rap/pom.xml
+++ b/rap/org.argeo.swt.specific.rap/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<version>2.3-SNAPSHOT</version>
-		<artifactId>argeo-commons</artifactId>
+		<artifactId>rap</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.swt.specific.rap</artifactId>
diff --git a/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java b/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java
similarity index 100%
rename from org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java
rename to rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileDialog.java
diff --git a/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java b/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java
similarity index 100%
rename from org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java
rename to rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/CmsFileUpload.java
diff --git a/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java b/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java
similarity index 100%
rename from org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java
rename to rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/EclipseUiSpecificUtils.java
diff --git a/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java b/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java
similarity index 100%
rename from org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java
rename to rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/FileDropAdapter.java
diff --git a/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/UiContext.java b/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/UiContext.java
similarity index 100%
rename from org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/UiContext.java
rename to rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/UiContext.java
diff --git a/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/package-info.java b/rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/package-info.java
similarity index 100%
rename from org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/package-info.java
rename to rap/org.argeo.swt.specific.rap/src/org/argeo/eclipse/ui/specific/package-info.java
diff --git a/rap/pom.xml b/rap/pom.xml
new file mode 100644
index 000000000..60373a270
--- /dev/null
+++ b/rap/pom.xml
@@ -0,0 +1,18 @@
+<?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>rap</artifactId>
+	<name>Eclipse RAP Specific</name>
+	<packaging>pom</packaging>
+	<modules>
+		<module>org.argeo.swt.specific.rap</module>
+		<module>org.argeo.cms.ui.rap</module>
+		<module>org.argeo.cms.e4.rap</module>
+	</modules>
+</project>
\ No newline at end of file
-- 
2.30.2