Bump to version 0.14.1-SNAPSHOT

[gpl/argeo-slc.git] / modules / server / org.argeo.slc.server.main / META-INF / spring / main.xml

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 393d4dbe8d6bc40299a9fe5835594eeaeb85650b..5a763ad7e3911a3fd992b17b1800e6daa1a5e4a9 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
@@ -7,22 +7,22 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
        <!-- Security -->
-       <bundle id="security.ldap" symbolic-name="org.argeo.security.manager.ldap"
+       <bundle id="security.ldap" symbolic-name="org.argeo.security.dao.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" />
 
-       <!-- SLC Middleware -->
+       <!-- Servers -->
        <bundle id="activemq.broker" symbolic-name="org.argeo.server.activemq.broker"
                action="start" />
+
+       <!-- SLC Middleware -->
        <bundle id="castor" symbolic-name="org.argeo.slc.server.castor"
                action="start" />
        <bundle id="activemq" symbolic-name="org.argeo.slc.server.activemq"
                action="start" />
        <bundle id="agentProxy" symbolic-name="org.argeo.slc.server.agentproxy"
                action="start" />
-       <bundle id="hibernate" symbolic-name="org.argeo.slc.server.hibernate"
-               action="start" />
        <bundle id="services" symbolic-name="org.argeo.slc.server.services"
                action="start" />
        <bundle id="jms" symbolic-name="org.argeo.slc.server.jms"
@@ -34,9 +34,9 @@
        <bundle id="catalina" symbolic-name="org.argeo.dep.osgi.catalina.start"
                action="start" />
 
-       <!--  Web app start order is important! Security should be first -->
-       <bundle id="security.webapp" symbolic-name="org.argeo.security.webapp"
-               action="start" />
+       <!-- Web app start order is important! Security should be first -->
+       <!-- <bundle id="security.webapp" symbolic-name="org.argeo.security.webapp" -->
+       <!-- action="start" /> -->
        <bundle id="slc.webapp" symbolic-name="org.argeo.slc.webapp"
                action="start" />