import org.argeo.ArgeoException;\r
import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;\r
import org.argeo.eclipse.ui.utils.CommandUtils;\r
-import org.argeo.jcr.ArgeoJcrUtils;\r
import org.argeo.jcr.JcrUtils;\r
+import org.argeo.jcr.UserJcrUtils;\r
import org.argeo.slc.SlcException;\r
import org.argeo.slc.client.ui.ClientUiPlugin;\r
import org.argeo.slc.client.ui.commands.AddResultFolder;\r
ObservationManager observationManager = session.getWorkspace()\r
.getObservationManager();\r
// FIXME Will not be notified if empty result is deleted\r
- if (ArgeoJcrUtils.getUserHome(session) != null) {\r
+ if (UserJcrUtils.getUserHome(session) != null) {\r
resultsObserver = new ResultObserver(resultTreeViewer.getTree()\r
.getDisplay());\r
observationManager.addEventListener(resultsObserver,\r
- Event.PROPERTY_ADDED | Event.NODE_REMOVED, ArgeoJcrUtils\r
+ Event.PROPERTY_ADDED | Event.NODE_REMOVED, UserJcrUtils\r
.getUserHome(session).getPath(), true, null,\r
observedNodeTypes, false);\r
}\r
resultsObserver = new ResultObserver(resultTreeViewer\r
.getTree().getDisplay());\r
observationManager.addEventListener(resultsObserver,\r
- Event.PROPERTY_ADDED | Event.NODE_REMOVED, ArgeoJcrUtils\r
+ Event.PROPERTY_ADDED | Event.NODE_REMOVED, UserJcrUtils\r
.getUserHome(session).getPath(), true,\r
null, observedNodeTypes, false);\r
} catch (RepositoryException e) {\r
import org.argeo.slc.test.TestRun;
import org.argeo.slc.test.TestStatus;
-/** {@link TestResult} wrapping a JCR node of type {@link SlcTypes#SLC_TEST_RESULT}. */
+/**
+ * {@link TestResult} wrapping a JCR node of type
+ * {@link SlcTypes#SLC_TEST_RESULT}.
+ */
public class JcrTestResult implements TestResult, SlcNames, AttachmentsEnabled {
/** Should only be set for an already existing result. */
private String uuid;
if (uuid == null) {
// create new result
uuid = UUID.randomUUID().toString();
- String path = SlcJcrUtils.createResultPath(session.getUserID(),
- uuid);
+ String path = SlcJcrUtils.createResultPath(session, uuid);
Node resultNode = JcrUtils.mkdirs(session, path, resultType);
resultNode.setProperty(SLC_UUID, uuid);
for (String attr : attributes.keySet()) {
return session.getNodeByIdentifier(nodeIdentifier);
} else {
QueryManager qm = session.getWorkspace().getQueryManager();
- Query q = qm.createQuery(
- "select * from [" + SlcTypes.SLC_TEST_RESULT
- + "] where [slc:uuid]='" + uuid
- + "'", Query.JCR_SQL2);
+ Query q = qm.createQuery("select * from ["
+ + SlcTypes.SLC_TEST_RESULT + "] where [slc:uuid]='"
+ + uuid + "'", Query.JCR_SQL2);
resultNode = JcrUtils.querySingleNode(q);
if (resultNode != null)
nodeIdentifier = resultNode.getIdentifier();
public void addResultPart(TestResultPart testResultPart) {
Node node = getNode();
try {
- Node resultPartNode = node.addNode(SlcNames.SLC_STATUS, SlcTypes.SLC_CHECK);
+ Node resultPartNode = node.addNode(SlcNames.SLC_STATUS,
+ SlcTypes.SLC_CHECK);
resultPartNode.setProperty(SLC_SUCCESS,
testResultPart.getStatus() == TestStatus.PASSED);
if (testResultPart.getMessage() != null)
this.attributes = attributes;
}
-// public void setLogoutWhenDestroyed(Boolean logoutWhenDestroyed) {
-// this.logoutWhenDestroyed = logoutWhenDestroyed;
-// }
+ // public void setLogoutWhenDestroyed(Boolean logoutWhenDestroyed) {
+ // this.logoutWhenDestroyed = logoutWhenDestroyed;
+ // }
}
import javax.jcr.Session;
import org.argeo.ArgeoException;
-import org.argeo.jcr.ArgeoJcrUtils;
import org.argeo.jcr.JcrUtils;
+import org.argeo.jcr.UserJcrUtils;
import org.argeo.slc.SlcException;
/**
public static String getSlcResultsBasePath(Session session) {
try {
- return ArgeoJcrUtils.getUserHome(session).getPath() + "/"
+ return UserJcrUtils.getUserHome(session).getPath() + "/"
+ SlcNames.SLC_RESULTS;
} catch (RepositoryException re) {
throw new ArgeoException(
*/
public static String getMyResultsBasePath(Session session) {
try {
- return ArgeoJcrUtils.getUserHome(session).getPath() + "/"
+ return UserJcrUtils.getUserHome(session).getPath() + "/"
+ SlcJcrConstants.SLC_MYRESULT_BASEPATH;
} catch (RepositoryException re) {
throw new ArgeoException(
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
-import org.argeo.jcr.ArgeoJcrUtils;
import org.argeo.jcr.JcrUtils;
+import org.argeo.jcr.UserJcrUtils;
import org.argeo.slc.SlcException;
import org.argeo.slc.core.execution.PrimitiveAccessor;
import org.argeo.slc.core.execution.PrimitiveUtils;
+ JcrUtils.dateAsPath(now, true) + uuid;
}
- /** Create a new execution result path based on the current time */
- public static String createResultPath(String username, String uuid) {
+ /**
+ * Create a new execution result path in the user home based on the current
+ * time
+ */
+ public static String createResultPath(Session session, String uuid)
+ throws RepositoryException {
Calendar now = new GregorianCalendar();
- return ArgeoJcrUtils.getUserHomePath(username) + '/' + SlcNames.SLC_RESULTS
- + '/' + JcrUtils.dateAsPath(now, true) + uuid;
+ return UserJcrUtils.getUserHome(session).getPath() + '/'
+ + SlcNames.SLC_RESULTS + '/' + JcrUtils.dateAsPath(now, true)
+ + uuid;
}
/**
protected Node createResultNode(TreeTestResult testResult)
throws RepositoryException {
String uuid = testResult.getUuid();
- String path = SlcJcrUtils.createResultPath(session.getUserID(), uuid);
+ String path = SlcJcrUtils.createResultPath(session, uuid);
Node resultNode = JcrUtils.mkdirs(session, path, SlcTypes.SLC_TEST_RESULT);
resultNode.setProperty(SLC_UUID, uuid);
for (Map.Entry<String, String> entry : testResult.getAttributes()