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 c927c4472bac6b6c86480824f6faf218a738d0bc..c04eea2a74e2d829ff13916030e23f7c480a4bb1 100644 (file)
--- 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 9e0875511240da7600ab4eaba493793d3503b0ce..4f95f9dc533e26ef107734016518f62b19c7950b 100644 (file)
--- 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 369c822c25f50f5b5304602beaf1a857a7c03402..dd1c902f511ca7904e0135f93b26220c503d93b9 100644 (file)
--- 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>