Improve JCR

[gpl/argeo-slc.git] / modules / server / org.argeo.slc.webapp.war / WEB-INF / osgi.xml

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 c79f6a6eaacc7207f03f4b5d94d0494b33a08f2a..ff56fc2723b74b4f67a5f1edab7d67a934853830 100644 (file)
--- 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   \r
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
+       <reference id="marshaller" interface="org.springframework.oxm.Marshaller" />\r
+       <reference id="unmarshaller" interface="org.springframework.oxm.Unmarshaller" />\r
+\r
        <reference interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"\r
                id="testResultDao" />\r
        <reference interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"\r
@@ -17,22 +20,27 @@
        <reference interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"\r
                id="slcAgentDescriptorDao" />\r
 \r
-       <reference interface="org.hibernate.SessionFactory" id="sessionFactory" />\r
+       <reference id="osivInterceptor"\r
+               interface="org.springframework.web.context.request.WebRequestInterceptor" />\r
+       <!--\r
+\r
 \r
+               <reference interface="org.hibernate.SessionFactory"\r
+               id="sessionFactory" />\r
+       -->\r
        <!--\r
                <reference interface="org.argeo.slc.execution.ExecutionModulesManager"\r
                id="modulesManager" />\r
        -->\r
-       <reference id="testManagerService"\r
-               interface="org.argeo.slc.services.test.TestManagerService" />\r
-       <reference id="agentService" interface="org.argeo.slc.services.runtime.AgentService" />\r
-       <reference id="slcExecutionService"\r
-               interface="org.argeo.slc.services.process.SlcExecutionService" />\r
+       <reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />\r
+       <reference id="agentService" interface="org.argeo.slc.services.AgentService" />\r
+       <reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />\r
+       <!--\r
 \r
-       <reference id="hibernateTransactionManager"\r
+               <reference id="hibernateTransactionManager"\r
                interface="org.springframework.transaction.PlatformTransactionManager"\r
                bean-name="hibernateTransactionManager" />\r
-\r
+       -->\r
        <reference id="agentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" />\r
 \r
        <reference id="eventListener" interface="org.argeo.slc.msg.event.SlcEventListener" />\r
@@ -47,4 +55,15 @@
        <set id="modularDistributions" interface="org.argeo.slc.build.ModularDistribution"\r
                cardinality="0..N" />\r
 \r
+       <!-- Security -->\r
+       <!--\r
+               <reference id="authenticationEntryPoint"\r
+               interface="org.springframework.security.ui.AuthenticationEntryPoint"\r
+               />\r
+       -->\r
+       <reference id="_authenticationManager"\r
+               interface="org.springframework.security.AuthenticationManager" />\r
+       <reference id="userDetailsService"\r
+               interface="org.springframework.security.userdetails.UserDetailsService" />\r
+\r
 </beans:beans>
\ No newline at end of file