Take over JCR implementation

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

diff --git a/modules/server/org.argeo.slc.server.jcr/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.jcr/META-INF/MANIFEST.MF
index 01f56609147e7ec4d602f3d9b09d04e7c802488e..22e6065ef33d99a489a455e7900a613556b0afee 100644 (file)
--- a/modules/server/org.argeo.slc.server.jcr/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.server.jcr/META-INF/MANIFEST.MF
@@ -5,10 +5,20 @@ Bundle-Name: Server JCR
 Import-Package: javax.jcr,
  org.argeo.jcr,
  org.argeo.server.jackrabbit,
+ org.argeo.slc.core.attachment,
  org.argeo.slc.core.execution,
+ org.argeo.slc.core.structure,
+ org.argeo.slc.core.structure.tree,
+ org.argeo.slc.core.test,
+ org.argeo.slc.core.test.tree,
  org.argeo.slc.dao.process,
+ org.argeo.slc.dao.runtime,
+ org.argeo.slc.dao.test,
+ org.argeo.slc.dao.test.tree,
  org.argeo.slc.execution,
  org.argeo.slc.jcr.dao,
  org.argeo.slc.process,
+ org.argeo.slc.runtime;specification-version="0.12.2.SNAPSHOT-r3445",
+ org.argeo.slc.test,
  org.springframework.beans.factory.config,
  org.springframework.osgi.util

diff --git a/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr-osgi.xml b/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr-osgi.xml
index f47df14aecc490bc2639e3a0858f8c76d4fb585e..7bf84a66ed45a81638aecd186d890197af517462 100644 (file)
--- a/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr-osgi.xml
+++ b/modules/server/org.argeo.slc.server.jcr/META-INF/spring/jcr-osgi.xml
@@ -8,7 +8,6 @@
 \r
        <service interface="org.argeo.slc.dao.process.SlcExecutionDao"\r
                ref="slcExecutionDao" />\r
-               <!-- \r
        <service interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"\r
                ref="testResultDao" />\r
        <service interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"\r
@@ -17,7 +16,4 @@
                ref="testRunDescriptorDao" />\r
        <service interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"\r
                ref="slcAgentDescriptorDao" />\r
-\r
-       <reference id="sessionFactory" interface="org.hibernate.SessionFactory" />\r
- -->\r
 </beans:beans>
\ No newline at end of file

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 ecba7b537144877b9a9c854f5e7cccaa81876f30..4adfd61caae7ef49a3c9d6765f2d4037f4b1aac6 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
@@ -9,21 +9,57 @@
                <property name="ignoreUnresolvablePlaceholders" value="true" />\r
        </bean>\r
 \r
-       <bean id="beanNodeMapper" class="org.argeo.jcr.BeanNodeMapper">\r
-               <property name="classLoader">\r
-                       <bean 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
-               </property>\r
+       <bean id="slcAgentDescriptorDao" class="org.argeo.slc.jcr.dao.SlcAgentDescriptorDaoJcr"\r
+               init-method="init">\r
+               <property name="session" ref="argeo.jcr.session.inMemory" />\r
+               <property name="nodeMapperProvider" ref="nodeMapperProvider" />\r
+       </bean>\r
+\r
+       <bean id="testRunDescriptorDao" class="org.argeo.slc.jcr.dao.TestRunDescriptorDaoJcr"\r
+               init-method="init">\r
+               <property name="session" ref="argeo.jcr.session.inMemory" />\r
+               <property name="nodeMapperProvider" ref="nodeMapperProvider" />\r
        </bean>\r
 \r
        <bean id="slcExecutionDao" class="org.argeo.slc.jcr.dao.SlcExecutionDaoJcr"\r
                init-method="init">\r
                <property name="session" ref="argeo.jcr.session.inMemory" />\r
-               <property name="beanNodeMapper" ref="beanNodeMapper"/>\r
+               <property name="nodeMapperProvider" ref="nodeMapperProvider" />\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>\r
+\r
+       <bean id="testResultDao" class="org.argeo.slc.jcr.dao.TreeTestResultDaoJcr"\r
+               init-method="init">\r
+               <property name="session" ref="argeo.jcr.session.inMemory" />\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="argeo.jcr.session.inMemory" />\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
+\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
 \r
        <bean id="argeo.jcr.session.inMemory" factory-bean="argeo.jcr.repository.inMemory"\r