From: Bruno Sinou <bsinou@argeo.org>
Date: Thu, 11 Dec 2014 16:57:06 +0000 (+0000)
Subject: fix rap demo, remove LDAP plugin dependencies from the node default target plateform
X-Git-Tag: argeo-commons-2.1.30~491
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=af31868bf2f900d275ca6c00f36825e8da04447a;p=lgpl%2Fargeo-commons.git

fix rap demo, remove LDAP plugin dependencies from the node default target plateform

git-svn-id: https://svn.argeo.org/commons/trunk@7566 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/demo/argeo_node_rap.properties b/demo/argeo_node_rap.properties
index c927c4472..c04eea2a7 100644
--- a/demo/argeo_node_rap.properties
+++ b/demo/argeo_node_rap.properties
@@ -1,5 +1,5 @@
 argeo.osgi.start.1.node=\
-org.springframework.osgi.extender,\
+org.springframework.osgi.extender
 
 #org.argeo.server.ads.server,\
 
@@ -20,21 +20,22 @@ org.eclipse.equinox.http.registry,\
 #org.eclipse.rap.ui,\
 #org.eclipse.rap.ui.workbench,\
 
-# Jetty
-org.osgi.service.http.port=7070
-org.eclipse.equinox.http.jetty.log.stderr.threshold=info
-org.eclipse.equinox.http.jetty.context.path=/ui
-
-# Initial perspective
-log4j.configuration=file:../../log4j.properties
-argeo.server.tomcat.config=conf/default-server-ssl.xml
-
 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
+
+#osgi.noShutdown=true
+#eclipse.ignoreApp=true
+#argeo.server.tomcat.config=conf/default-server-ssl.xml
+
+# 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
@@ -47,5 +48,5 @@ eclipse.ignoreApp=true
 # Equinox (not active by default)
 #osgi.console=3030
 
-# Note default URL to access the webapp
+# Note: Default URL to access the webapp
 # http://localhost:7070/ui/node
\ No newline at end of file
diff --git a/dep/org.argeo.security.dep.node.rap/pom.xml b/dep/org.argeo.security.dep.node.rap/pom.xml
index 9e0875511..4f95f9dc5 100644
--- a/dep/org.argeo.security.dep.node.rap/pom.xml
+++ b/dep/org.argeo.security.dep.node.rap/pom.xml
@@ -59,10 +59,10 @@
 			<version>2.1.12-SNAPSHOT</version>
 			<type>pom</type>
 			<exclusions>
-				<exclusion>
+				<!--  <exclusion>
 					<groupId>org.argeo.commons</groupId>
 					<artifactId>org.argeo.security.dao.jackrabbit</artifactId>
-				</exclusion>
+				</exclusion>  -->
 				<exclusion>
 					<groupId>org.argeo.commons</groupId>
 					<artifactId>org.argeo.security.dao.os</artifactId>
diff --git a/dep/org.argeo.security.dep.node/pom.xml b/dep/org.argeo.security.dep.node/pom.xml
index 369c822c2..dd1c902f5 100644
--- a/dep/org.argeo.security.dep.node/pom.xml
+++ b/dep/org.argeo.security.dep.node/pom.xml
@@ -162,23 +162,13 @@
 		</dependency>
 
 		<!-- Security (LDAP) -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.dao.ldap</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.auth.ldap</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ldap</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-		</dependency>
-
-		<!-- Security (Jackrabbit) -->
+		<!-- Reduce size of minimal: LDAP secutity plugin must be explicitely added using the 3 dependencies below.  -->
+	<!-- <dependency> <groupId>org.argeo.commons</groupId> <artifactId>org.argeo.security.dao.ldap</artifactId> 
+		<version>2.1.12-SNAPSHOT</version> </dependency> <dependency> <groupId>org.argeo.commons</groupId> 
+		<artifactId>org.argeo.security.auth.ldap</artifactId> <version>2.1.12-SNAPSHOT</version> 
+		</dependency> <dependency> <groupId>org.argeo.commons</groupId> <artifactId>org.argeo.security.ldap</artifactId> 
+		<version>2.1.12-SNAPSHOT</version> </dependency> -->
+	<!-- Security (Jackrabbit) -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.security.dao.jackrabbit</artifactId>