Start security services instead of core

[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 6c4b88f913cdfc4aecd61e45655a685b44a73b94..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
@@ -6,17 +6,40 @@
        http://www.springframework.org/schema/beans   
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-       <bundle id="spring.osgi.web.extender" symbolic-name="org.springframework.osgi.web.extender"
+       <!-- Security -->
+       <bundle id="security.ldap" symbolic-name="org.argeo.security.manager.ldap"
                action="start" />
-       <bundle id="catalina" symbolic-name="org.argeo.dep.osgi.catalina.start"
+       <bundle id="security.services" symbolic-name="org.argeo.security.services"
+               action="start" />
+
+       <!-- 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"
                action="start" />
-       <bundle id="webapp" symbolic-name="org.argeo.slc.webapp" action="start" />
+
+       <!-- Web -->
+       <bundle id="spring.osgi.web.extender" symbolic-name="org.springframework.osgi.web.extender"
+               action="start" />
+       <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" />
+       <bundle id="slc.webapp" symbolic-name="org.argeo.slc.webapp"
+               action="start" />
+
 </beans:beans>
\ No newline at end of file