X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FSpnegoLoginModule.java;h=2dbad96d28d592bcb007d7e186ea6223c054f62c;hb=f4da6777015da3fc392138f0c01cea2f2add9ed3;hp=568e2f6e0f6d085794e84932e7ff5b241d3cef60;hpb=7064547ae5d85225546f1b8f15d6b5c82f30fe22;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/auth/SpnegoLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/SpnegoLoginModule.java index 568e2f6e0..2dbad96d2 100644 --- a/org.argeo.cms/src/org/argeo/cms/auth/SpnegoLoginModule.java +++ b/org.argeo.cms/src/org/argeo/cms/auth/SpnegoLoginModule.java @@ -8,9 +8,8 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.cms.internal.kernel.Activator; +import org.argeo.api.cms.CmsLog; +import org.argeo.cms.internal.runtime.CmsContextImpl; import org.ietf.jgss.GSSContext; import org.ietf.jgss.GSSCredential; import org.ietf.jgss.GSSException; @@ -19,7 +18,7 @@ import org.ietf.jgss.GSSName; /** SPNEGO login */ public class SpnegoLoginModule implements LoginModule { - private final static Log log = LogFactory.getLog(SpnegoLoginModule.class); + private final static CmsLog log = CmsLog.getLog(SpnegoLoginModule.class); private Subject subject; private Map sharedState = null; @@ -112,7 +111,7 @@ public class SpnegoLoginModule implements LoginModule { private GSSContext checkToken(byte[] authToken) { GSSManager manager = GSSManager.getInstance(); try { - GSSContext gContext = manager.createContext(Activator.getAcceptorCredentials()); + GSSContext gContext = manager.createContext(CmsContextImpl.getAcceptorCredentials()); if (gContext == null) { log.debug("SpnegoUserRealm: failed to establish GSSContext"); @@ -133,7 +132,8 @@ public class SpnegoLoginModule implements LoginModule { } + @Deprecated public static boolean hasAcceptorCredentials() { - return Activator.getAcceptorCredentials() != null; + return CmsContextImpl.getAcceptorCredentials() != null; } }