X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fcore%2FAbstractSystemExecution.java;h=81eeadf21b146f42d628aeff841c64ba2128d639;hb=86140b8db15a11cfd942892eface6a4f90329a41;hp=42cf42eef34bd58afc4eda67286ff0805f4ebc57;hpb=2b3904582518de706357fd2a8216a47ca77dfc39;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.core/src/org/argeo/security/core/AbstractSystemExecution.java b/org.argeo.security.core/src/org/argeo/security/core/AbstractSystemExecution.java
index 42cf42eef..81eeadf21 100644
--- a/org.argeo.security.core/src/org/argeo/security/core/AbstractSystemExecution.java
+++ b/org.argeo.security.core/src/org/argeo/security/core/AbstractSystemExecution.java
@@ -22,26 +22,15 @@ import javax.security.auth.login.LoginException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
-import org.springframework.security.authentication.AuthenticationManager;
 
 /** Provides base method for executing code with system authorization. */
 public abstract class AbstractSystemExecution {
 	private final static Log log = LogFactory
 			.getLog(AbstractSystemExecution.class);
-	// private AuthenticationManager authenticationManager;
 	private final Subject subject = new Subject();
-	// private String systemAuthenticationKey;
 
 	private final String loginModule = "SYSTEM";
 
-	/** Whether the current thread was authenticated by this component. */
-	// private ThreadLocal<Boolean> authenticatedBySelf = new
-	// ThreadLocal<Boolean>() {
-	// protected Boolean initialValue() {
-	// return false;
-	// }
-	// };
-
 	/**
 	 * Authenticate the calling thread to the underlying
 	 * {@link AuthenticationManager}
@@ -53,33 +42,6 @@ public abstract class AbstractSystemExecution {
 		} catch (LoginException e) {
 			throw new ArgeoException("Cannot login as system", e);
 		}
-		// if (authenticatedBySelf.get())
-		// return;
-		// SecurityContext securityContext = SecurityContextHolder.getContext();
-		// Authentication currentAuth = securityContext.getAuthentication();
-		// if (currentAuth != null) {
-		// if (!(currentAuth instanceof SystemAuthentication))
-		// throw new ArgeoException(
-		// "System execution on an already authenticated thread: "
-		// + currentAuth + ", THREAD="
-		// + Thread.currentThread().getId());
-		// return;
-		// }
-		//
-		// String key = systemAuthenticationKey != null ?
-		// systemAuthenticationKey
-		// : System.getProperty(
-		// SystemAuthentication.SYSTEM_KEY_PROPERTY,
-		// InternalAuthentication.SYSTEM_KEY_DEFAULT);
-		// if (key == null)
-		// throw new ArgeoException("No system key defined");
-		// if (authenticationManager == null)
-		// throw new ArgeoException("Authentication manager cannot be null.");
-		// Authentication auth = authenticationManager
-		// .authenticate(new InternalAuthentication(key));
-		// securityContext.setAuthentication(auth);
-		//
-		// authenticatedBySelf.set(true);
 		if (log.isTraceEnabled())
 			log.trace("System authenticated");
 	}
@@ -96,22 +58,4 @@ public abstract class AbstractSystemExecution {
 	protected Subject getSubject() {
 		return subject;
 	}
-
-	// /**
-	// * Whether the current thread was authenticated by this component or a
-	// * parent thread.
-	// */
-	// protected Boolean isAuthenticatedBySelf() {
-	// return authenticatedBySelf.get();
-	// }
-	//
-	public void setAuthenticationManager(
-			AuthenticationManager authenticationManager) {
-		log.warn("Use of authenticationManager is deprecated, remove this property from the configuration.");
-	}
-
-	public void setSystemAuthenticationKey(String systemAuthenticationKey) {
-		log.warn("Use of systemAuthenticationKey is deprecated, remove this property from the configuration.");
-		// this.systemAuthenticationKey = systemAuthenticationKey;
-	}
 }