X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2FJcrTestResult.java;h=3006266f3ceb6a93c0e42715f5216070663a5213;hb=4e7678886b9f37c7e47896ff0889aa6cafbb3372;hp=66b658b750e06dd786c90f3681ab1461b1ab6551;hpb=844bc386a1854a29d282a23ffda820ed7a52b74e;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrTestResult.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrTestResult.java
index 66b658b75..3006266f3 100644
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrTestResult.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrTestResult.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
+import javax.jcr.Credentials;
 import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.PropertyIterator;
@@ -47,18 +48,21 @@ public class JcrTestResult implements TestResult, SlcNames, AttachmentsEnabled {
 	private String uuid;
 	private Repository repository;
 	private Session session;
+	/**
+	 * For testing purposes, best practice is to not set them explicitely but
+	 * via other mechanisms such as JAAS or SPring Security.
+	 */
+	private Credentials credentials = null;
 	private String resultType = SlcTypes.SLC_TEST_RESULT;
 
 	/** cached for performance purposes */
 	private String nodeIdentifier = null;
 
-	private Boolean logoutWhenDestroyed = true;
-
 	private Map<String, String> attributes = new HashMap<String, String>();
 
 	public void init() {
 		try {
-			session = repository.login();
+			session = repository.login(credentials);
 			if (uuid == null) {
 				// create new result
 				uuid = UUID.randomUUID().toString();
@@ -83,8 +87,7 @@ public class JcrTestResult implements TestResult, SlcNames, AttachmentsEnabled {
 	}
 
 	public void destroy() {
-		if (logoutWhenDestroyed)
-			JcrUtils.logoutQuietly(session);
+		JcrUtils.logoutQuietly(session);
 	}
 
 	public Node getNode() {
@@ -141,6 +144,7 @@ public class JcrTestResult implements TestResult, SlcNames, AttachmentsEnabled {
 		}
 	}
 
+	/** JCR session is NOT logged out */
 	public void close() {
 		Node node = getNode();
 		try {
@@ -153,8 +157,6 @@ public class JcrTestResult implements TestResult, SlcNames, AttachmentsEnabled {
 			JcrUtils.discardUnderlyingSessionQuietly(node);
 			throw new SlcException("Cannot get close date from " + node, e);
 		}
-		if (logoutWhenDestroyed)
-			JcrUtils.logoutQuietly(session);
 	}
 
 	public Date getCloseDate() {
@@ -208,6 +210,10 @@ public class JcrTestResult implements TestResult, SlcNames, AttachmentsEnabled {
 		this.attributes = attributes;
 	}
 
+	public void setCredentials(Credentials credentials) {
+		this.credentials = credentials;
+	}
+
 	// public void setLogoutWhenDestroyed(Boolean logoutWhenDestroyed) {
 	// this.logoutWhenDestroyed = logoutWhenDestroyed;
 	// }