Improve default config

diff --git a/demo/argeo_node_rap.properties b/demo/argeo_node_rap.properties
index 3a7c093bde90e91b84ded967c301eabc4a8d2065..b8169e3f0fa36dcfc06cc2ef8c4d693eff329134 100644 (file)
--- a/demo/argeo_node_rap.properties
+++ b/demo/argeo_node_rap.properties
@@ -8,11 +8,9 @@ org.eclipse.rap.rwt.osgi
 argeo.osgi.start.3.node=\
 org.argeo.cms
 
-argeo.osgi.start.4.apps=\
-org.eclipse.gemini.blueprint.extender
-
-argeo.osgi.start.4.workbench=\
+argeo.osgi.start.4.eclipse3=\
 org.eclipse.equinox.http.registry,\
+org.eclipse.gemini.blueprint.extender
 
 #argeo.osgi.start.5.web=\
 #org.argeo.cms.demo,\

diff --git a/dist/argeo-node/base/etc/argeo/argeo.ini b/dist/argeo-node/base/etc/argeo/argeo.ini
index 527fbf831f2ff15b4e8729a0b4303febfa447d72..2ad878e6deb003cfee1019ecf02139eaa5dbcda9 100644 (file)
--- a/dist/argeo-node/base/etc/argeo/argeo.ini
+++ b/dist/argeo-node/base/etc/argeo/argeo.ini
@@ -3,3 +3,27 @@ org.osgi.service.http.port=8080
 
 ## System management
 osgi.console=2323
+
+## Standalone
+#argeo.node.useradmin.uris=dc=example,dc=com.ldif
+#argeo.node.repo.type=h2
+
+## Deployed
+#argeo.node.useradmin.uris=ldap://cn=Directory%20Manager:argeoargeo@localhost/dc=example,dc=com
+#argeo.node.repo.type=postgresql
+#argeo.node.repo.dburl=jdbc:postgresql://localhost/argeo
+#argeo.node.repo.dbuser=argeo
+#argeo.node.repo.dbpassword=argeo
+
+## Complex user configuration examples
+#argeo.node.useradmin.uris="dc=example,dc=com.ldif dc=example,dc=org.ldif"
+#argeo.node.useradmin.uris="ldap://uid=admin,ou=system:secret@localhost:10389\
+#/dc=example,dc=com?userBase=ou=users&groupBase=ou=groups dc=example,dc=org.ldif"
+
+# Legacy
+#osgi.clean=true
+#java.security.manager=
+#java.security.policy=file:/usr/share/argeo/all.policy
+#argeo.osgi.start.4.eclipse3=\
+#org.eclipse.equinox.http.registry,\
+#org.eclipse.gemini.blueprint.extender