X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FProcessThread.java;h=8e7584b2bff8bb7fbf4b790cffa7eec0d59fe79c;hb=0e75bed97c103d94640dd4c8e36cdce24b11390a;hp=b116696f16ee15a2227db219f7e7ca54622a265e;hpb=60677ee743e6d54ceda3187824cef28cf844ccc0;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java index b116696f1..8e7584b2b 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Mathieu Baudier + * Copyright (C) 2007-2012 Argeo GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.argeo.slc.core.execution; import java.util.ArrayList; @@ -28,11 +27,10 @@ import org.argeo.slc.SlcException; import org.argeo.slc.execution.ExecutionModulesManager; import org.argeo.slc.execution.ExecutionProcess; import org.argeo.slc.execution.ExecutionStep; -import org.argeo.slc.process.RealizedFlow; -import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.execution.RealizedFlow; +import org.springframework.security.Authentication; +import org.springframework.security.context.SecurityContextHolder; -/** Thread of the SLC Process, starting the sub executions. */ -@SuppressWarnings("deprecation") public class ProcessThread extends Thread { private final static Log log = LogFactory.getLog(ProcessThread.class); @@ -57,6 +55,16 @@ public class ProcessThread extends Thread { } public final void run() { + // authenticate thread + Authentication authentication = getProcessThreadGroup() + .getAuthentication(); + if (authentication == null) + throw new SlcException("Can only execute authenticated threads"); + SecurityContextHolder.getContext().setAuthentication(authentication); + + // log.info("\n##\n## SLC Process #" + process.getUuid() + + // " STARTED by " + // + authentication.getName() + "\n##\n"); log.info("\n##\n## SLC Process #" + process.getUuid() + " STARTED\n##\n"); @@ -126,13 +134,8 @@ public class ProcessThread extends Thread { * custom process types. Default expects an {@link SlcExecution}. */ protected void process() throws InterruptedException { - if (!(process instanceof SlcExecution)) - throw new SlcException("Unsupported process type " - + process.getClass()); - SlcExecution slcExecution = (SlcExecution) process; List flowsToProcess = new ArrayList(); - flowsToProcess.addAll(slcExecution.getRealizedFlows()); - + flowsToProcess.addAll(process.getRealizedFlows()); while (flowsToProcess.size() > 0) { RealizedFlow realizedFlow = flowsToProcess.remove(0); execute(realizedFlow, true);