From: Bruno Sinou <bsinou@argeo.org>
Date: Wed, 26 Oct 2016 15:29:02 +0000 (+0000)
Subject: Rather use DataAdmin login context
X-Git-Tag: argeo-commons-2.1.50~5
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=7f1de6ba18c43c25e1138d3e64dd2dcd3aaf52d5;p=lgpl%2Fargeo-commons.git

Rather use DataAdmin login context

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

diff --git a/org.argeo.cms/src/org/argeo/cms/spring/AbstractSystemExecution.java b/org.argeo.cms/src/org/argeo/cms/spring/AbstractSystemExecution.java
index a7297ef36..f478f37db 100644
--- a/org.argeo.cms/src/org/argeo/cms/spring/AbstractSystemExecution.java
+++ b/org.argeo.cms/src/org/argeo/cms/spring/AbstractSystemExecution.java
@@ -22,14 +22,13 @@ import javax.security.auth.login.LoginException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
+import org.argeo.node.NodeConstants;
 
 /** Provides base method for executing code with system authorization. */
 abstract class AbstractSystemExecution {
 	private final static Log log = LogFactory.getLog(AbstractSystemExecution.class);
 	private final Subject subject = new Subject();
 
-	private final String loginModule = "SYSTEM";
-
 	/**
 	 * Authenticate the calling thread to the underlying
 	 * {@link AuthenticationManager}
@@ -38,7 +37,7 @@ abstract class AbstractSystemExecution {
 		ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader();
 		Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
 		try {
-			LoginContext lc = new LoginContext(loginModule, subject);
+			LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN, subject);
 			lc.login();
 		} catch (LoginException e) {
 			throw new CmsException("Cannot login as system", e);
@@ -53,7 +52,7 @@ abstract class AbstractSystemExecution {
 		ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader();
 		Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
 		try {
-			LoginContext lc = new LoginContext(loginModule, subject);
+			LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN, subject);
 			lc.logout();
 		} catch (LoginException e) {
 			throw new CmsException("Cannot logout as system", e);