From 34f36ae677d3541f7943e5850bc9c906e2249fe6 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 21 Feb 2010 18:18:52 +0000 Subject: [PATCH] First slc execution JCR mapping git-svn-id: https://svn.argeo.org/slc/trunk@3376 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- runtime/org.argeo.slc.support.jcr/pom.xml | 8 ++++++ .../argeo/slc/jcr/dao/SlcExecutionDaoJcr.java | 26 ------------------- .../slc/jcr/dao/SlcExecutionDaoJcrTest.java | 6 +++++ .../argeo/slc/jcr/dao/applicationContext.xml | 3 --- runtime/org.argeo.slc.unit/pom.xml | 18 ++++++++++++- 5 files changed, 31 insertions(+), 30 deletions(-) diff --git a/runtime/org.argeo.slc.support.jcr/pom.xml b/runtime/org.argeo.slc.support.jcr/pom.xml index 09a0e6075..dc2b8b517 100644 --- a/runtime/org.argeo.slc.support.jcr/pom.xml +++ b/runtime/org.argeo.slc.support.jcr/pom.xml @@ -38,5 +38,13 @@ org.argeo.server.jackrabbit ${version.argeo-commons} + + + + org.argeo.slc.runtime + org.argeo.slc.unit + test + + \ No newline at end of file diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/SlcExecutionDaoJcr.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/SlcExecutionDaoJcr.java index 63cada008..30cc439ac 100644 --- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/SlcExecutionDaoJcr.java +++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/SlcExecutionDaoJcr.java @@ -1,6 +1,5 @@ package org.argeo.slc.jcr.dao; -import java.io.InputStream; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -14,21 +13,16 @@ import javax.jcr.query.Query; import javax.jcr.query.QueryManager; import javax.jcr.query.QueryResult; -import org.apache.commons.io.IOUtils; import org.argeo.jcr.BeanNodeMapper; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.dao.process.SlcExecutionDao; import org.argeo.slc.process.SlcExecution; import org.argeo.slc.process.SlcExecutionStep; -import org.springframework.oxm.Marshaller; -import org.springframework.xml.transform.StringResult; public class SlcExecutionDaoJcr implements SlcExecutionDao { private Session session; - private Marshaller marshaller; - private BeanNodeMapper beanNodeMapper = new BeanNodeMapper(); public void addSteps(String slcExecutionId, @@ -38,28 +32,12 @@ public class SlcExecutionDaoJcr implements SlcExecutionDao { } public void create(SlcExecution slcExecution) { - StringResult result = new StringResult(); - InputStream in = null; try { beanNodeMapper.saveOrUpdate(getSession(), basePath(slcExecution), slcExecution); - - // TODO: optimize with piped streams - // marshaller.marshal(slcExecution, result); - // in = new ByteArrayInputStream(result.toString().getBytes()); - // - // String basePath = basePath(slcExecution); - // JcrUtils.mkdirs(getSession(), basePath); - // - // session.importXML(basePath(slcExecution), in, - // ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING); - - JcrUtils.debug(session.getRootNode()); session.save(); } catch (Exception e) { throw new SlcException("Cannot import " + slcExecution, e); - } finally { - IOUtils.closeQuietly(in); } } @@ -114,10 +92,6 @@ public class SlcExecutionDaoJcr implements SlcExecutionDao { this.session = session; } - public void setMarshaller(Marshaller marshaller) { - this.marshaller = marshaller; - } - protected Session getSession() { return session; } diff --git a/runtime/org.argeo.slc.support.jcr/src/test/java/org/argeo/slc/jcr/dao/SlcExecutionDaoJcrTest.java b/runtime/org.argeo.slc.support.jcr/src/test/java/org/argeo/slc/jcr/dao/SlcExecutionDaoJcrTest.java index fe07d2cfc..cd38e3b77 100644 --- a/runtime/org.argeo.slc.support.jcr/src/test/java/org/argeo/slc/jcr/dao/SlcExecutionDaoJcrTest.java +++ b/runtime/org.argeo.slc.support.jcr/src/test/java/org/argeo/slc/jcr/dao/SlcExecutionDaoJcrTest.java @@ -2,6 +2,9 @@ package org.argeo.slc.jcr.dao; import java.net.InetAddress; +import javax.jcr.Session; + +import org.argeo.jcr.JcrUtils; import org.argeo.slc.dao.process.SlcExecutionDao; import org.argeo.slc.process.SlcExecution; import org.argeo.slc.unit.AbstractSpringTestCase; @@ -10,6 +13,7 @@ import org.argeo.slc.unit.process.SlcExecutionTestUtils; public class SlcExecutionDaoJcrTest extends AbstractSpringTestCase { public void testCreate() throws Exception { SlcExecutionDao slcExecutionDao = getBean(SlcExecutionDao.class); + Session session = getBean(Session.class); // SlcExecution slcExecution = SlcExecutionTestUtils // .createSimpleSlcExecution(); @@ -19,6 +23,8 @@ public class SlcExecutionDaoJcrTest extends AbstractSpringTestCase { String uuid = slcExecution.getUuid(); slcExecutionDao.create(slcExecution); + JcrUtils.debug(session.getRootNode()); + SlcExecution slcExecutionPersist = slcExecutionDao .getSlcExecution(uuid); SlcExecutionTestUtils.assertSlcExecution(slcExecution, diff --git a/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml b/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml index edeb8cb34..bb232edef 100644 --- a/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml +++ b/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml @@ -3,8 +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"> - - @@ -12,7 +10,6 @@ - diff --git a/runtime/org.argeo.slc.unit/pom.xml b/runtime/org.argeo.slc.unit/pom.xml index 79245efcf..41c7695c6 100644 --- a/runtime/org.argeo.slc.unit/pom.xml +++ b/runtime/org.argeo.slc.unit/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -90,5 +91,20 @@ org.springframework.oxm true + + + + org.slf4j + com.springsource.slf4j.org.apache.commons.logging + + + org.apache.log4j + com.springsource.org.apache.log4j + + + org.slf4j + com.springsource.slf4j.log4j + + -- 2.39.5