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%2FSlcAgentDescriptorDaoJcr.java;h=863dfb93c8e6fbae8cad48a46719bbe34e7e629b;hb=2541d68abde22de8b5e1001d6291a1afb2bbcc09;hp=91a14c0840c6572a3eeee3d280a5cabbf168591d;hpb=dfe0c5ca8925056d9483a180d72ab7607e28b03a;p=gpl%2Fargeo-slc.git

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 91a14c084..863dfb93c 100644
--- 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,31 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * 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;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.List;
 
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
-import javax.jcr.Workspace;
 import javax.jcr.query.Query;
-import javax.jcr.query.QueryManager;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.jcr.NodeMapper;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.dao.runtime.SlcAgentDescriptorDao;
 import org.argeo.slc.runtime.SlcAgentDescriptor;
@@ -26,82 +35,69 @@ public class SlcAgentDescriptorDaoJcr extends AbstractSlcJcrDao implements
 	private final static Log log = LogFactory
 			.getLog(SlcAgentDescriptorDaoJcr.class);
 
-	private Workspace workspace;
-	private QueryManager queryManager;
-	private NodeMapper nodeMapper;
-	
-	public void init() {
-		try {
-			workspace = getSession().getWorkspace();
-			queryManager = workspace.getQueryManager();
-			nodeMapper = getNodeMapperProvider().findNodeMapper(null);
-		} catch (RepositoryException e) {
-			throw new SlcException("Cannot initialize DAO", e);
-		}
-	}
-
 	public void create(SlcAgentDescriptor slcAgentDescriptor) {
-		if (log.isDebugEnabled())
-			log.debug("in SlcAgentDescriptorDaoJcr.create");
 		try {
 			nodeMapper.save(getSession(), basePath(slcAgentDescriptor),
 					slcAgentDescriptor);
 			getSession().save();
-		} catch (Exception e) {
+		} catch (RepositoryException e) {
 			throw new SlcException("Cannot import " + slcAgentDescriptor, e);
 		}
 	}
 
 	public SlcAgentDescriptor getAgentDescriptor(String agentId) {
-		try {
-			// TODO: optimize query
-			String queryString = "//agent[@uuid='" + agentId + "']";
-			Query query = queryManager.createQuery(queryString, Query.XPATH);
-			Node node = JcrUtils.querySingleNode(query);
-			if (node == null)
-				return null;
-			return (SlcAgentDescriptor) nodeMapper.load(node);
-		} catch (Exception e) {
-			throw new SlcException("Cannot load Agent Descriptor" + agentId, e);
-		}
+		// TODO: optimize query
+		String queryString = "//agent[@uuid='" + agentId + "']";
+		Query query = createQuery(queryString, Query.XPATH);
+		Node node = JcrUtils.querySingleNode(query);
+		if (node == null)
+			return null;
+		return (SlcAgentDescriptor) nodeMapper.load(node);
 	}
 
 	public void delete(SlcAgentDescriptor slcAgentDescriptor) {
-		if (log.isDebugEnabled())
-			log.debug("slcAgentDescriptorDaoJcr.delete(slcAgentDescriptor)");
+		try {
+			String queryString = "//agent[@uuid='"
+					+ slcAgentDescriptor.getUuid() + "']";
+			Query query = createQuery(queryString, Query.XPATH);
+			Node node = JcrUtils.querySingleNode(query);
+			if (node != null) {
+				node.remove();
+				getSession().save();
+			} else
+				log.warn("No node found for agent descriptor: "
+						+ slcAgentDescriptor);
+		} catch (RepositoryException e) {
+			throw new SlcException("Cannot delete " + slcAgentDescriptor, e);
+		}
 
 	}
 
 	public void delete(String agentId) {
-		if (log.isDebugEnabled())
-			log.debug("slcAgentDescriptorDaoJcr.delete(agentID)");
 		try {
 			// TODO: optimize query
 			String queryString = "//agent[@uuid='" + agentId + "']";
-			Query query = queryManager.createQuery(queryString, Query.XPATH);
+			Query query = createQuery(queryString, Query.XPATH);
 			Node node = JcrUtils.querySingleNode(query);
 			if (node != null)
 				node.remove();
-		} catch (Exception e) {
+		} catch (RepositoryException e) {
 			throw new SlcException("Cannot find AgentDescriptor" + agentId, e);
 		}
 
 	}
 
 	public List<SlcAgentDescriptor> listSlcAgentDescriptors() {
-		if (log.isDebugEnabled())
-			log.debug("slcAgentDescriptorDaoJcr.delete(agentID)");
-
 		try {
 			String queryString = "//agent";
-			Query query = queryManager.createQuery(queryString, Query.XPATH);
+			Query query = createQuery(queryString, Query.XPATH);
 
 			List<SlcAgentDescriptor> listSad = new ArrayList<SlcAgentDescriptor>();
 
 			NodeIterator ni = query.execute().getNodes();
 			while (ni.hasNext()) {
 				Node curNode = (Node) ni.next();
-				JcrUtils.debug(curNode);
+				// JcrUtils.debug(curNode);
 				listSad.add((SlcAgentDescriptor) nodeMapper.load(curNode));
 			}