Remove default agent logger

[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 a75bac77a67301a1c3c021a0ac73599b57482d4b..1e2ce107770a982b9c5406d00e5acdb506aeed63 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,42 +6,73 @@
        http://www.springframework.org/schema/beans   \r
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\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
-               id="testResultCollectionDao" />\r
-       <reference interface="org.argeo.slc.dao.test.TestRunDescriptorDao"\r
-               id="testRunDescriptorDao" />\r
-       <reference interface="org.argeo.slc.dao.process.SlcExecutionDao"\r
-               id="slcExecutionDao" />\r
-       <reference interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"\r
-               id="slcAgentDescriptorDao" />\r
-\r
-       <reference interface="org.hibernate.SessionFactory" id="sessionFactory" />\r
+       <reference id="marshaller" interface="org.springframework.oxm.Marshaller" />\r
+       <reference id="unmarshaller" interface="org.springframework.oxm.Unmarshaller" />\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
-\r
-       <reference id="hibernateTransactionManager"\r
-               interface="org.springframework.transaction.PlatformTransactionManager"\r
-               bean-name="hibernateTransactionManager" />\r
+       <!-- DAO -->\r
+       <reference id="testResultDao" interface="org.argeo.slc.dao.test.tree.TreeTestResultDao" />\r
+       <reference id="testResultCollectionDao"\r
+               interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao" />\r
+       <reference id="testRunDescriptorDao" interface="org.argeo.slc.dao.test.TestRunDescriptorDao" />\r
+       <reference id="slcExecutionDao" interface="org.argeo.slc.dao.process.SlcExecutionDao" />\r
+       <reference id="slcAgentDescriptorDao"\r
+               interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao" />\r
 \r
+       <!--  Services -->\r
+       <reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />\r
+       <reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />\r
        <reference id="agentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" />\r
-\r
-       <reference id="eventListener" interface="org.argeo.slc.msg.event.SlcEventListener" />\r
-\r
        <reference id="attachmentsStorage"\r
                interface="org.argeo.slc.core.attachment.AttachmentsStorage" />\r
+       \r
+       <!-- Events -->\r
+       <reference id="eventListener" interface="org.argeo.slc.msg.event.SlcEventListener" />\r
 \r
        <!-- Runtime -->\r
        <reference id="dynamicRuntime" interface="org.argeo.slc.deploy.DynamicRuntime" />\r
 \r
+       <!-- Provisioning -->\r
+       <set id="modularDistributions" interface="org.argeo.slc.build.ModularDistribution"\r
+               cardinality="0..N" />\r
+\r
+       <!-- Security -->\r
+       <reference id="_authenticationManager"\r
+               interface="org.springframework.security.AuthenticationManager" />\r
+       <reference id="userDetailsService"\r
+               interface="org.springframework.security.userdetails.UserDetailsService" />\r
+\r
+       <!-- Optional reference to JCR repository -->\r
+       <reference id="jcrRepository" interface="javax.jcr.Repository"\r
+               cardinality="0..1" />\r
+\r
+       <reference id="osivInterceptor"\r
+               interface="org.springframework.web.context.request.WebRequestInterceptor" />\r
+\r
+       <!--\r
+               <reference id="authenticationEntryPoint"\r
+               interface="org.springframework.security.ui.AuthenticationEntryPoint"\r
+               />\r
+       -->\r
+\r
+       <!--\r
+               <reference id="agentService"\r
+               interface="org.argeo.slc.services.AgentService" />\r
+       -->\r
+       <!--\r
+\r
+               <reference id="hibernateTransactionManager"\r
+               interface="org.springframework.transaction.PlatformTransactionManager"\r
+               bean-name="hibernateTransactionManager" />\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
+\r
 \r
 </beans:beans>
\ No newline at end of file