Refactor JCR utils and home usage

git-svn-id: https://svn.argeo.org/slc/trunk@5538 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
index b8b6424cb1c5818154196f834d5efdd825330c1d..a00548a2c3d069aa1bd585775c92cc18a29881e2 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
@@ -20,8 +20,8 @@ import org.apache.commons.logging.LogFactory;
 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
@@ -119,11 +119,11 @@ public class JcrResultTreeView extends ViewPart {
                        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
@@ -317,7 +317,7 @@ public class JcrResultTreeView extends ViewPart {
                                        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

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 818d4f333bbc7d2f5f11fea705519cf8daa83fa1..66b658b750e06dd786c90f3681ab1461b1ab6551 100644 (file)
--- 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
@@ -38,7 +38,10 @@ import org.argeo.slc.test.TestResultPart;
 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;
@@ -59,8 +62,7 @@ public class JcrTestResult implements TestResult, SlcNames, AttachmentsEnabled {
                        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()) {
@@ -92,10 +94,9 @@ public class JcrTestResult implements TestResult, SlcNames, AttachmentsEnabled {
                                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();
@@ -112,7 +113,8 @@ public class JcrTestResult implements TestResult, SlcNames, AttachmentsEnabled {
        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)
@@ -206,8 +208,8 @@ public class JcrTestResult implements TestResult, SlcNames, AttachmentsEnabled {
                this.attributes = attributes;
        }
 
-//     public void setLogoutWhenDestroyed(Boolean logoutWhenDestroyed) {
-//             this.logoutWhenDestroyed = logoutWhenDestroyed;
-//     }
+       // public void setLogoutWhenDestroyed(Boolean logoutWhenDestroyed) {
+       // this.logoutWhenDestroyed = logoutWhenDestroyed;
+       // }
 
 }

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrResultUtils.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrResultUtils.java
index 3eba046cacfd72542eba2276aa90314c9f8205ae..0f07fe56729444c2a40a829101994d843bd4e591 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrResultUtils.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrResultUtils.java
@@ -20,8 +20,8 @@ import javax.jcr.RepositoryException;
 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;
 
 /**
@@ -36,7 +36,7 @@ public class SlcJcrResultUtils {
        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(
@@ -50,7 +50,7 @@ public class SlcJcrResultUtils {
         */
        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(

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java
index df69c93f7752d5c4672b411ff98d9b6b3f448223..52931218bcbe1c15142c9ec4744b16c6b55c9304 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrUtils.java
@@ -21,9 +21,10 @@ import java.util.GregorianCalendar;
 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;
@@ -81,11 +82,16 @@ public class SlcJcrUtils implements SlcNames {
                                + 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;
        }
 
        /**

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrResultListener.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrResultListener.java
index b5af2c8ec0d8aa5031811664ce4ec4b0a0ee493c..ce5dbf76ce6ad9202611e6dca3d34455ae6d88be 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrResultListener.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrResultListener.java
@@ -168,7 +168,7 @@ public class JcrResultListener implements TreeTestResultListener, SlcNames {
        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()