Introduce H

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.jcr / src / main / java / org / argeo / slc / jcr / dao / SlcExecutionDaoJcr.java

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 135f10760e91c3a73917918cd6c066b82ad63c56..67ebefd82d1337caba584a352a77249dd9fee60c 100644 (file)
--- 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,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.jcr.dao;
 
 import java.util.ArrayList;
@@ -8,9 +24,12 @@ import java.util.List;
 
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
+import javax.jcr.RepositoryException;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryResult;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.dao.process.SlcExecutionDao;
@@ -19,8 +38,7 @@ import org.argeo.slc.process.SlcExecutionStep;
 
 public class SlcExecutionDaoJcr extends AbstractSlcJcrDao implements
                SlcExecutionDao {
-       // private final static Log log =
-       // LogFactory.getLog(SlcExecutionDaoJcr.class);
+       private final static Log log = LogFactory.getLog(SlcExecutionDaoJcr.class);
 
        public void addSteps(String slcExecutionId,
                        List<SlcExecutionStep> additionalSteps) {
@@ -35,7 +53,7 @@ public class SlcExecutionDaoJcr extends AbstractSlcJcrDao implements
                try {
                        nodeMapper.save(getSession(), basePath(slcExecution), slcExecution);
                        getSession().save();
-               } catch (Exception e) {
+               } catch (RepositoryException e) {
                        throw new SlcException("Cannot create slcExecution" + slcExecution,
                                        e);
                }
@@ -53,17 +71,13 @@ public class SlcExecutionDaoJcr extends AbstractSlcJcrDao implements
        }
 
        public SlcExecution getSlcExecution(String uuid) {
-               try {
-                       // TODO: optimize query
-                       String queryString = "//process[@uuid='" + uuid + "']";
-                       Query query = queryManager.createQuery(queryString, Query.XPATH);
-                       Node node = JcrUtils.querySingleNode(query);
-                       if (node == null)
-                               return null;
-                       return (SlcExecution) nodeMapper.load(node);
-               } catch (Exception e) {
-                       throw new SlcException("Cannot load SLC execution " + uuid, e);
-               }
+               // TODO: optimize query
+               String queryString = "//process[@uuid='" + uuid + "']";
+               Query query = createQuery(queryString, Query.XPATH);
+               Node node = JcrUtils.querySingleNode(query);
+               if (node == null)
+                       return null;
+               return (SlcExecution) nodeMapper.load(node);
        }
 
        public List<SlcExecution> listSlcExecutions() {
@@ -71,7 +85,7 @@ public class SlcExecutionDaoJcr extends AbstractSlcJcrDao implements
                // TODO: optimize query
                String queryString = "//process";
                try {
-                       Query query = queryManager.createQuery(queryString, Query.XPATH);
+                       Query query = createQuery(queryString, Query.XPATH);
                        QueryResult qr = query.execute();
                        NodeIterator iterator = qr.getNodes();
                        while (iterator.hasNext()) {
@@ -81,7 +95,7 @@ public class SlcExecutionDaoJcr extends AbstractSlcJcrDao implements
                                res.add(slcExecution);
                        }
                        return res;
-               } catch (Exception e) {
+               } catch (RepositoryException e) {
                        throw new SlcException("Cannot list SLC executions", e);
                }
        }
@@ -95,13 +109,25 @@ public class SlcExecutionDaoJcr extends AbstractSlcJcrDao implements
                String queryString = "//process[@uuid='" + slcExecution.getUuid()
                                + "']";
                try {
-                       Query query = queryManager.createQuery(queryString, Query.XPATH);
+                       Query query = createQuery(queryString, Query.XPATH);
                        Node node = JcrUtils.querySingleNode(query);
                        nodeMapper.update(node, slcExecution);
                        getSession().save();
-               } catch (Exception e) {
+               } catch (RepositoryException e) {
                        throw new SlcException("Cannot update " + slcExecution, e);
                }
        }
 
+       public List<SlcExecutionStep> tailSteps(String slcExecutionId,
+                       Integer nbrOfSteps) {
+               log.error("Method not implemented, returning an empty list.");
+               return new ArrayList<SlcExecutionStep>();
+       }
+
+       public List<SlcExecutionStep> tailSteps(String slcExecutionId,
+                       String slcExecutionStepId) {
+               log.error("Method not implemented, returning an empty list.");
+               return new ArrayList<SlcExecutionStep>();
+       }
+
 }