Simplify and improve various configurations

[gpl/argeo-slc.git] / demo / slc_demo_rap.properties

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index 912d04ff6dc3701d03d722919f34568365a090f9..38c361371460ee86b5a2ef556930db4d9bc334f1 100644 (file)
--- a/demo/slc_demo_rap.properties
+++ b/demo/slc_demo_rap.properties
@@ -1,47 +1,41 @@
-# SLC SERVICES
-argeo.osgi.start.1.slc=\
-org.argeo.server.ads.server,\
+argeo.osgi.start.2.node=\
+org.argeo.cms,\
+
+argeo.osgi.start.3.http=\
+org.eclipse.equinox.http.servlet,\
+org.eclipse.equinox.http.jetty
 
-argeo.osgi.start.2.slc=\
+argeo.osgi.start.4.apps=\
+org.eclipse.rap.rwt.osgi,\
+org.eclipse.gemini.blueprint.extender
+
+argeo.osgi.start.4.workbench=\
+org.eclipse.equinox.http.registry,\
+
+argeo.osgi.start.5.slc=\
 org.argeo.slc.node.jackrabbit,\
-org.argeo.slc.support.maven,\
-org.argeo.slc.server.repo,\
 org.argeo.slc.agent,\
 org.argeo.slc.agent.jcr,\
+org.argeo.slc.server.repo,\
 
-argeo.osgi.start.3.slc=\
-org.argeo.slc.server.repo.webapp,\
-
-# NODE SERVICES
-argeo.osgi.start.1.node=\
-org.springframework.osgi.extender,\
-
-argeo.osgi.start.2.node=\
-org.argeo.node.repo.jackrabbit,\
-org.argeo.security.dao.ldap,\
 
-argeo.osgi.start.3.node=\
-org.argeo.jackrabbit.webapp,\
-org.argeo.server.rap.webapp,\
-org.argeo.server.catalina.start,\
-org.eclipse.equinox.http.registry,\
-org.springframework.osgi.web.extender,\
+org.osgi.service.http.port=7070
+org.eclipse.equinox.http.jetty.log.stderr.threshold=info
 
+log4j.configuration=file:../../log4j.properties
+org.eclipse.rap.workbenchAutostart=false
 
 slc.executionModules=org.argeo.slc.demo.ant,\
 org.argeo.slc.demo.basic,\
 org.argeo.slc.demo.minimal,\
 
-#org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.slcExecutionPerspective
-#org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.dist.distributionPerspective
-org.argeo.security.ui.initialPerspective=org.argeo.security.ui.userHomePerspective
-
-#spring.security.strategy=MODE_INHERITABLETHREADLOCAL
+org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.dist.distributionPerspective
 
-# LDAP (Apache DS)
-#argeo.ads.init.ldif=osgibundle:init-argeo.ldif
+#argeo.server.tomcat.config=conf/default-server-ssl.xml
 
-log4j.configuration=file:../../log4j.properties
+# override ports to run the demo as a server
+argeo.server.port.http=7070
+#argeo.server.port.https=9073
 
 # DON'T CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING
 eclipse.ignoreApp=true