Adapt to changes in Spring and OSGi (mostly generics)

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

diff --git a/demo/slc_demo_rcp.properties b/demo/slc_demo_rcp.properties
index e711309935274ce0ce4bd0c6d4572b999d4b3903..8a7ff4d16b7df2c8d95b0312c0997dd00b0b78ac 100644 (file)
--- a/demo/slc_demo_rcp.properties
+++ b/demo/slc_demo_rcp.properties
@@ -1,6 +1,5 @@
 argeo.osgi.start=\
 org.springframework.osgi.extender,\
-org.argeo.node.repofactory.jackrabbit,\
 org.argeo.node.repo.jackrabbit,\
 org.argeo.security.dao.os,\
 org.argeo.slc.node.jackrabbit,\
@@ -9,10 +8,10 @@ org.argeo.slc.agent.jcr,\
 org.argeo.slc.support.maven,\
 org.argeo.slc.server.repo,\
 
-# Start internal web server
-#org.argeo.dep.osgi.catalina.start,\
-#org.springframework.osgi.web.extender,\
-#org.argeo.jackrabbit.webapp,\
+argeo.osgi.start.5=org.argeo.server.catalina.start,\
+org.springframework.osgi.web.extender,\
+org.argeo.jackrabbit.webapp,\
+org.argeo.slc.server.repo.webapp,\
 
 slc.executionModules=org.argeo.slc.demo.ant,\
 org.argeo.slc.demo.basic,\
@@ -20,10 +19,17 @@ org.argeo.slc.demo.minimal,\
 
 eclipse.application=org.argeo.slc.client.rcp.application
 org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.slcExecutionPerspective
-#org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.dist.distributionPerspective
 
 log4j.configuration=file:../../log4j.properties
 
+argeo.server.tomcat.config=conf/default-server-ssl.xml
+
+# override ports to run the demo as a server
+# argeo.server.port.http=9070
+# argeo.server.port.https=9073
+# argeo.server.port.ajp=9079 
+# argeo.ldap.port=19389
+
 # in memory
 #argeo.node.repo.configuration=osgibundle:repository-memory.xml