X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fserver%2Forg.argeo.slc.server.main%2FMETA-INF%2Fspring%2Fmain.xml;h=e625491e9c7db6afa0f006a5f6644fbe99d74307;hb=0ebe6753b6569ff52b4ba86cd61c6e08a19e0c5f;hp=927a928a8e49b3c7f8d4507d07ebc60a8b858914;hpb=09ff0d0df8ec9de2ebcb3dc475e7b03aa4f47059;p=gpl%2Fargeo-slc.git

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 927a928a8..e625491e9 100644
--- 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,25 +6,38 @@
        http://www.springframework.org/schema/beans   
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<bundle id="activemq.broker" symbolic-name="org.argeo.slc.server.activemq.broker"
+	<!-- Security -->
+	<bundle id="security.ldap" symbolic-name="org.argeo.security.manager.ldap"
 		action="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" />
 
+	<!-- 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" />
-	<bundle id="webapp" symbolic-name="org.argeo.slc.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" />
 
 </beans:beans>
\ No newline at end of file