X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2Fdao%2FSlcExecutionDaoJcr.java;h=30cc439ac3f5cb549981bdf62c12313a9a9bab7d;hb=34f36ae677d3541f7943e5850bc9c906e2249fe6;hp=63cada00878e1201f5599084b5f6b18ab2d2651b;hpb=47b34fc00752153d82ffd442a6ef13f1ae4843f0;p=gpl%2Fargeo-slc.git 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; }