Start security services instead of core

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

diff --git a/demo/site/org.argeo.slc.demo.log4j/log4j.properties b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
index c595b141160f55a11f10da1e9240c1e5b96043a8..293b4b9a6490fd4bd2d1425c4dbcab4b5603b932 100644 (file)
--- a/demo/site/org.argeo.slc.demo.log4j/log4j.properties
+++ b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
@@ -8,6 +8,7 @@ log4j.logger.org.argeo.slc.execution.SimpleExecutionSpec=DEBUG
 
 #log4j.logger.org.argeo.slc.web.mvc=TRACE
 #log4j.logger.org.argeo.slc.jms=TRACE
+#log4j.logger.org.argeo.server.json=TRACE
 
 log4j.logger.org.hibernate=WARN
 
@@ -15,6 +16,7 @@ log4j.logger.org.springframework=WARN
 #log4j.logger.org.springframework.web=DEBUG
 #log4j.logger.org.springframework.jms=WARN
 #log4j.logger.org.springframework.security=WARN
+#log4j.logger.org.springframework.osgi.web=TRACE
 
 log4j.logger.org.apache.activemq=WARN
 log4j.logger.org.apache.activemq.transport=WARN

diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index 9caf13347d04d5ef02faa3487bfb244a31d20921..d9cda3b5be39ec32cb190011ab63c9ac9180a328 100644 (file)
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
@@ -59,6 +60,8 @@
                                                                <arg>-clean</arg>
                                                        </argsToAppend>
                                                        <systemProperties>
+                                                               <!-- Make sure that no bundle will be started -->
+                                                               <argeo.osgi.start>XXX</argeo.osgi.start>
                                                                <argeo.osgi.bundles>
                                                                        ${basedir}/target;in=*.jar,
                                                                </argeo.osgi.bundles>

diff --git a/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml b/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml
index a992015aefb784721f6e1814adf2781af5027f48..83468060ece7228663079aca3aadb4c99da2339f 100644 (file)
--- a/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml
+++ b/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml
@@ -9,7 +9,7 @@
        <!-- Security -->
        <bundle id="security.ldap" symbolic-name="org.argeo.security.manager.ldap"
                action="start" />
-       <bundle id="security.services" symbolic-name="org.argeo.security.core"
+       <bundle id="security.services" symbolic-name="org.argeo.security.services"
                action="start" />
 
        <!-- Servers -->