some new comments in xml mapping files.

git-svn-id: https://svn.argeo.org/slc/trunk@3856 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 95ebcea88fb8b5117f6d74edd94e1693cb0eb050..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
@@ -9,44 +9,24 @@
        <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
-               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
+       <!-- 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
-       <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" interface="org.argeo.slc.services.TestManagerService" />\r
-       <reference id="agentService" interface="org.argeo.slc.services.AgentService" />\r
+       <!--  Services -->\r
        <reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />\r
-       <!--\r
-\r
-               <reference id="hibernateTransactionManager"\r
-               interface="org.springframework.transaction.PlatformTransactionManager"\r
-               bean-name="hibernateTransactionManager" />\r
-       -->\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
@@ -56,11 +36,6 @@
                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
@@ -70,4 +45,34 @@
        <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

diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
index 5f84ad75450bcb3cff81edc23531d82f5f3a4af5..73d854d7c96ba34d7ef3112d2b06e970dc537aef 100644 (file)
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
@@ -14,6 +14,22 @@
                <property name="dynamicRuntime" ref="dynamicRuntime" />
        </bean>
 
+       <!-- Agent Handling -->
+       <bean class="org.argeo.slc.web.mvc.controllers.AgentController">
+               <property name="slcAgentDescriptorDao" ref="slcAgentDescriptorDao" />
+       </bean>
+
+       <!--  Events  -->
+       <bean class="org.argeo.slc.web.mvc.controllers.EventController">
+               <property name="eventListenerRegister" ref="eventListenerRegister" />
+               <property name="eventListener" ref="eventListener" />
+       </bean>
+
+       <bean name="eventListenerRegister" class="org.argeo.slc.web.mvc.WebSlcEventListenerRegister"
+               scope="session">
+               <aop:scoped-proxy />
+       </bean>
+
        <!--  Execution  -->
        <bean class="org.argeo.slc.web.mvc.controllers.ProcessController">
                <property name="agentFactory" ref="agentFactory" />
@@ -24,12 +40,6 @@
                <property name="attachmentsStorage" ref="attachmentsStorage" />
        </bean>
 
-       <!--  Events  -->
-       <bean class="org.argeo.slc.web.mvc.controllers.EventController">
-               <property name="eventListenerRegister" ref="eventListenerRegister" />
-               <property name="eventListener" ref="eventListener" />
-       </bean>
-
        <!--  Results Handling -->
        <bean class="org.argeo.slc.web.mvc.controllers.ResultController">
                <property name="treeTestResultDao" ref="testResultDao" />
@@ -38,22 +48,12 @@
                <property name="attachmentsStorage" ref="attachmentsStorage" />
        </bean>
 
-       <!-- Agent Handling -->
-       <bean class="org.argeo.slc.web.mvc.controllers.AgentController">
-               <property name="slcAgentDescriptorDao" ref="slcAgentDescriptorDao" />
-       </bean>
-
        <!-- Provisioning -->
        <bean name="/listModularDistributions.service"
                class="org.argeo.slc.web.mvc.provisioning.ListModularDistributions">
                <property name="modularDistributions" ref="modularDistributions" />
        </bean>
 
-       <bean name="eventListenerRegister" class="org.argeo.slc.web.mvc.WebSlcEventListenerRegister"
-               scope="session">
-               <aop:scoped-proxy />
-       </bean>
-
        <!-- MVC -->
        <bean
                class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping">