From: Mathieu Baudier Date: Wed, 22 Aug 2012 15:03:13 +0000 (+0000) Subject: Refactor JCR utils and home usage X-Git-Tag: argeo-slc-2.1.7~637 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=2541d68abde22de8b5e1001d6291a1afb2bbcc09;p=gpl%2Fargeo-slc.git 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 32c7b095c..b0e35fd92 100644 --- 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 633f5df39..cad4d7e7d 100644 --- 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 443674b2f..b8b6424cb 100644 --- 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; import org.argeo.eclipse.ui.jcr.AsyncUiEventListener; import org.argeo.eclipse.ui.utils.CommandUtils; +import org.argeo.jcr.ArgeoJcrUtils; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.client.ui.ClientUiPlugin; @@ -118,11 +119,11 @@ public class JcrResultTreeView extends ViewPart { ObservationManager observationManager = session.getWorkspace() .getObservationManager(); // FIXME Will not be notified if empty result is deleted - if (JcrUtils.getUserHome(session) != null) { + if (ArgeoJcrUtils.getUserHome(session) != null) { resultsObserver = new ResultObserver(resultTreeViewer.getTree() .getDisplay()); observationManager.addEventListener(resultsObserver, - Event.PROPERTY_ADDED | Event.NODE_REMOVED, JcrUtils + Event.PROPERTY_ADDED | Event.NODE_REMOVED, ArgeoJcrUtils .getUserHome(session).getPath(), true, null, observedNodeTypes, false); } @@ -316,7 +317,7 @@ public class JcrResultTreeView extends ViewPart { resultsObserver = new ResultObserver(resultTreeViewer .getTree().getDisplay()); observationManager.addEventListener(resultsObserver, - Event.PROPERTY_ADDED | Event.NODE_REMOVED, JcrUtils + Event.PROPERTY_ADDED | Event.NODE_REMOVED, ArgeoJcrUtils .getUserHome(session).getPath(), true, null, observedNodeTypes, false); } catch (RepositoryException e) { 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 9546c3508..3eba046ca 100644 --- 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 81504b776..df69c93f7 100644 --- 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; }