From a4d521418275922723b18b5966ccbcac5624c098 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 6 May 2022 12:43:31 +0200
Subject: [PATCH] Simplify CMS app deployment.

---
 Makefile                                      |  3 +--
 org.argeo.app.ui.rap/.gitignore               |  2 --
 org.argeo.app.ui.rap/.project                 | 27 -------------------
 org.argeo.app.ui.rap/META-INF/.gitignore      |  1 -
 org.argeo.app.ui.rap/OSGI-INF/cmsWebApp.xml   |  7 -----
 org.argeo.app.ui.rap/bnd.bnd                  |  6 -----
 org.argeo.app.ui.rap/build.properties         |  5 ----
 org.argeo.app.ui.rap/src/.gitignore           |  0
 org.argeo.app.ui/config/cmsApp.properties     |  4 ++-
 .../src/org/argeo/app/ui/SuiteApp.java        |  5 ++--
 sdk/argeo-suite-rap.properties                |  2 +-
 sdk/argeo-suite-rcp.properties                |  3 ++-
 12 files changed, 10 insertions(+), 55 deletions(-)
 delete mode 100644 org.argeo.app.ui.rap/.gitignore
 delete mode 100644 org.argeo.app.ui.rap/.project
 delete mode 100644 org.argeo.app.ui.rap/META-INF/.gitignore
 delete mode 100644 org.argeo.app.ui.rap/OSGI-INF/cmsWebApp.xml
 delete mode 100644 org.argeo.app.ui.rap/bnd.bnd
 delete mode 100644 org.argeo.app.ui.rap/build.properties
 delete mode 100644 org.argeo.app.ui.rap/src/.gitignore

diff --git a/Makefile b/Makefile
index c1803c9..7a9417e 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,7 @@ org.argeo.app.core \
 org.argeo.app.servlet.odk \
 org.argeo.app.servlet.publish \
 org.argeo.app.ui \
-org.argeo.app.theme.default \
-org.argeo.app.ui.rap \
+org.argeo.app.theme.default
 
 A2_OUTPUT = $(SDK_BUILD_BASE)/a2
 A2_BASE = $(A2_OUTPUT)
diff --git a/org.argeo.app.ui.rap/.gitignore b/org.argeo.app.ui.rap/.gitignore
deleted file mode 100644
index 09e3bc9..0000000
--- a/org.argeo.app.ui.rap/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/
-/target/
diff --git a/org.argeo.app.ui.rap/.project b/org.argeo.app.ui.rap/.project
deleted file mode 100644
index 51bc8dd..0000000
--- a/org.argeo.app.ui.rap/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.argeo.app.ui.rap</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.argeo.app.ui.rap/META-INF/.gitignore b/org.argeo.app.ui.rap/META-INF/.gitignore
deleted file mode 100644
index 4854a41..0000000
--- a/org.argeo.app.ui.rap/META-INF/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF
diff --git a/org.argeo.app.ui.rap/OSGI-INF/cmsWebApp.xml b/org.argeo.app.ui.rap/OSGI-INF/cmsWebApp.xml
deleted file mode 100644
index 4f807c1..0000000
--- a/org.argeo.app.ui.rap/OSGI-INF/cmsWebApp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" name="Argeo Suite Web App">
-   <implementation class="org.argeo.cms.web.CmsWebApp"/>
-   <property name="contextName" type="String" value="argeo"/>
-   <reference bind="setCmsApp" cardinality="1..1" interface="org.argeo.api.cms.CmsApp" name="CmsApp" policy="dynamic" target="(service.pid=argeo.suite.ui.app)" unbind="unsetCmsApp"/>
-   <reference bind="setEventAdmin" cardinality="1..1" interface="org.osgi.service.event.EventAdmin" name="EventAdmin" policy="static"/>
-</scr:component>
diff --git a/org.argeo.app.ui.rap/bnd.bnd b/org.argeo.app.ui.rap/bnd.bnd
deleted file mode 100644
index 140b5e0..0000000
--- a/org.argeo.app.ui.rap/bnd.bnd
+++ /dev/null
@@ -1,6 +0,0 @@
-Service-Component: OSGI-INF/cmsWebApp.xml
-
-Import-Package:\
-org.argeo.cms.web;resolution:=optional,\
-org.eclipse.rap.rwt.application;resolution:=optional,\
-*;resolution:=optional
diff --git a/org.argeo.app.ui.rap/build.properties b/org.argeo.app.ui.rap/build.properties
deleted file mode 100644
index 6210e84..0000000
--- a/org.argeo.app.ui.rap/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/
-source.. = src/
diff --git a/org.argeo.app.ui.rap/src/.gitignore b/org.argeo.app.ui.rap/src/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/org.argeo.app.ui/config/cmsApp.properties b/org.argeo.app.ui/config/cmsApp.properties
index 1dec00e..6735f81 100644
--- a/org.argeo.app.ui/config/cmsApp.properties
+++ b/org.argeo.app.ui/config/cmsApp.properties
@@ -1,3 +1,5 @@
 service.pid=argeo.suite.ui.app
 
-event.topics=argeo/suite/*
\ No newline at end of file
+event.topics=argeo/suite/*
+
+argeo.cms.app.contextName=argeo
\ No newline at end of file
diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
index e4d40cf..f6770db 100644
--- a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
@@ -122,8 +122,9 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
 
 	public void destroy(Map<String, Object> properties) {
 		for (SuiteUi ui : managedUis.values())
-			if (!ui.isDisposed())
-				ui.dispose();
+			if (!ui.isDisposed()) {
+				ui.getDisplay().syncExec(() -> ui.dispose());
+			}
 		if (log.isDebugEnabled())
 			log.info("Argeo Suite App stopped");
 
diff --git a/sdk/argeo-suite-rap.properties b/sdk/argeo-suite-rap.properties
index 2b8edd3..fbcc677 100644
--- a/sdk/argeo-suite-rap.properties
+++ b/sdk/argeo-suite-rap.properties
@@ -10,6 +10,7 @@ org.apache.tika.parsers
 
 argeo.osgi.start.3.node=\
 org.argeo.cms,\
+org.argeo.cms.ui.rap,\
 org.argeo.cms.jcr,\
 org.argeo.cms.servlet,\
 
@@ -17,7 +18,6 @@ argeo.osgi.start.5.suite=\
 org.argeo.app.core,\
 org.argeo.app.ui,\
 org.argeo.app.theme.default,\
-org.argeo.app.ui.rap
 
 argeo.osgi.start.6.suite=\
 org.argeo.app.servlet.publish,\
diff --git a/sdk/argeo-suite-rcp.properties b/sdk/argeo-suite-rcp.properties
index 48fa221..ea6457e 100644
--- a/sdk/argeo-suite-rcp.properties
+++ b/sdk/argeo-suite-rcp.properties
@@ -10,6 +10,7 @@ org.apache.tika.parsers
 argeo.osgi.start.3.node=\
 org.argeo.cms,\
 org.argeo.cms.jcr,\
+org.argeo.cms.servlet,\
 org.argeo.cms.ui.rcp
 
 argeo.osgi.start.5.suite=\
@@ -24,7 +25,7 @@ org.argeo.app.servlet.odk
 
 # Local
 argeo.node.repo.type=h2
-org.osgi.service.http.port=7070
+org.osgi.service.http.port=0
 #org.osgi.service.http.port.secure=7073
 
 #argeo.node.useradmin.uris=ldap://cn=Directory%20Manager:argeoargeo@localhost:10389/dc=example,dc=com
-- 
2.30.2