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%2FAbstractSlcJcrDao.java;fp=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2Fdao%2FAbstractSlcJcrDao.java;h=368ef9e3c27d07ae39e634a83efc6ba042ace56c;hb=7efacbb6a17cd98979833f3c427ddeb940869d5c;hp=bb752a8c1aeb16793d4cc9acd32d03e22ab44281;hpb=f1949f18a209de9f9ee110e2e2654882529b8ec5;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/AbstractSlcJcrDao.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/AbstractSlcJcrDao.java
index bb752a8c1..368ef9e3c 100644
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/AbstractSlcJcrDao.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/AbstractSlcJcrDao.java
@@ -6,13 +6,12 @@ import java.util.GregorianCalendar;
 
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.Workspace;
-import javax.jcr.query.QueryManager;
+import javax.jcr.query.Query;
 
+import org.argeo.ArgeoException;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.jcr.NodeMapper;
 import org.argeo.jcr.NodeMapperProvider;
-import org.argeo.slc.SlcException;
 import org.argeo.slc.runtime.SlcAgentDescriptor;
 import org.argeo.slc.test.TestResult;
 import org.argeo.slc.test.TestRunDescriptor;
@@ -21,8 +20,8 @@ public abstract class AbstractSlcJcrDao {
 
 	private Session session;
 
-	protected Workspace workspace;
-	protected QueryManager queryManager;
+	// protected Workspace workspace;
+	// protected QueryManager queryManager;
 	protected NodeMapper nodeMapper;
 
 	// We inject the nodeMapperProvider that define a default node mapper as an
@@ -30,13 +29,7 @@ public abstract class AbstractSlcJcrDao {
 	private NodeMapperProvider nodeMapperProvider;
 
 	public void init() {
-		try {
-			workspace = getSession().getWorkspace();
-			queryManager = workspace.getQueryManager();
-			nodeMapper = getNodeMapperProvider().findNodeMapper(null);
-		} catch (RepositoryException e) {
-			throw new SlcException("Cannot initialize DAO", e);
-		}
+		nodeMapper = getNodeMapperProvider().findNodeMapper(null);
 	}
 
 	public void setSession(Session session) {
@@ -73,4 +66,12 @@ public abstract class AbstractSlcJcrDao {
 		return this.nodeMapperProvider;
 	}
 
+	protected Query createQuery(String query, String type) {
+		try {
+			return getSession().getWorkspace().getQueryManager().createQuery(
+					query, type);
+		} catch (RepositoryException e) {
+			throw new ArgeoException("Cannot create query " + query, e);
+		}
+	}
 }