X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.suite.e4.rap%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fe4%2Frap%2FArgeoSuiteLoginLifecycle.java;h=6b4197c9a035e3c3abfec37e66ea88318858224e;hb=19301ef6555ee03f1d7b9b0764c2d40b5ef6654b;hp=0b2d1527b5577893a2868750ea2d9f480db5a946;hpb=95acdff32f2404dca9ee34c9a3978cb38a8d07d4;p=gpl%2Fargeo-suite.git

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 0b2d152..6b4197c 100644
--- 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
@@ -4,7 +4,6 @@ import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -13,6 +12,7 @@ import javax.security.auth.Subject;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.api.NodeConstants;
 import org.argeo.cms.e4.rap.CmsLoginLifecycle;
 import org.argeo.connect.ui.SystemWorkbenchService;
 import org.argeo.jcr.JcrUtils;
@@ -23,7 +23,6 @@ public class ArgeoSuiteLoginLifecycle extends CmsLoginLifecycle {
 	SystemWorkbenchService systemWorkbenchService;
 
 	@Inject
-	@Named("(cn=home)")
 	Repository repository;
 
 	@Override
@@ -48,7 +47,7 @@ public class ArgeoSuiteLoginLifecycle extends CmsLoginLifecycle {
 				@Override
 				public Session run() throws PrivilegedActionException {
 					try {
-						return repository.login();
+						return repository.login(NodeConstants.HOME_WORKSPACE);
 					} catch (RepositoryException e) {
 						throw new PrivilegedActionException(e);
 					}
@@ -63,6 +62,7 @@ public class ArgeoSuiteLoginLifecycle extends CmsLoginLifecycle {
 			}
 		} catch (RepositoryException | PrivilegedActionException e) {
 			log.error("Cannot load state " + state, e);
+			getBrowserNavigation().pushState("~", null);
 		} finally {
 			JcrUtils.logoutQuietly(session);
 		}