Refactor JCR utils and home usage

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

diff --git a/demo/slc_demo_rcp.properties b/demo/slc_demo_rcp.properties
index 32c7b095c6bae727c14ba99f596e9f026997430e..b0e35fd92231ab2ea3a082c3a8f59c737d8ac149 100644 (file)
--- a/demo/slc_demo_rcp.properties
+++ b/demo/slc_demo_rcp.properties
@@ -9,9 +9,11 @@ org.argeo.slc.agent.jcr,\
 org.argeo.slc.support.maven,\
 org.argeo.slc.server.repo,\
 org.argeo.infra.slc.dist,\
-org.argeo.dep.osgi.catalina.start,\
-org.springframework.osgi.web.extender,\
-org.argeo.jackrabbit.webapp,\
+
+# Start internal web server
+#org.argeo.dep.osgi.catalina.start,\
+#org.springframework.osgi.web.extender,\
+#org.argeo.jackrabbit.webapp,\
 
 slc.executionModules=org.argeo.slc.demo.ant,\
 org.argeo.slc.demo.basic,\

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java
index 633f5df390462e73691923846690ec531d6e00b8..cad4d7e7d80795e53a098d9146083bdb288d8a15 100644 (file)
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java
@@ -33,6 +33,7 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.eclipse.ui.AbstractTreeContentProvider;
 import org.argeo.eclipse.ui.ErrorFeedback;
 import org.argeo.eclipse.ui.TreeParent;
+import org.argeo.jcr.ArgeoJcrUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.commands.CopyWorkspace;
@@ -121,20 +122,20 @@ public class DistributionsView extends ViewPart implements SlcNames {
 
                uri = "http://dev.argeo.org/org.argeo.jcr.webapp/pub/java";
                credentials = new GuestCredentials();
-               remoteRepository = JcrUtils.getRepositoryByUri(repositoryFactory, uri);
+               remoteRepository = ArgeoJcrUtils.getRepositoryByUri(repositoryFactory, uri);
                repositories.add(new RepositoryElem("anonymous@dev.argeo.org//java",
                                remoteRepository, credentials));
 
                uri = "http://localhost:7070/org.argeo.jcr.webapp/pub/java";
                credentials = new GuestCredentials();
-               remoteRepository = JcrUtils.getRepositoryByUri(repositoryFactory, uri);
+               remoteRepository = ArgeoJcrUtils.getRepositoryByUri(repositoryFactory, uri);
                repositories.add(new RepositoryElem("anonymous@localhost//java",
                                remoteRepository, credentials));
 
                uri = "http://localhost:7070/org.argeo.jcr.webapp/remoting/java";
                credentials = new SimpleCredentials(System.getProperty("user.name"),
                                "".toCharArray());
-               remoteRepository = JcrUtils.getRepositoryByUri(repositoryFactory, uri);
+               remoteRepository = ArgeoJcrUtils.getRepositoryByUri(repositoryFactory, uri);
                repositories.add(new RepositoryElem("@localhost//java",
                                remoteRepository, credentials));
 

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 443674b2f07d4ccca30a398a97531769732babc1..b8b6424cb1c5818154196f834d5efdd825330c1d 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,6 +20,7 @@ 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.slc.SlcException;\r
 import org.argeo.slc.client.ui.ClientUiPlugin;\r
@@ -118,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 (JcrUtils.getUserHome(session) != null) {\r
+                       if (ArgeoJcrUtils.getUserHome(session) != null) {\r
                                resultsObserver = new ResultObserver(resultTreeViewer.getTree()\r
                                                .getDisplay());\r
                                observationManager.addEventListener(resultsObserver,\r
-                                               Event.PROPERTY_ADDED | Event.NODE_REMOVED, JcrUtils\r
+                                               Event.PROPERTY_ADDED | Event.NODE_REMOVED, ArgeoJcrUtils\r
                                                                .getUserHome(session).getPath(), true, null,\r
                                                observedNodeTypes, false);\r
                        }\r
@@ -316,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, JcrUtils\r
+                                                       Event.PROPERTY_ADDED | Event.NODE_REMOVED, ArgeoJcrUtils\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/SlcJcrResultUtils.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcJcrResultUtils.java
index 9546c350820895b632ab04726bd851f33e1ec59d..3eba046cacfd72542eba2276aa90314c9f8205ae 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,6 +20,7 @@ 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.slc.SlcException;
 
@@ -35,7 +36,7 @@ public class SlcJcrResultUtils {
        public static String getSlcResultsBasePath(Session session) {
                try {
 
-                       return JcrUtils.getUserHome(session).getPath() + "/"
+                       return ArgeoJcrUtils.getUserHome(session).getPath() + "/"
                                        + SlcNames.SLC_RESULTS;
                } catch (RepositoryException re) {
                        throw new ArgeoException(
@@ -49,7 +50,7 @@ public class SlcJcrResultUtils {
         */
        public static String getMyResultsBasePath(Session session) {
                try {
-                       return JcrUtils.getUserHome(session).getPath() + "/"
+                       return ArgeoJcrUtils.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 81504b77657f70689673802ddbe3613b07664047..df69c93f7752d5c4672b411ff98d9b6b3f448223 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
@@ -22,6 +22,7 @@ import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 
+import org.argeo.jcr.ArgeoJcrUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.core.execution.PrimitiveAccessor;
@@ -83,7 +84,7 @@ public class SlcJcrUtils implements SlcNames {
        /** Create a new execution result path based on the current time */
        public static String createResultPath(String username, String uuid) {
                Calendar now = new GregorianCalendar();
-               return JcrUtils.getUserHomePath(username) + '/' + SlcNames.SLC_RESULTS
+               return ArgeoJcrUtils.getUserHomePath(username) + '/' + SlcNames.SLC_RESULTS
                                + '/' + JcrUtils.dateAsPath(now, true) + uuid;
        }