From 94bd4b03ff3ca9d1875bf6424383d648e604b93a Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 14 Oct 2020 07:14:35 +0200
Subject: [PATCH] Introduce separate CMS UI RAP bundle.

---
 dep/org.argeo.dep.cms.ui.rap/pom.xml          |  5 ++
 org.argeo.cms.ui.rap/.classpath               |  7 ++
 org.argeo.cms.ui.rap/.gitignore               |  2 +
 org.argeo.cms.ui.rap/.project                 | 28 ++++++++
 org.argeo.cms.ui.rap/META-INF/.gitignore      |  1 +
 org.argeo.cms.ui.rap/bnd.bnd                  |  7 ++
 org.argeo.cms.ui.rap/build.properties         |  4 ++
 org.argeo.cms.ui.rap/pom.xml                  | 64 +++++++++++++++++++
 .../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
 .../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     |  6 +-
 .../org/argeo/cms/web/SimpleErgonomics.java   |  0
 .../src/org/argeo/cms/web/WebThemeUtils.java  |  0
 pom.xml                                       |  1 +
 26 files changed, 122 insertions(+), 3 deletions(-)
 create mode 100644 org.argeo.cms.ui.rap/.classpath
 create mode 100644 org.argeo.cms.ui.rap/.gitignore
 create mode 100644 org.argeo.cms.ui.rap/.project
 create mode 100644 org.argeo.cms.ui.rap/META-INF/.gitignore
 create mode 100644 org.argeo.cms.ui.rap/bnd.bnd
 create mode 100644 org.argeo.cms.ui.rap/build.properties
 create mode 100644 org.argeo.cms.ui.rap/pom.xml
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/AppUi.java (100%)
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/Branding.java (100%)
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/CmsScriptApp.java (100%)
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java (100%)
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/ScriptAppActivator.java (100%)
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/ScriptUi.java (100%)
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/cms.js (100%)
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/ui/script/package-info.java (100%)
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/web/AbstractCmsEntryPoint.java (100%)
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/web/BundleResourceLoader.java (100%)
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/web/CmsThemeResourceLoader.java (100%)
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/web/CmsWebApp.java (100%)
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/web/CmsWebEntryPoint.java (100%)
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/web/MinimalWebApp.java (100%)
 rename {org.argeo.cms.ui/src/org/argeo/cms/ui/util => org.argeo.cms.ui.rap/src/org/argeo/cms/web}/SimpleApp.java (99%)
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/web/SimpleErgonomics.java (100%)
 rename {org.argeo.cms.ui => org.argeo.cms.ui.rap}/src/org/argeo/cms/web/WebThemeUtils.java (100%)

diff --git a/dep/org.argeo.dep.cms.ui.rap/pom.xml b/dep/org.argeo.dep.cms.ui.rap/pom.xml
index c9b195d0a..2fb8cd5d7 100644
--- a/dep/org.argeo.dep.cms.ui.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.ui.rap/pom.xml
@@ -61,6 +61,11 @@
 			<artifactId>org.argeo.cms.ui</artifactId>
 			<version>2.1.89-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.cms.ui.rap</artifactId>
+			<version>2.1.89-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.cms.ui.theme</artifactId>
diff --git a/org.argeo.cms.ui.rap/.classpath b/org.argeo.cms.ui.rap/.classpath
new file mode 100644
index 000000000..e801ebfb4
--- /dev/null
+++ b/org.argeo.cms.ui.rap/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.argeo.cms.ui.rap/.gitignore b/org.argeo.cms.ui.rap/.gitignore
new file mode 100644
index 000000000..09e3bc9b2
--- /dev/null
+++ b/org.argeo.cms.ui.rap/.gitignore
@@ -0,0 +1,2 @@
+/bin/
+/target/
diff --git a/org.argeo.cms.ui.rap/.project b/org.argeo.cms.ui.rap/.project
new file mode 100644
index 000000000..1a37a6771
--- /dev/null
+++ b/org.argeo.cms.ui.rap/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.cms.ui.rap</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.argeo.cms.ui.rap/META-INF/.gitignore b/org.argeo.cms.ui.rap/META-INF/.gitignore
new file mode 100644
index 000000000..4854a41b9
--- /dev/null
+++ b/org.argeo.cms.ui.rap/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF
diff --git a/org.argeo.cms.ui.rap/bnd.bnd b/org.argeo.cms.ui.rap/bnd.bnd
new file mode 100644
index 000000000..7f5c929e5
--- /dev/null
+++ b/org.argeo.cms.ui.rap/bnd.bnd
@@ -0,0 +1,7 @@
+Import-Package:\
+org.eclipse.swt,\
+org.argeo.eclipse.ui,\
+javax.jcr.nodetype,\
+javax.jcr.security,\
+org.eclipse.swt.graphics,\
+*
diff --git a/org.argeo.cms.ui.rap/build.properties b/org.argeo.cms.ui.rap/build.properties
new file mode 100644
index 000000000..34d2e4d2d
--- /dev/null
+++ b/org.argeo.cms.ui.rap/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/org.argeo.cms.ui.rap/pom.xml b/org.argeo.cms.ui.rap/pom.xml
new file mode 100644
index 000000000..5a65d6dca
--- /dev/null
+++ b/org.argeo.cms.ui.rap/pom.xml
@@ -0,0 +1,64 @@
+<?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>
+		<artifactId>argeo-commons</artifactId>
+		<version>2.1.89-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.cms.ui.rap</artifactId>
+	<name>CMS UI RAP</name>
+	<packaging>jar</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.cms.ui</artifactId>
+			<version>2.1.89-SNAPSHOT</version>
+		</dependency>
+		<!-- Specific -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
+			<version>2.1.89-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Theme -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.cms.ui.theme</artifactId>
+			<version>2.1.89-SNAPSHOT</version>
+		</dependency>
+
+		<!-- UI -->
+		<dependency>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.rwt</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.core.commands</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.jface</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- TODO move it to specific -->
+		<dependency>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.filedialog</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.rap.e4</groupId>
+			<artifactId>org.eclipse.rap.fileupload</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/script/AppUi.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/AppUi.java
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/ui/script/AppUi.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/AppUi.java
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/script/Branding.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/Branding.java
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/ui/script/Branding.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/Branding.java
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/script/CmsScriptApp.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/ui/script/CmsScriptApp.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptApp.java
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/CmsScriptRwtApplication.java
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/script/ScriptAppActivator.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptAppActivator.java
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/ui/script/ScriptAppActivator.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptAppActivator.java
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/script/ScriptUi.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptUi.java
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/ui/script/ScriptUi.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/ScriptUi.java
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/script/cms.js b/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/cms.js
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/ui/script/cms.js
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/cms.js
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/script/package-info.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/package-info.java
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/ui/script/package-info.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/ui/script/package-info.java
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/web/AbstractCmsEntryPoint.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/web/AbstractCmsEntryPoint.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/web/AbstractCmsEntryPoint.java
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/web/BundleResourceLoader.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/BundleResourceLoader.java
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/web/BundleResourceLoader.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/web/BundleResourceLoader.java
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/web/CmsThemeResourceLoader.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsThemeResourceLoader.java
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/web/CmsThemeResourceLoader.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsThemeResourceLoader.java
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/web/CmsWebApp.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/web/CmsWebApp.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebApp.java
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/web/CmsWebEntryPoint.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/web/CmsWebEntryPoint.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/web/CmsWebEntryPoint.java
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/web/MinimalWebApp.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/MinimalWebApp.java
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/web/MinimalWebApp.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/web/MinimalWebApp.java
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleApp.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleApp.java
similarity index 99%
rename from org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleApp.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleApp.java
index 149fff8ac..2a651bd30 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/SimpleApp.java
+++ b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleApp.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.ui.util;
+package org.argeo.cms.web;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,8 +28,8 @@ import org.argeo.cms.CmsException;
 import org.argeo.cms.ui.CmsConstants;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ui.LifeCycleUiProvider;
-import org.argeo.cms.web.BundleResourceLoader;
-import org.argeo.cms.web.SimpleErgonomics;
+import org.argeo.cms.ui.util.CmsUiUtils;
+import org.argeo.cms.ui.util.StyleSheetResourceLoader;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.application.Application;
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/web/SimpleErgonomics.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleErgonomics.java
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/web/SimpleErgonomics.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/web/SimpleErgonomics.java
diff --git a/org.argeo.cms.ui/src/org/argeo/cms/web/WebThemeUtils.java b/org.argeo.cms.ui.rap/src/org/argeo/cms/web/WebThemeUtils.java
similarity index 100%
rename from org.argeo.cms.ui/src/org/argeo/cms/web/WebThemeUtils.java
rename to org.argeo.cms.ui.rap/src/org/argeo/cms/web/WebThemeUtils.java
diff --git a/pom.xml b/pom.xml
index 5c94eef04..04395f9fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
 		<module>org.argeo.cms</module>
 		<module>org.argeo.cms.ui.theme</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>
-- 
2.30.2