From 361f488e6ccd3efa1b1130c6b166a485430fb949 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 26 Jan 2015 21:29:35 +0000
Subject: [PATCH] Improve properties files

git-svn-id: https://svn.argeo.org/commons/trunk@7708 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/argeo_node_cms.properties | 28 ++++--------------
 demo/argeo_node_rap.properties | 52 +++++++---------------------------
 2 files changed, 15 insertions(+), 65 deletions(-)

diff --git a/demo/argeo_node_cms.properties b/demo/argeo_node_cms.properties
index 45826958b..a090b89ba 100644
--- a/demo/argeo_node_cms.properties
+++ b/demo/argeo_node_cms.properties
@@ -1,37 +1,19 @@
-#argeo.osgi.start.1.node=\
-#org.eclipse.gemini.blueprint.extender
-
-#argeo.osgi.start.3.node=\
-#org.argeo.security.dao.jackrabbit,\
-
-#org.argeo.node.repo.jackrabbit,\
-
-argeo.osgi.start.2.node.rap=\
+argeo.osgi.start.2.node=\
 org.eclipse.equinox.http.servlet,\
 org.eclipse.equinox.http.jetty,\
 org.eclipse.rap.rwt.osgi
 
-argeo.osgi.start.3.cms=\
+argeo.osgi.start.3.node=\
 org.argeo.cms,\
 
 argeo.osgi.start.4.node=\
 org.eclipse.gemini.blueprint.extender
 
-argeo.osgi.start.5.cms=\
-org.argeo.cms.core,\
+#argeo.osgi.start.5.cms=\
+#org.argeo.cms.demo,\
 
-
-# Jetty
 org.osgi.service.http.port=7070
 org.eclipse.equinox.http.jetty.log.stderr.threshold=info
 
 log4j.configuration=file:../../log4j.properties
-osgi.console.enable.builtin=true
-
-# Tomcat
-#argeo.server.port.http=7070
-#argeo.server.port.https=7443
-#argeo.server.port.ajp=7009
-
-# Note default URL to access the webapp
-# http://localhost:7070/about
\ No newline at end of file
+osgi.console.enable.builtin=true
\ No newline at end of file
diff --git a/demo/argeo_node_rap.properties b/demo/argeo_node_rap.properties
index 88d9c9785..9f780b7ae 100644
--- a/demo/argeo_node_rap.properties
+++ b/demo/argeo_node_rap.properties
@@ -1,53 +1,21 @@
-argeo.osgi.start.5.node=\
-org.eclipse.gemini.blueprint.extender
-
-#org.argeo.server.ads.server,\
-
-#argeo.osgi.start.3.node=\
-#org.argeo.node.repo.jackrabbit,\
-#org.argeo.security.dao.jackrabbit
-
-#org.argeo.security.dao.ldap,\
-
-argeo.osgi.start.4.node.rap=\
+argeo.osgi.start.2.node=\
+org.eclipse.equinox.http.servlet,\
 org.eclipse.equinox.http.jetty,\
-org.eclipse.rap.rwt.osgi,\
+org.eclipse.rap.rwt.osgi
 
-argeo.osgi.start.5.node.rap=\
+argeo.osgi.start.3.node=\
 org.argeo.cms,\
 org.eclipse.equinox.http.registry,\
 
-#argeo.osgi.start.5.workbench=\
-#org.eclipse.rap.ui,\
-#org.eclipse.rap.ui.workbench,\
-
-argeo.i18n.availableLocales=en,fr,de,ru,ar
-eclipse.registry.MultiLanguage=true
-
-# Various config 
-log4j.configuration=file:../../log4j.properties
-
-osgi.console.enable.builtin=true
-
-#osgi.noShutdown=true
-#eclipse.ignoreApp=true
-#argeo.server.tomcat.config=conf/default-server-ssl.xml
+argeo.osgi.start.4.node=\
+org.eclipse.gemini.blueprint.extender
 
-# Jetty
 org.osgi.service.http.port=7070
 org.eclipse.equinox.http.jetty.log.stderr.threshold=info
 org.eclipse.equinox.http.jetty.context.path=/ui
 
-# Tomcat
-#argeo.server.port.http=7070
-#argeo.server.port.https=7443
-#argeo.server.port.ajp=7009
-
-# Apache Directory Server
-#argeo.ldap.port=10389
-
-# Equinox (not active by default)
-#osgi.console=3030
+argeo.i18n.availableLocales=en,fr,de,ru,ar
+eclipse.registry.MultiLanguage=true
 
-# Note: Default URL to access the webapp
-# http://localhost:7070/ui/node
\ No newline at end of file
+log4j.configuration=file:../../log4j.properties
+osgi.console.enable.builtin=true
\ No newline at end of file
-- 
2.30.2