Adapt to changes in Argeo Commons.

diff --git a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoSuiteLoginLifecycle.java b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoSuiteLoginLifecycle.java
index f3145c3e7d51a36a35adc3e7d251eeb9d24720ed..6899582f32fb81dbb4e42281bce213fc3397b875 100644 (file)
--- a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoSuiteLoginLifecycle.java
+++ b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoSuiteLoginLifecycle.java
@@ -16,6 +16,7 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.e4.rap.CmsLoginLifecycle;
 import org.argeo.connect.ui.SystemWorkbenchService;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.node.NodeConstants;
 
 public class ArgeoSuiteLoginLifecycle extends CmsLoginLifecycle {
        private final static Log log = LogFactory.getLog(ArgeoSuiteLoginLifecycle.class);
@@ -48,7 +49,7 @@ public class ArgeoSuiteLoginLifecycle extends CmsLoginLifecycle {
                                @Override
                                public Session run() throws PrivilegedActionException {
                                        try {
-                                               return repository.login();
+                                               return repository.login(NodeConstants.HOME);
                                        } catch (RepositoryException e) {
                                                throw new PrivilegedActionException(e);
                                        }

diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java
index 7aeb67b43f6397bfbf2871ff43178997011cde4a..f473297431cd8c9d50e4e19220bf6019247995ec 100644 (file)
--- a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java
+++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java
@@ -17,6 +17,7 @@ import org.argeo.connect.ui.SystemWorkbenchService;
 import org.argeo.connect.util.ConnectJcrUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.node.NodeConstants;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.client.service.BrowserNavigation;
@@ -45,7 +46,8 @@ public abstract class AbstractSuiteDashboard {
        @Inject
        private SystemWorkbenchService systemWorkbenchService;
 
-       private Session session;
+       private Session homeSession;
+       private Session mainSession;
 
        // UI Objects
        private FormToolkit toolkit;
@@ -54,7 +56,8 @@ public abstract class AbstractSuiteDashboard {
        private BrowserNavigation browserNavigation;
 
        public void init() {
-               session = ConnectJcrUtils.login(repository);
+               homeSession = ConnectJcrUtils.login(repository, NodeConstants.HOME);
+               mainSession = ConnectJcrUtils.login(repository);
                // updateTooltip(input);
        }
 
@@ -131,7 +134,8 @@ public abstract class AbstractSuiteDashboard {
        // Life cycle
        @PreDestroy
        public void dispose() {
-               JcrUtils.logoutQuietly(session);
+               JcrUtils.logoutQuietly(homeSession);
+               JcrUtils.logoutQuietly(mainSession);
        }
 
        @Focus
@@ -140,8 +144,12 @@ public abstract class AbstractSuiteDashboard {
        }
 
        // Expose to implementing classes
-       protected Session getSession() {
-               return session;
+       protected Session getHomeSession() {
+               return homeSession;
+       }
+
+       public Session getMainSession() {
+               return mainSession;
        }
 
        public ResourcesService getResourcesService() {

diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java
index 2061f146866f550de5d31e70c2e2a228748551a6..259ea430983f4e8d1d82e3baafe1326e2c322edd 100644 (file)
--- a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java
+++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/DefaultDashboardEditor.java
@@ -95,7 +95,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
        @Override
        public void forceRefresh(Object object) {
                CmsUtils.clear(headerCmp);
-               populateHeaderPart(headerCmp, NodeUtils.getUserHome(getSession()));
+               populateHeaderPart(headerCmp, NodeUtils.getUserHome(getHomeSession()));
 
                CmsUtils.clear(taskListCmp);
                populateTaskListCmp(taskListCmp);
@@ -105,7 +105,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
 
        private void populateTaskListCmp(Composite parent) {
                parent.setLayout(EclipseUiUtils.noSpaceGridLayout());
-               NodeIterator nit = activitiesService.getMyTasks(getSession(), true);
+               NodeIterator nit = activitiesService.getMyTasks(getMainSession(), true);
                if (!nit.hasNext()) {
                        Composite noTaskCmp = new Composite(parent, SWT.NO_FOCUS);
                        noTaskCmp.setLayoutData(EclipseUiUtils.fillAll());
@@ -122,7 +122,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
                        tvlc.setLayoutData(EclipseUiUtils.fillAll());
                        final TableViewer viewer = tvlc.getTableViewer();
                        viewer.setInput(JcrUtils.nodeIteratorToList(nit).toArray());
-                       final TaskViewerContextMenu contextMenu = new TaskViewerContextMenu(viewer, getSession(),
+                       final TaskViewerContextMenu contextMenu = new TaskViewerContextMenu(viewer, getHomeSession(),
                                        activitiesService) {
                                @Override
                                public boolean performAction(String actionId) {
@@ -206,13 +206,13 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
                                // String mainMixin = TrackerTypes.TRACKER_TASK;
                                String mainMixin = ActivitiesTypes.ACTIVITIES_TASK;
                                String pathCreated = ConnectWorkbenchUtils.createAndConfigureEntity(createTaskLk.getShell(),
-                                               getSession(), getSystemAppService(), getSystemWorkbenchService(), mainMixin);
+                                               getHomeSession(), getSystemAppService(), getSystemWorkbenchService(), mainMixin);
                                if (EclipseUiUtils.notEmpty(pathCreated))
                                        forceRefresh(null);
                        }
                });
 
-               NodeIterator nit = activitiesService.getMyTasks(getSession(), true);
+               NodeIterator nit = activitiesService.getMyTasks(getHomeSession(), true);
                if (nit.hasNext()) {
                        List<Node> overdueTasks = new ArrayList<>();
                        while (nit.hasNext()) {
@@ -229,7 +229,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
                }
 
                if (trackerService != null) {
-                       nit = trackerService.getMyMilestones(getSession(), true);
+                       nit = trackerService.getMyMilestones(getHomeSession(), true);
                        List<Node> openMilestones = new ArrayList<>();
 
                        if (nit.hasNext()) {
@@ -250,7 +250,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
                        }
 
                        // My projects
-                       List<Node> openProjects = JcrUtils.nodeIteratorToList(trackerService.getMyProjects(getSession(), true));
+                       List<Node> openProjects = JcrUtils.nodeIteratorToList(trackerService.getMyProjects(getHomeSession(), true));
                        if (!openProjects.isEmpty()) {
                                Group myProjectsGp = new Group(rightCmp, SWT.NO_FOCUS);
                                myProjectsGp.setText("My open projects");