X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fserver%2Forg.argeo.slc.webapp.war%2FWEB-INF%2Fosgi.xml;h=95ebcea88fb8b5117f6d74edd94e1693cb0eb050;hb=96efcbec27e3313d13c244437f31418d8bb2d3b9;hp=a75bac77a67301a1c3c021a0ac73599b57482d4b;hpb=a1d6d94ee6dd016448e1d38336ddebd0acac583e;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 a75bac77a..95ebcea88 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
@@ -6,6 +6,9 @@
        http://www.springframework.org/schema/beans   
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
+	<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"
@@ -17,22 +20,27 @@
 	<reference interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"
 		id="slcAgentDescriptorDao" />
 
-	<reference interface="org.hibernate.SessionFactory" id="sessionFactory" />
+	<reference id="osivInterceptor"
+		interface="org.springframework.web.context.request.WebRequestInterceptor" />
+	<!--
+
 
+		<reference interface="org.hibernate.SessionFactory"
+		id="sessionFactory" />
+	-->
 	<!--
 		<reference interface="org.argeo.slc.execution.ExecutionModulesManager"
 		id="modulesManager" />
 	-->
-	<reference id="testManagerService"
-		interface="org.argeo.slc.services.test.TestManagerService" />
-	<reference id="agentService" interface="org.argeo.slc.services.runtime.AgentService" />
-	<reference id="slcExecutionService"
-		interface="org.argeo.slc.services.process.SlcExecutionService" />
+	<reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />
+	<reference id="agentService" interface="org.argeo.slc.services.AgentService" />
+	<reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />
+	<!--
 
-	<reference id="hibernateTransactionManager"
+		<reference id="hibernateTransactionManager"
 		interface="org.springframework.transaction.PlatformTransactionManager"
 		bean-name="hibernateTransactionManager" />
-
+	-->
 	<reference id="agentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" />
 
 	<reference id="eventListener" interface="org.argeo.slc.msg.event.SlcEventListener" />
@@ -43,5 +51,23 @@
 	<!-- Runtime -->
 	<reference id="dynamicRuntime" interface="org.argeo.slc.deploy.DynamicRuntime" />
 
+	<!-- Provisioning -->
+	<set id="modularDistributions" interface="org.argeo.slc.build.ModularDistribution"
+		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" />
 
 </beans:beans>
\ No newline at end of file