From 8bb6667620a40de39d1e33af4dfc4496e507b78a Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 9 Aug 2022 09:02:56 +0200
Subject: [PATCH] Simplify Argeo Suite launcher

---
 sdk/argeo-suite-rap.properties | 51 ----------------------------------
 sdk/argeo-suite.properties     | 37 ++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 51 deletions(-)
 delete mode 100644 sdk/argeo-suite-rap.properties
 create mode 100644 sdk/argeo-suite.properties

diff --git a/sdk/argeo-suite-rap.properties b/sdk/argeo-suite-rap.properties
deleted file mode 100644
index fbcc677..0000000
--- a/sdk/argeo-suite-rap.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-argeo.osgi.start.2.node=\
-org.eclipse.equinox.http.servlet,\
-org.eclipse.equinox.metatype,\
-org.eclipse.equinox.cm,\
-org.eclipse.rap.rwt.osgi,\
-org.argeo.init
-
-argeo.osgi.start.2.suite=\
-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,\
-
-argeo.osgi.start.5.suite=\
-org.argeo.app.core,\
-org.argeo.app.ui,\
-org.argeo.app.theme.default,\
-
-argeo.osgi.start.6.suite=\
-org.argeo.app.servlet.publish,\
-org.argeo.app.servlet.odk
-
-
-# Local
-argeo.node.repo.type=h2
-org.osgi.service.http.port=7070
-#org.osgi.service.http.port.secure=7073
-
-#argeo.node.useradmin.uris=ldap://cn=Directory%20Manager:argeoargeo@localhost:10389/dc=example,dc=com
-
-argeo.node.init=../../init
-
-argeo.i18n.locales=en,fr
-argeo.i18n.defaultLocale=en
-
-#tika.config=/home/mbaudier/dev/git/gpl/argeo-suite/sdk/exec/argeo-office-e4-rap/data/indexes/node/tika-config.xml
-
-# Logging
-log.org.argeo=DEBUG
-
-# DON'T CHANGE BELOW
-org.eclipse.equinox.http.jetty.autostart=false
-org.osgi.framework.bootdelegation=com.sun.jndi.ldap,\
-com.sun.jndi.ldap.sasl,\
-com.sun.security.jgss,\
-com.sun.jndi.dns,\
-com.sun.nio.file,\
-com.sun.nio.sctp
diff --git a/sdk/argeo-suite.properties b/sdk/argeo-suite.properties
new file mode 100644
index 0000000..ed6317b
--- /dev/null
+++ b/sdk/argeo-suite.properties
@@ -0,0 +1,37 @@
+argeo.osgi.start.2=\
+org.eclipse.equinox.console,\
+org.eclipse.equinox.http.servlet,\
+org.apache.felix.scr,\
+org.eclipse.rap.rwt.osgi,\
+org.apache.tika.parsers,\
+org.argeo.init
+
+argeo.osgi.start.3=\
+org.argeo.cms,\
+org.argeo.cms.swt.rap,\
+org.argeo.cms.swt.rcp,\
+org.argeo.cms.ee,\
+org.argeo.cms.lib.sshd,\
+org.argeo.cms.lib.equinox,\
+org.argeo.cms.lib.jetty,\
+
+argeo.osgi.start.5=\
+org.argeo.cms.jcr,\
+org.argeo.app.core,\
+org.argeo.app.ui,\
+org.argeo.app.theme.default,\
+org.argeo.app.servlet.publish,\
+org.argeo.app.servlet.odk
+
+
+# Local
+argeo.node.repo.type=h2
+argeo.http.port=7070
+
+argeo.directory=dc=example,dc=com
+
+# Logging
+log.org.argeo=DEBUG
+
+# DON'T CHANGE BELOW
+org.eclipse.equinox.http.jetty.autostart=false
-- 
2.30.2