Adap to changes in Commons

[gpl/argeo-slc.git] / dist / slc / src / main / rpm / etc / slc / config.ini

diff --git a/dist/slc/src/main/rpm/etc/slc/config.ini b/dist/slc/src/main/rpm/etc/slc/config.ini
index 88b47b216abfee2e8ac1970411450ef11909a64c..e6897b5d1e0de8b3895ee2b127fc4f2da93061c1 100644 (file)
--- a/dist/slc/src/main/rpm/etc/slc/config.ini
+++ b/dist/slc/src/main/rpm/etc/slc/config.ini
@@ -1,28 +1,44 @@
-argeo.osgi.start=\
-org.springframework.osgi.extender,\
+# SLC SERVICES
+argeo.osgi.start.1.slc=\
 org.argeo.server.ads.server,\
+
+argeo.osgi.start.2.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,\
+
+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.dep.osgi.catalina.start,\
+org.argeo.server.catalina.start,\
 org.eclipse.equinox.http.registry,\
 org.springframework.osgi.web.extender,\
-org.argeo.slc.node.jackrabbit,\
-org.argeo.slc.support.maven,\
-org.argeo.slc.server.repo,\
-org.argeo.slc.server.repo.webapp,\
-org.argeo.slc.agent,\
-org.argeo.slc.agent.jcr,\
 
+# CONFIGURATION
 org.argeo.security.ui.initialPerspective=org.argeo.security.ui.userHomePerspective
 
+# Note default URL to access the webapp
+# http://localhost:7080/ui/node
+
 # TOMCAT PORTS
 argeo.server.port.http=7080
 argeo.server.port.https=7083
 argeo.server.port.ajp=7089
 
-# LDAP (Apache DS)
+# LDAP (Apache DS, not started by default)
 argeo.ldap.port=7081
 #argeo.ads.init.ldif=osgibundle:init-argeo.ldif
 org.osgi.framework.bootdelegation=com.sun.jndi.ldap
@@ -38,8 +54,7 @@ osgi.noShutdown=true
 osgi.bundles=org.argeo.osgi.boot.jar@start
 argeo.osgi.bundles=\
 /etc/slc/modules;in=*,\
-/usr/share/slc/lib;in=*.jar,\
 /usr/share/osgi;in=*.jar,\
 /usr/share/eclipse-rap;in=*.jar,\
 /usr/share/osgi/eclipse;in=*.jar,\
-/usr/share/osgi/rap;in=*.jar,\
+/usr/share/osgi/rap;in=*.jar,\
\ No newline at end of file