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=09dce97d39c84ef3c0a943caf24c83a7222ce148;hb=4663b42433ba4a16c81d90927aecff2a923cd7a4;hp=2bf9cc64c46e2cdad9e1647ccb716334e99b5802;hpb=b554c0910f6ddce935ceea5f99d399fe23af6f58;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 2bf9cc64c..09dce97d3 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,34 @@
+/*
+ * 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 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 +37,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 +46,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) {
@@ -56,23 +69,16 @@ public abstract class AbstractSlcJcrDao {
 	protected String basePath(TestResult testResult) {
 		Calendar cal = new GregorianCalendar();
 		cal.setTime(new Date());
-		// cal.setTime(slcExecution.getStartDate());
-		return "/slc/testresult/" + JcrUtils.dateAsPath(cal) + "testresult";
+		return "/slc/testresults/" + JcrUtils.dateAsPath(cal) + "testresult";
 	}
 
 	protected String basePath(SlcAgentDescriptor slcAgentDescriptor) {
-		Calendar cal = new GregorianCalendar();
-		cal.setTime(new Date());
-		// cal.setTime(slcExecution.getStartDate());
 		return "/slc/agents/"
-				+ JcrUtils.hostAsPath(slcAgentDescriptor.getHost() + "/agent");
+				+ JcrUtils.hostAsPath(slcAgentDescriptor.getHost()) + "/agent";
 	}
 
 	protected String basePath(TestRunDescriptor testRunDescriptor) {
-		Calendar cal = new GregorianCalendar();
-		cal.setTime(new Date());
-		// cal.setTime(slcExecution.getStartDate());
-		return "/slc/testruns/" + testRunDescriptor.getTestRunUuid()
+		return "/slc/testruns/" + testRunDescriptor.getSlcExecutionUuid()
 				+ "/testrun";
 	}
 
@@ -80,4 +86,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);
+		}
+	}
 }