X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fagent%2Forg.argeo.slc.agent.jcr%2FMETA-INF%2Fspring%2Fjcr.xml;h=e886f2e26144777f023d96f7313c4f8047c0f74c;hb=ac38932aab09592c1ec0af26c26899536dff284f;hp=ba5e1e16126dec4bdb38343b926e10453e202d0e;hpb=01aba9d28d7626c71e93773bd568aa78c1cee1c8;p=gpl%2Fargeo-slc.git

diff --git a/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml b/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml
index ba5e1e161..e886f2e26 100644
--- a/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml
+++ b/modules/agent/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml
@@ -3,15 +3,6 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<!-- <bean -->
-	<!-- class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> -->
-	<!-- <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" 
-		/> -->
-	<!-- <property name="locations"> -->
-	<!-- <value>osgibundle:jcr.properties</value> -->
-	<!-- </property> -->
-	<!-- </bean> -->
-
 	<bean id="agent" class="org.argeo.slc.jcr.execution.JcrAgent"
 		init-method="init" destroy-method="dispose">
 		<property name="session" ref="session" />
@@ -21,72 +12,27 @@
 	<bean id="executionModulesListener" class="org.argeo.slc.jcr.execution.JcrExecutionModulesListener"
 		init-method="init" destroy-method="dispose">
 		<property name="agent" ref="agent" />
+		<property name="session">
+			<bean factory-bean="repository" factory-method="login" />
+		</property>
+		<property name="modulesManager" ref="modulesManager" />
+	</bean>
+
+	<bean id="resultListener" class="org.argeo.slc.jcr.execution.JcrResultListener">
 		<property name="session" ref="session" />
 	</bean>
 
+	<bean id="attachmentUploader" class="org.argeo.slc.jcr.execution.JcrAttachmentUploader">
+		<property name="session" ref="session" />
+	</bean>
+
+
 	<bean id="session" class="org.argeo.security.jcr.SecureThreadBoundSession">
 		<property name="repository" ref="repository" />
 	</bean>
 
-	<bean class="org.argeo.security.core.SystemExecutionBeanPostProcessor">
+	<bean
+		class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
 		<property name="authenticationManager" ref="authenticationManager" />
 	</bean>
-
-	<!-- <bean id="slcAgentDescriptorDao" class="org.argeo.slc.jcr.dao.SlcAgentDescriptorDaoJcr" -->
-	<!-- init-method="init"> -->
-	<!-- <property name="session" ref="jcrSession" /> -->
-	<!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="testRunDescriptorDao" class="org.argeo.slc.jcr.dao.TestRunDescriptorDaoJcr" -->
-	<!-- init-method="init"> -->
-	<!-- <property name="session" ref="jcrSession" /> -->
-	<!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="slcExecutionDao" class="org.argeo.slc.jcr.dao.SlcExecutionDaoJcr" -->
-	<!-- init-method="init"> -->
-	<!-- <property name="session" ref="jcrSession" /> -->
-	<!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="nodeMapperProvider" class="org.argeo.slc.jcr.dao.SlcNodeMapperProvider" -->
-	<!-- init-method="init"> -->
-	<!-- <property name="defaultNodeMapper" ref="nodeMapper" /> -->
-	<!-- <property name="treeTestResultNodeMapper" ref="treeTestResultNodeMapper" 
-		/> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="testResultDao" class="org.argeo.slc.jcr.dao.TreeTestResultDaoJcr" -->
-	<!-- init-method="init"> -->
-	<!-- <property name="session" ref="jcrSession" /> -->
-	<!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="testResultCollectionDao" class="org.argeo.slc.jcr.dao.TreeTestResultCollectionDaoJcr" -->
-	<!-- init-method="init"> -->
-	<!-- <property name="session" ref="jcrSession" /> -->
-	<!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="osivInterceptor" -->
-	<!-- class="org.argeo.server.jcr.mvc.OpenSessionInViewJcrInterceptor"> -->
-	<!-- <property name="session" ref="jcrSession" /> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="bundleClassLoader" -->
-	<!-- class="org.springframework.osgi.util.BundleDelegatingClassLoader" -->
-	<!-- factory-method="createBundleClassLoaderFor"> -->
-	<!-- <constructor-arg> -->
-	<!-- <bean factory-bean="bundleContext" factory-method="getBundle" /> -->
-	<!-- </constructor-arg> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="nodeMapper" class="org.argeo.jcr.BeanNodeMapper"> -->
-	<!-- <property name="classLoader" ref="bundleClassLoader" /> -->
-	<!-- </bean> -->
-
-	<!-- <bean id="treeTestResultNodeMapper" class="org.argeo.slc.jcr.dao.TreeTestResultNodeMapper"> -->
-	<!-- <property name="classLoader" ref="bundleClassLoader" /> -->
-	<!-- </bean> -->
 </beans>
\ No newline at end of file