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;h=08c99c6a0d162158508ed69f39642193a98a2ba6;hb=2541d68abde22de8b5e1001d6291a1afb2bbcc09;hp=bb752a8c1aeb16793d4cc9acd32d03e22ab44281;hpb=0ebe6753b6569ff52b4ba86cd61c6e08a19e0c5f;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..08c99c6a0 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
@@ -1,18 +1,33 @@
+/*
+ * 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.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 
+import javax.jcr.NamespaceRegistry;
 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 +36,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 +45,10 @@ 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);
+		// JcrUtils.registerNamespaceSafely(session, "slc",
+		// "http://www.argeo.org/slc/0.12");
+
 	}
 
 	public void setSession(Session session) {
@@ -73,4 +85,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);
+		}
+	}
 }