X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=legacy%2Forg.argeo.slc.spring%2Fsrc%2Forg%2Fargeo%2Fslc%2Fspring%2Fauth%2FAbstractSystemExecution.java;fp=legacy%2Forg.argeo.slc.spring%2Fsrc%2Forg%2Fargeo%2Fslc%2Fspring%2Fauth%2FAbstractSystemExecution.java;h=7ec36bc1b11b0ad33b1e02046a5e027324fe8387;hb=fbde11e8a342318876a4744c4676d3618bdf8583;hp=eb1d73155db6fdc360815b9d8a7cfa7346d98739;hpb=69a25048f4a4e78a00e1a8a60455e83e00e06dcc;p=gpl%2Fargeo-slc.git diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/auth/AbstractSystemExecution.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/auth/AbstractSystemExecution.java index eb1d73155..7ec36bc1b 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/auth/AbstractSystemExecution.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/auth/AbstractSystemExecution.java @@ -4,14 +4,13 @@ import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsAuth; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; /** Provides base method for executing code with system authorization. */ abstract class AbstractSystemExecution { - private final static Log log = LogFactory.getLog(AbstractSystemExecution.class); + private final static CmsLog log = CmsLog.getLog(AbstractSystemExecution.class); private final Subject subject = new Subject(); /** Authenticate the calling thread */ @@ -19,7 +18,7 @@ abstract class AbstractSystemExecution { ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); try { - LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN, subject); + LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_DATA_ADMIN, subject); lc.login(); } catch (LoginException e) { throw new SlcException("Cannot login as system", e); @@ -34,7 +33,7 @@ abstract class AbstractSystemExecution { ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); try { - LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN, subject); + LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_DATA_ADMIN, subject); lc.logout(); } catch (LoginException e) { throw new SlcException("Cannot logout as system", e);