JCR UI can run processes

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

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TestRunDescriptorDaoJcr.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TestRunDescriptorDaoJcr.java
index 44db33deffad86a366ac821b64f76242f8bba05a..285a5e8624d8a5c0acc4ede805dc9fe458c87c5c 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TestRunDescriptorDaoJcr.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TestRunDescriptorDaoJcr.java
@@ -1,6 +1,23 @@
+/*
+ * 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 javax.jcr.Node;
+import javax.jcr.RepositoryException;
 import javax.jcr.query.Query;
 
 import org.argeo.jcr.JcrUtils;
@@ -12,17 +29,13 @@ public class TestRunDescriptorDaoJcr extends AbstractSlcJcrDao implements
                TestRunDescriptorDao {
 
        public TestRunDescriptor getTestRunDescriptor(String id) {
-               try {
-                       // TODO: optimize query
-                       String queryString = "//testrun[@testRunUuid='" + id + "']";
-                       Query query = queryManager.createQuery(queryString, Query.XPATH);
-                       Node node = JcrUtils.querySingleNode(query);
-                       if (node == null)
-                               return null;
-                       return (TestRunDescriptor) nodeMapper.load(node);
-               } catch (Exception e) {
-                       throw new SlcException("Cannot load test run descriptor" + id, e);
-               }
+               // TODO: optimize query
+               String queryString = "//testrun[@testRunUuid='" + id + "']";
+               Query query = createQuery(queryString, Query.XPATH);
+               Node node = JcrUtils.querySingleNode(query);
+               if (node == null)
+                       return null;
+               return (TestRunDescriptor) nodeMapper.load(node);
        }
 
        public void saveOrUpdate(TestRunDescriptor testRunDescriptor) {
@@ -30,7 +43,7 @@ public class TestRunDescriptorDaoJcr extends AbstractSlcJcrDao implements
                        nodeMapper.save(getSession(), basePath(testRunDescriptor),
                                        testRunDescriptor);
                        getSession().save();
-               } catch (Exception e) {
+               } catch (RepositoryException e) {
                        throw new SlcException("Cannot import " + testRunDescriptor, e);
                }
        }