From: Bruno Sinou <bsinou@argeo.org>
Date: Wed, 19 Mar 2014 13:15:38 +0000 (+0000)
Subject: Clean session management.
X-Git-Tag: argeo-slc-2.1.7~205
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=534721f7cfe6f8cd899aaa2d7d0ffb3e50cc73d6;p=gpl%2Fargeo-slc.git

Clean session management.

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

diff --git a/plugins/org.argeo.slc.client.ui/META-INF/spring/editors.xml b/plugins/org.argeo.slc.client.ui/META-INF/spring/editors.xml
index 31267a15a..fd98808b4 100644
--- a/plugins/org.argeo.slc.client.ui/META-INF/spring/editors.xml
+++ b/plugins/org.argeo.slc.client.ui/META-INF/spring/editors.xml
@@ -8,8 +8,6 @@
 		scope="prototype">
 		<property name="processController" ref="processController" />
 		<property name="modulesManager" ref="modulesManager" />
-		<property name="session">
-			<bean factory-bean="repository" factory-method="login" />
-		</property>
+		<property name="repository" ref="repository" />
 	</bean>
 </beans>
diff --git a/plugins/org.argeo.slc.client.ui/META-INF/spring/jcr.xml b/plugins/org.argeo.slc.client.ui/META-INF/spring/jcr.xml
deleted file mode 100644
index b2043e29b..000000000
--- a/plugins/org.argeo.slc.client.ui/META-INF/spring/jcr.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-	<bean id="session" class="org.argeo.jcr.spring.ThreadBoundSession">
-		<property name="repository" ref="repository" />
-	</bean>
-</beans>
diff --git a/plugins/org.argeo.slc.client.ui/META-INF/spring/views.xml b/plugins/org.argeo.slc.client.ui/META-INF/spring/views.xml
index 9c4b4a908..eca8f68a4 100644
--- a/plugins/org.argeo.slc.client.ui/META-INF/spring/views.xml
+++ b/plugins/org.argeo.slc.client.ui/META-INF/spring/views.xml
@@ -6,18 +6,23 @@
 
 	<bean id="jcrExecutionModulesView" class="org.argeo.slc.client.ui.views.JcrExecutionModulesView"
 		scope="prototype">
-		<property name="session" ref="session" />
+		<property name="repository" ref="repository" />
 		<property name="modulesManager" ref="modulesManager" />
 	</bean>
 
 	<bean id="jcrProcessListView" class="org.argeo.slc.client.ui.views.JcrProcessListView"
 		scope="prototype">
-		<property name="session" ref="session" />
+		<property name="repository" ref="repository" />
 	</bean>
 
 	<bean id="jcrResultListView" class="org.argeo.slc.client.ui.views.JcrResultListView"
 		scope="prototype">
-		<property name="session" ref="session" />
+		<property name="repository" ref="repository" />
 	</bean>
 
-</beans>
+	<bean id="jcrResultTreeView" class="org.argeo.slc.client.ui.views.JcrResultTreeView"
+		scope="prototype">
+		<property name="repository" ref="repository" />
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/plugins/org.argeo.slc.client.ui/plugin.xml b/plugins/org.argeo.slc.client.ui/plugin.xml
index d1855da09..6f802b40f 100644
--- a/plugins/org.argeo.slc.client.ui/plugin.xml
+++ b/plugins/org.argeo.slc.client.ui/plugin.xml
@@ -19,6 +19,13 @@
 	         name="Results"
 	         restorable="true">
 	   </view>
+	   <view
+	         id="org.argeo.slc.client.ui.jcrResultTreeView"
+	         class="org.argeo.eclipse.spring.SpringExtensionFactory"
+	         icon="icons/results.gif"
+	         name="Results"
+	         restorable="true">
+	   </view>
 	   <view
 	         id="org.argeo.slc.client.ui.jcrProcessListView"
 	         class="org.argeo.eclipse.spring.SpringExtensionFactory"
diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcExecutionPerspective.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcExecutionPerspective.java
index 257029f3b..743b5d8ed 100644
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcExecutionPerspective.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcExecutionPerspective.java
@@ -31,7 +31,8 @@ public class SlcExecutionPerspective implements IPerspectiveFactory {
 		IFolderLayout left = layout.createFolder("left", IPageLayout.LEFT,
 				0.3f, editorArea);
 		left.addView(ClientUiPlugin.ID + ".jcrExecutionModulesView");
-		left.addView(ClientUiPlugin.ID + ".jcrResultListView");
+		// left.addView(ClientUiPlugin.ID + ".jcrResultListView");
+		left.addView(ClientUiPlugin.ID + ".jcrResultTreeView");
 		// Sleak view for SWT resource debugging
 		// left.addView("org.eclipse.swt.tools.views.SleakView");
 
diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RefreshJcrResultTreeView.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RefreshJcrResultTreeView.java
index ecc81242a..b7600b9e1 100644
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RefreshJcrResultTreeView.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RefreshJcrResultTreeView.java
@@ -15,22 +15,6 @@
  */
 package org.argeo.slc.client.ui.commands;
 
-/*
- * Copyright (C) 2007-2012 Mathieu Baudier
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 import java.util.Iterator;
 
 import org.argeo.slc.client.ui.ClientUiPlugin;
diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditor.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditor.java
index 7e99f4254..59473c667 100644
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditor.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessEditor.java
@@ -22,6 +22,7 @@ import java.util.UUID;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.Property;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
@@ -109,6 +110,7 @@ public class ProcessEditor extends FormEditor implements SlcTypes, SlcNames {
 	@Override
 	public void dispose() {
 		JcrUtils.logoutQuietly(session);
+		super.dispose();
 	}
 
 	/** Actually runs the process. */
@@ -230,8 +232,8 @@ public class ProcessEditor extends FormEditor implements SlcTypes, SlcNames {
 			editorDirtyStateChanged();
 		} catch (RepositoryException e) {
 			throw new SlcException("Cannot save " + processNode, e);
-		} finally {
-			JcrUtils.discardQuietly(session);
+			// } finally {
+			// JcrUtils.discardQuietly(session);
 		}
 	}
 
@@ -257,10 +259,20 @@ public class ProcessEditor extends FormEditor implements SlcTypes, SlcNames {
 	// }
 
 	/** Expects one session per editor. */
+	@Deprecated
 	public void setSession(Session session) {
 		this.session = session;
 	}
 
+	public void setRepository(Repository repository) {
+		try {
+			session = repository.login();
+		} catch (RepositoryException re) {
+			throw new SlcException("Unable to log in Repository " + repository,
+					re);
+		}
+	}
+
 	public void setProcessController(ProcessController processController) {
 		this.processController = processController;
 	}
@@ -268,5 +280,4 @@ public class ProcessEditor extends FormEditor implements SlcTypes, SlcNames {
 	public void setModulesManager(ExecutionModulesManager modulesManager) {
 		this.modulesManager = modulesManager;
 	}
-
 }
diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
index 3d73adc27..71f291e8a 100644
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
@@ -26,6 +26,7 @@ import java.util.TreeSet;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.Property;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
@@ -41,6 +42,7 @@ import org.argeo.eclipse.ui.jcr.DefaultNodeLabelProvider;
 import org.argeo.eclipse.ui.jcr.NodeElementComparer;
 import org.argeo.eclipse.ui.jcr.SimpleNodeContentProvider;
 import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;
+import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.ClientUiPlugin;
 import org.argeo.slc.client.ui.SlcImages;
@@ -427,12 +429,28 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 		}
 	}
 
+	public void dispose() {
+		JcrUtils.logoutQuietly(session);
+		super.dispose();
+	}
+
 	// DEPENDENCY INJECTION
+
+	public void setModulesManager(ExecutionModulesManager modulesManager) {
+		this.modulesManager = modulesManager;
+	}
+
+	@Deprecated
 	public void setSession(Session session) {
 		this.session = session;
 	}
 
-	public void setModulesManager(ExecutionModulesManager modulesManager) {
-		this.modulesManager = modulesManager;
+	public void setRepository(Repository repository) {
+		try {
+			session = repository.login();
+		} catch (RepositoryException re) {
+			throw new SlcException("Unable to log in Repository " + repository,
+					re);
+		}
 	}
 }
\ No newline at end of file
diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrProcessListView.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrProcessListView.java
index 27a39cf7b..f6a20dc10 100644
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrProcessListView.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrProcessListView.java
@@ -23,6 +23,7 @@ import java.util.List;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.Property;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.observation.Event;
@@ -135,12 +136,6 @@ public class JcrProcessListView extends ViewPart {
 		viewer.getControl().setFocus();
 	}
 
-	@Override
-	public void dispose() {
-		JcrUtils.unregisterQuietly(session.getWorkspace(), processesObserver);
-		super.dispose();
-	}
-
 	class ContentProvider implements IStructuredContentProvider {
 
 		public Object[] getElements(Object inputElement) {
@@ -246,8 +241,24 @@ public class JcrProcessListView extends ViewPart {
 
 	}
 
+	@Deprecated
 	public void setSession(Session session) {
 		this.session = session;
 	}
 
+	public void dispose() {
+		JcrUtils.unregisterQuietly(session.getWorkspace(), processesObserver);
+		JcrUtils.logoutQuietly(session);
+		super.dispose();
+	}
+
+	public void setRepository(Repository repository) {
+		try {
+			session = repository.login();
+		} catch (RepositoryException re) {
+			throw new SlcException("Unable to log in Repository " + repository,
+					re);
+		}
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultListView.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultListView.java
index 0f25c7ce7..4bfb57c19 100644
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultListView.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultListView.java
@@ -22,6 +22,7 @@ import java.util.List;
 
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.observation.Event;
@@ -157,12 +158,6 @@ public class JcrResultListView extends ViewPart implements SlcNames {
 		viewer.getControl().setFocus();
 	}
 
-	@Override
-	public void dispose() {
-		JcrUtils.unregisterQuietly(session.getWorkspace(), resultsObserver);
-		super.dispose();
-	}
-
 	class ViewContentProvider implements IStructuredContentProvider {
 
 		public Object[] getElements(Object inputElement) {
@@ -274,7 +269,23 @@ public class JcrResultListView extends ViewPart implements SlcNames {
 		}
 	}
 
+	@Deprecated
 	public void setSession(Session session) {
 		this.session = session;
 	}
+
+	public void dispose() {
+		JcrUtils.unregisterQuietly(session.getWorkspace(), resultsObserver);
+		JcrUtils.logoutQuietly(session);
+		super.dispose();
+	}
+
+	public void setRepository(Repository repository) {
+		try {
+			session = repository.login();
+		} catch (RepositoryException re) {
+			throw new SlcException("Unable to log in Repository " + repository,
+					re);
+		}
+	}
 }
\ No newline at end of file
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 5ace2381a..f0ec30ed9 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
@@ -25,6 +25,7 @@ import java.util.List;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.Property;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
@@ -948,7 +949,23 @@ public class JcrResultTreeView extends ViewPart {
 	}
 
 	/* DEPENDENCY INJECTION */
+	@Deprecated
 	public void setSession(Session session) {
 		this.session = session;
 	}
+
+	public void dispose() {
+		// JcrUtils.unregisterQuietly(session.getWorkspace(), resultsObserver);
+		JcrUtils.logoutQuietly(session);
+		super.dispose();
+	}
+
+	public void setRepository(Repository repository) {
+		try {
+			session = repository.login();
+		} catch (RepositoryException re) {
+			throw new SlcException("Unable to log in Repository " + repository,
+					re);
+		}
+	}
 }
\ No newline at end of file