From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 18 Apr 2010 15:28:58 +0000 (+0000)
Subject: Take over JCR implementation
X-Git-Tag: argeo-slc-2.1.7~1360
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=be96ff87e70e7ebc7d8f92e26c7bc1242ffebe36;p=gpl%2Fargeo-slc.git

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 01f566091..22e6065ef 100644
--- 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 f47df14ae..7bf84a66e 100644
--- 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 @@
 
 	<service interface="org.argeo.slc.dao.process.SlcExecutionDao"
 		ref="slcExecutionDao" />
-		<!-- 
 	<service interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"
 		ref="testResultDao" />
 	<service interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"
@@ -17,7 +16,4 @@
 		ref="testRunDescriptorDao" />
 	<service interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"
 		ref="slcAgentDescriptorDao" />
-
-	<reference id="sessionFactory" interface="org.hibernate.SessionFactory" />
- -->
 </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 ecba7b537..4adfd61ca 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
@@ -9,21 +9,57 @@
 		<property name="ignoreUnresolvablePlaceholders" value="true" />
 	</bean>
 
-	<bean id="beanNodeMapper" class="org.argeo.jcr.BeanNodeMapper">
-		<property name="classLoader">
-			<bean class="org.springframework.osgi.util.BundleDelegatingClassLoader"
-				factory-method="createBundleClassLoaderFor">
-				<constructor-arg>
-					<bean factory-bean="bundleContext" factory-method="getBundle" />
-				</constructor-arg>
-			</bean>
-		</property>
+	<bean id="slcAgentDescriptorDao" class="org.argeo.slc.jcr.dao.SlcAgentDescriptorDaoJcr"
+		init-method="init">
+		<property name="session" ref="argeo.jcr.session.inMemory" />
+		<property name="nodeMapperProvider" ref="nodeMapperProvider" />
+	</bean>
+
+	<bean id="testRunDescriptorDao" class="org.argeo.slc.jcr.dao.TestRunDescriptorDaoJcr"
+		init-method="init">
+		<property name="session" ref="argeo.jcr.session.inMemory" />
+		<property name="nodeMapperProvider" ref="nodeMapperProvider" />
 	</bean>
 
 	<bean id="slcExecutionDao" class="org.argeo.slc.jcr.dao.SlcExecutionDaoJcr"
 		init-method="init">
 		<property name="session" ref="argeo.jcr.session.inMemory" />
-		<property name="beanNodeMapper" ref="beanNodeMapper"/>
+		<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="argeo.jcr.session.inMemory" />
+		<property name="nodeMapperProvider" ref="nodeMapperProvider" />
+	</bean>
+
+	<bean id="testResultCollectionDao" class="org.argeo.slc.jcr.dao.TreeTestResultCollectionDaoJcr"
+		init-method="init">
+		<property name="session" ref="argeo.jcr.session.inMemory" />
+		<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="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>
 
 	<bean id="argeo.jcr.session.inMemory" factory-bean="argeo.jcr.repository.inMemory"