X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fserver%2Forg.argeo.slc.server.jcr%2FMETA-INF%2Fspring%2Fjcr.xml;h=bd435bbd1466664aa30fa2537525bc79c0ed2ba6;hb=548235484edd6b48de5ddc3bbca318e0e49cb57b;hp=4960138de7df1edf66e47e65131c29db3e61ae62;hpb=7efacbb6a17cd98979833f3c427ddeb940869d5c;p=gpl%2Fargeo-slc.git

diff --git a/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr.xml b/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr.xml
index 4960138de..bd435bbd1 100644
--- a/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr.xml
+++ b/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr.xml
@@ -3,85 +3,90 @@
 	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="ignoreUnresolvablePlaceholders" value="true" />
-	</bean>
+	<!-- <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="slcAgentDescriptorDao" class="org.argeo.slc.jcr.dao.SlcAgentDescriptorDaoJcr"
-		init-method="init">
-		<property name="session" ref="jcrSession" />
-		<property name="nodeMapperProvider" ref="nodeMapperProvider" />
+	<bean id="agent" class="org.argeo.slc.jcr.execution.JcrAgent"
+		init-method="init" destroy-method="dispose">
+		<property name="session" ref="session" />
+		<property name="modulesManager" ref="modulesManager" />
 	</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 id="executionModulesListener" class="org.argeo.slc.jcr.execution.JcrExecutionModulesListener"
+		init-method="init" destroy-method="dispose">
+		<property name="agent" ref="agent" />
+		<property name="session" ref="session" />
 	</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 id="session" class="org.argeo.security.jcr.SecureThreadBoundSession">
+		<property name="repository" ref="nodeRepository" />
 	</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 class="org.argeo.security.core.SystemExecutionBeanPostProcessor">
+		<property name="authenticationManager" ref="authenticationManager" />
 	</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="slcAgentDescriptorDao" class="org.argeo.slc.jcr.dao.SlcAgentDescriptorDaoJcr" -->
+	<!-- 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="testRunDescriptorDao" class="org.argeo.slc.jcr.dao.TestRunDescriptorDaoJcr" -->
+	<!-- 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="slcExecutionDao" class="org.argeo.slc.jcr.dao.SlcExecutionDaoJcr" -->
+	<!-- init-method="init"> -->
+	<!-- <property name="session" ref="jcrSession" /> -->
+	<!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->
+	<!-- </bean> -->
 
-	<!--  JCR node mappers -->
-	<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="nodeMapperProvider" class="org.argeo.slc.jcr.dao.SlcNodeMapperProvider" -->
+	<!-- init-method="init"> -->
+	<!-- <property name="defaultNodeMapper" ref="nodeMapper" /> -->
+	<!-- <property name="treeTestResultNodeMapper" ref="treeTestResultNodeMapper" 
+		/> -->
+	<!-- </bean> -->
 
-	<bean id="nodeMapper" class="org.argeo.jcr.BeanNodeMapper">
-		<property name="classLoader" ref="bundleClassLoader" />
-	</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="treeTestResultNodeMapper" class="org.argeo.slc.jcr.dao.TreeTestResultNodeMapper">
-		<property name="classLoader" ref="bundleClassLoader" />
-	</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="jcrSession" factory-bean="argeo.jcr.repository.inMemory"
-		factory-method="login" destroy-method="logout" scope="request">
-		<constructor-arg> <bean
-		class="org.argeo.server.jcr.security.SpringSecurityCredentials" />
-		</constructor-arg> </bean>
-	-->
-	<bean id="jcrSession"
-		class="org.argeo.jcr.ThreadBoundJcrSessionFactory">
-		<property name="repository" ref="jcrRepository" />
-	</bean>
+	<!-- <bean id="osivInterceptor" -->
+	<!-- class="org.argeo.server.jcr.mvc.OpenSessionInViewJcrInterceptor"> -->
+	<!-- <property name="session" ref="jcrSession" /> -->
+	<!-- </bean> -->
 
-	<bean id="jcrRepository" class="org.argeo.server.jackrabbit.JackrabbitContainer">
-		<property name="homeDirectory" value="${argeo.osgi.data.dir}/jackrabbit" />
-		<property name="configuration" value="osgibundle:/repository.xml" />
-	</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