From 50d86e6ef8136211a41553d36a6ff2a93f2d09de Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Mon, 8 Nov 2010 15:14:33 +0000
Subject: [PATCH] some new comments in xml mapping files.

git-svn-id: https://svn.argeo.org/slc/trunk@3856 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.slc.webapp.war/WEB-INF/osgi.xml | 81 ++++++++++---------
 .../WEB-INF/slc-service-servlet.xml           | 32 ++++----
 2 files changed, 59 insertions(+), 54 deletions(-)

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 95ebcea88..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,44 +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" />
+	<!-- 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 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.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" />
@@ -56,11 +36,6 @@
 		cardinality="0..N" />
 
 	<!-- Security -->
-	<!--
-		<reference id="authenticationEntryPoint"
-		interface="org.springframework.security.ui.AuthenticationEntryPoint"
-		/>
-	-->
 	<reference id="_authenticationManager"
 		interface="org.springframework.security.AuthenticationManager" />
 	<reference id="userDetailsService"
@@ -70,4 +45,34 @@
 	<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
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 5f84ad754..73d854d7c 100644
--- 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">
-- 
2.39.2