Introduce JCR agent. Client agent not needed anymore.

[gpl/argeo-slc.git] / modules / server / org.argeo.slc.server.jcr / META-INF / spring / jcr.xml

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 3286d73ca063c120d8be7dba8c1b552caf90bdbb..bd435bbd1466664aa30fa2537525bc79c0ed2ba6 100644 (file)
--- 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,79 +3,90 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
-       <bean\r
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">\r
-               <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />\r
-               <property name="ignoreUnresolvablePlaceholders" value="true" />\r
-       </bean>\r
+       <!-- <bean -->\r
+       <!-- class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> -->\r
+       <!-- <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" \r
+               /> -->\r
+       <!-- <property name="locations"> -->\r
+       <!-- <value>osgibundle:jcr.properties</value> -->\r
+       <!-- </property> -->\r
+       <!-- </bean> -->\r
 \r
-       <bean id="slcAgentDescriptorDao" class="org.argeo.slc.jcr.dao.SlcAgentDescriptorDaoJcr"\r
-               init-method="init">\r
-               <property name="session" ref="jcrSession" />\r
-               <property name="nodeMapperProvider" ref="nodeMapperProvider" />\r
+       <bean id="agent" class="org.argeo.slc.jcr.execution.JcrAgent"\r
+               init-method="init" destroy-method="dispose">\r
+               <property name="session" ref="session" />\r
+               <property name="modulesManager" ref="modulesManager" />\r
        </bean>\r
 \r
-       <bean id="testRunDescriptorDao" class="org.argeo.slc.jcr.dao.TestRunDescriptorDaoJcr"\r
-               init-method="init">\r
-               <property name="session" ref="jcrSession" />\r
-               <property name="nodeMapperProvider" ref="nodeMapperProvider" />\r
+       <bean id="executionModulesListener" class="org.argeo.slc.jcr.execution.JcrExecutionModulesListener"\r
+               init-method="init" destroy-method="dispose">\r
+               <property name="agent" ref="agent" />\r
+               <property name="session" ref="session" />\r
        </bean>\r
 \r
-       <bean id="slcExecutionDao" class="org.argeo.slc.jcr.dao.SlcExecutionDaoJcr"\r
-               init-method="init">\r
-               <property name="session" ref="jcrSession" />\r
-               <property name="nodeMapperProvider" ref="nodeMapperProvider" />\r
+       <bean id="session" class="org.argeo.security.jcr.SecureThreadBoundSession">\r
+               <property name="repository" ref="nodeRepository" />\r
        </bean>\r
 \r
-       <bean id="nodeMapperProvider" class="org.argeo.slc.jcr.dao.SlcNodeMapperProvider"\r
-               init-method="init">\r
-               <property name="defaultNodeMapper" ref="nodeMapper" />\r
-               <property name="treeTestResultNodeMapper" ref="treeTestResultNodeMapper" />\r
+       <bean class="org.argeo.security.core.SystemExecutionBeanPostProcessor">\r
+               <property name="authenticationManager" ref="authenticationManager" />\r
        </bean>\r
 \r
-       <bean id="testResultDao" class="org.argeo.slc.jcr.dao.TreeTestResultDaoJcr"\r
-               init-method="init">\r
-               <property name="session" ref="jcrSession" />\r
-               <property name="nodeMapperProvider" ref="nodeMapperProvider" />\r
-       </bean>\r
+       <!-- <bean id="slcAgentDescriptorDao" class="org.argeo.slc.jcr.dao.SlcAgentDescriptorDaoJcr" -->\r
+       <!-- init-method="init"> -->\r
+       <!-- <property name="session" ref="jcrSession" /> -->\r
+       <!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->\r
+       <!-- </bean> -->\r
 \r
-       <bean id="testResultCollectionDao" class="org.argeo.slc.jcr.dao.TreeTestResultCollectionDaoJcr"\r
-               init-method="init">\r
-               <property name="session" ref="jcrSession" />\r
-               <property name="nodeMapperProvider" ref="nodeMapperProvider" />\r
-       </bean>\r
+       <!-- <bean id="testRunDescriptorDao" class="org.argeo.slc.jcr.dao.TestRunDescriptorDaoJcr" -->\r
+       <!-- init-method="init"> -->\r
+       <!-- <property name="session" ref="jcrSession" /> -->\r
+       <!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->\r
+       <!-- </bean> -->\r
 \r
-       <bean id="osivInterceptor"\r
-               class="org.argeo.server.jcr.mvc.OpenSessionInViewJcrInterceptor">\r
-               <property name="session" ref="jcrSession" />\r
-       </bean>\r
+       <!-- <bean id="slcExecutionDao" class="org.argeo.slc.jcr.dao.SlcExecutionDaoJcr" -->\r
+       <!-- init-method="init"> -->\r
+       <!-- <property name="session" ref="jcrSession" /> -->\r
+       <!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->\r
+       <!-- </bean> -->\r
 \r
-       <!--  JCR node mappers -->\r
-       <bean id="bundleClassLoader"\r
-               class="org.springframework.osgi.util.BundleDelegatingClassLoader"\r
-               factory-method="createBundleClassLoaderFor">\r
-               <constructor-arg>\r
-                       <bean factory-bean="bundleContext" factory-method="getBundle" />\r
-               </constructor-arg>\r
-       </bean>\r
+       <!-- <bean id="nodeMapperProvider" class="org.argeo.slc.jcr.dao.SlcNodeMapperProvider" -->\r
+       <!-- init-method="init"> -->\r
+       <!-- <property name="defaultNodeMapper" ref="nodeMapper" /> -->\r
+       <!-- <property name="treeTestResultNodeMapper" ref="treeTestResultNodeMapper" \r
+               /> -->\r
+       <!-- </bean> -->\r
 \r
-       <bean id="nodeMapper" class="org.argeo.jcr.BeanNodeMapper">\r
-               <property name="classLoader" ref="bundleClassLoader" />\r
-       </bean>\r
+       <!-- <bean id="testResultDao" class="org.argeo.slc.jcr.dao.TreeTestResultDaoJcr" -->\r
+       <!-- init-method="init"> -->\r
+       <!-- <property name="session" ref="jcrSession" /> -->\r
+       <!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->\r
+       <!-- </bean> -->\r
 \r
-       <bean id="treeTestResultNodeMapper" class="org.argeo.slc.jcr.dao.TreeTestResultNodeMapper">\r
-               <property name="classLoader" ref="bundleClassLoader" />\r
-       </bean>\r
-       <!--\r
+       <!-- <bean id="testResultCollectionDao" class="org.argeo.slc.jcr.dao.TreeTestResultCollectionDaoJcr" -->\r
+       <!-- init-method="init"> -->\r
+       <!-- <property name="session" ref="jcrSession" /> -->\r
+       <!-- <property name="nodeMapperProvider" ref="nodeMapperProvider" /> -->\r
+       <!-- </bean> -->\r
 \r
-               <bean id="jcrSession" factory-bean="argeo.jcr.repository.inMemory"\r
-               factory-method="login" destroy-method="logout" scope="request">\r
-               <constructor-arg> <bean\r
-               class="org.argeo.server.jcr.security.SpringSecurityCredentials" />\r
-               </constructor-arg> </bean>\r
-       -->\r
-       <bean id="jcrSession"\r
-               class="org.argeo.jcr.ThreadBoundJcrSessionFactory">\r
-               <property name="repository" ref="jcrRepository" />\r
-       </bean>\r
+       <!-- <bean id="osivInterceptor" -->\r
+       <!-- class="org.argeo.server.jcr.mvc.OpenSessionInViewJcrInterceptor"> -->\r
+       <!-- <property name="session" ref="jcrSession" /> -->\r
+       <!-- </bean> -->\r
+\r
+       <!-- <bean id="bundleClassLoader" -->\r
+       <!-- class="org.springframework.osgi.util.BundleDelegatingClassLoader" -->\r
+       <!-- factory-method="createBundleClassLoaderFor"> -->\r
+       <!-- <constructor-arg> -->\r
+       <!-- <bean factory-bean="bundleContext" factory-method="getBundle" /> -->\r
+       <!-- </constructor-arg> -->\r
+       <!-- </bean> -->\r
+\r
+       <!-- <bean id="nodeMapper" class="org.argeo.jcr.BeanNodeMapper"> -->\r
+       <!-- <property name="classLoader" ref="bundleClassLoader" /> -->\r
+       <!-- </bean> -->\r
+\r
+       <!-- <bean id="treeTestResultNodeMapper" class="org.argeo.slc.jcr.dao.TreeTestResultNodeMapper"> -->\r
+       <!-- <property name="classLoader" ref="bundleClassLoader" /> -->\r
+       <!-- </bean> -->\r
 </beans>
\ No newline at end of file