Take over JCR implementation

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

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/SlcAgentDescriptorDaoJcr.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/SlcAgentDescriptorDaoJcr.java
index 91a14c0840c6572a3eeee3d280a5cabbf168591d..14c838aa7001eac9cf14eb8aad55dc6806e16f05 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/SlcAgentDescriptorDaoJcr.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/SlcAgentDescriptorDaoJcr.java
@@ -1,22 +1,15 @@
 package org.argeo.slc.jcr.dao;\r
 \r
 import java.util.ArrayList;\r
-import java.util.Calendar;\r
-import java.util.Date;\r
-import java.util.GregorianCalendar;\r
 import java.util.List;\r
 \r
 import javax.jcr.Node;\r
 import javax.jcr.NodeIterator;\r
-import javax.jcr.RepositoryException;\r
-import javax.jcr.Workspace;\r
 import javax.jcr.query.Query;\r
-import javax.jcr.query.QueryManager;\r
 \r
 import org.apache.commons.logging.Log;\r
 import org.apache.commons.logging.LogFactory;\r
 import org.argeo.jcr.JcrUtils;\r
-import org.argeo.jcr.NodeMapper;\r
 import org.argeo.slc.SlcException;\r
 import org.argeo.slc.dao.runtime.SlcAgentDescriptorDao;\r
 import org.argeo.slc.runtime.SlcAgentDescriptor;\r
@@ -26,23 +19,7 @@ public class SlcAgentDescriptorDaoJcr extends AbstractSlcJcrDao implements
        private final static Log log = LogFactory\r
                        .getLog(SlcAgentDescriptorDaoJcr.class);\r
 \r
-       private Workspace workspace;\r
-       private QueryManager queryManager;\r
-       private NodeMapper nodeMapper;\r
-       \r
-       public void init() {\r
-               try {\r
-                       workspace = getSession().getWorkspace();\r
-                       queryManager = workspace.getQueryManager();\r
-                       nodeMapper = getNodeMapperProvider().findNodeMapper(null);\r
-               } catch (RepositoryException e) {\r
-                       throw new SlcException("Cannot initialize DAO", e);\r
-               }\r
-       }\r
-\r
        public void create(SlcAgentDescriptor slcAgentDescriptor) {\r
-               if (log.isDebugEnabled())\r
-                       log.debug("in SlcAgentDescriptorDaoJcr.create");\r
                try {\r
                        nodeMapper.save(getSession(), basePath(slcAgentDescriptor),\r
                                        slcAgentDescriptor);\r
@@ -67,14 +44,24 @@ public class SlcAgentDescriptorDaoJcr extends AbstractSlcJcrDao implements
        }\r
 \r
        public void delete(SlcAgentDescriptor slcAgentDescriptor) {\r
-               if (log.isDebugEnabled())\r
-                       log.debug("slcAgentDescriptorDaoJcr.delete(slcAgentDescriptor)");\r
+               try {\r
+                       String queryString = "//agent[@uuid='"\r
+                                       + slcAgentDescriptor.getUuid() + "']";\r
+                       Query query = queryManager.createQuery(queryString, Query.XPATH);\r
+                       Node node = JcrUtils.querySingleNode(query);\r
+                       if (node != null) {\r
+                               node.remove();\r
+                               getSession().save();\r
+                       } else\r
+                               log.warn("No node found for agent descriptor: "\r
+                                               + slcAgentDescriptor);\r
+               } catch (Exception e) {\r
+                       throw new SlcException("Cannot delete " + slcAgentDescriptor, e);\r
+               }\r
 \r
        }\r
 \r
        public void delete(String agentId) {\r
-               if (log.isDebugEnabled())\r
-                       log.debug("slcAgentDescriptorDaoJcr.delete(agentID)");\r
                try {\r
                        // TODO: optimize query\r
                        String queryString = "//agent[@uuid='" + agentId + "']";\r
@@ -89,9 +76,6 @@ public class SlcAgentDescriptorDaoJcr extends AbstractSlcJcrDao implements
        }\r
 \r
        public List<SlcAgentDescriptor> listSlcAgentDescriptors() {\r
-               if (log.isDebugEnabled())\r
-                       log.debug("slcAgentDescriptorDaoJcr.delete(agentID)");\r
-\r
                try {\r
                        String queryString = "//agent";\r
                        Query query = queryManager.createQuery(queryString, Query.XPATH);\r
@@ -101,7 +85,7 @@ public class SlcAgentDescriptorDaoJcr extends AbstractSlcJcrDao implements
                        NodeIterator ni = query.execute().getNodes();\r
                        while (ni.hasNext()) {\r
                                Node curNode = (Node) ni.next();\r
-                               JcrUtils.debug(curNode);\r
+                               // JcrUtils.debug(curNode);\r
                                listSad.add((SlcAgentDescriptor) nodeMapper.load(curNode));\r
                        }\r
 \r