X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fserver%2Forg.argeo.slc.webapp.war%2FWEB-INF%2Fosgi.xml;h=1e2ce107770a982b9c5406d00e5acdb506aeed63;hb=3a6066d4fd26668f2a6e8690f15034bc3b6c6bd1;hp=d7dde2d34d92e1c5f044efd1a140004391667b4b;hpb=ef9526b977a7cd42bafa433ec6739ec09f0f2a7d;p=gpl%2Fargeo-slc.git

diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml
index d7dde2d34..1e2ce1077 100644
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml
@@ -9,37 +9,24 @@
 	<reference id="marshaller" interface="org.springframework.oxm.Marshaller" />
 	<reference id="unmarshaller" interface="org.springframework.oxm.Unmarshaller" />
 
-	<reference interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"
-		id="testResultDao" />
-	<reference interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"
-		id="testResultCollectionDao" />
-	<reference interface="org.argeo.slc.dao.test.TestRunDescriptorDao"
-		id="testRunDescriptorDao" />
-	<reference interface="org.argeo.slc.dao.process.SlcExecutionDao"
-		id="slcExecutionDao" />
-	<reference interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"
-		id="slcAgentDescriptorDao" />
-
-	<reference interface="org.hibernate.SessionFactory" id="sessionFactory" />
+	<!-- DAO -->
+	<reference id="testResultDao" interface="org.argeo.slc.dao.test.tree.TreeTestResultDao" />
+	<reference id="testResultCollectionDao"
+		interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao" />
+	<reference id="testRunDescriptorDao" interface="org.argeo.slc.dao.test.TestRunDescriptorDao" />
+	<reference id="slcExecutionDao" interface="org.argeo.slc.dao.process.SlcExecutionDao" />
+	<reference id="slcAgentDescriptorDao"
+		interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao" />
 
-	<!--
-		<reference interface="org.argeo.slc.execution.ExecutionModulesManager"
-		id="modulesManager" />
-	-->
-	<reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />
-	<reference id="agentService" interface="org.argeo.slc.services.AgentService" />
+	<!--  Services -->
 	<reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />
-
-	<reference id="hibernateTransactionManager"
-		interface="org.springframework.transaction.PlatformTransactionManager"
-		bean-name="hibernateTransactionManager" />
-
+	<reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />
 	<reference id="agentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" />
-
-	<reference id="eventListener" interface="org.argeo.slc.msg.event.SlcEventListener" />
-
 	<reference id="attachmentsStorage"
 		interface="org.argeo.slc.core.attachment.AttachmentsStorage" />
+	
+	<!-- Events -->
+	<reference id="eventListener" interface="org.argeo.slc.msg.event.SlcEventListener" />
 
 	<!-- Runtime -->
 	<reference id="dynamicRuntime" interface="org.argeo.slc.deploy.DynamicRuntime" />
@@ -49,9 +36,43 @@
 		cardinality="0..N" />
 
 	<!-- Security -->
-	<!-- <reference id="authenticationEntryPoint"
-		interface="org.springframework.security.ui.AuthenticationEntryPoint" />-->
 	<reference id="_authenticationManager"
 		interface="org.springframework.security.AuthenticationManager" />
+	<reference id="userDetailsService"
+		interface="org.springframework.security.userdetails.UserDetailsService" />
+
+	<!-- Optional reference to JCR repository -->
+	<reference id="jcrRepository" interface="javax.jcr.Repository"
+		cardinality="0..1" />
+
+	<reference id="osivInterceptor"
+		interface="org.springframework.web.context.request.WebRequestInterceptor" />
+
+	<!--
+		<reference id="authenticationEntryPoint"
+		interface="org.springframework.security.ui.AuthenticationEntryPoint"
+		/>
+	-->
+
+	<!--
+		<reference id="agentService"
+		interface="org.argeo.slc.services.AgentService" />
+	-->
+	<!--
+
+		<reference id="hibernateTransactionManager"
+		interface="org.springframework.transaction.PlatformTransactionManager"
+		bean-name="hibernateTransactionManager" />
+	-->
+
+	<!--
+		<reference interface="org.hibernate.SessionFactory"
+		id="sessionFactory" />
+	-->
+	<!--
+		<reference interface="org.argeo.slc.execution.ExecutionModulesManager"
+		id="modulesManager" />
+	-->
+
 
 </beans:beans>
\ No newline at end of file