From 8edbca70380f4c884f523073819fd915754185d2 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 16 Feb 2010 09:01:18 +0000 Subject: [PATCH] Improve agent naming git-svn-id: https://svn.argeo.org/slc/trunk@3361 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../AbstractExecutionModulesManager.java | 145 ------------------ .../argeo/slc/core/runtime/AbstractAgent.java | 23 --- .../argeo/slc/core/runtime/DefaultAgent.java | 41 +++++ .../main/java/org/argeo/slc/jms/JmsAgent.java | 21 +-- runtime/pom.xml | 13 ++ 5 files changed, 57 insertions(+), 186 deletions(-) delete mode 100644 runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/runtime/AbstractAgent.java create mode 100644 runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/runtime/DefaultAgent.java diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java index 4e5672638..967c001cc 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java @@ -15,156 +15,11 @@ public abstract class AbstractExecutionModulesManager implements public void process(SlcExecution slcExecution) { new ProcessThread(this, slcExecution).start(); } -/* - protected void dispatchUpdateStatus(SlcExecution slcExecution, - String oldStatus, String newStatus) { - for (Iterator it = slcExecutionNotifiers - .iterator(); it.hasNext();) { - it.next().updateStatus(slcExecution, oldStatus, newStatus); - } - } - - protected synchronized void dispatchAddStep(SlcExecution slcExecution, - SlcExecutionStep step) { - slcExecution.getSteps().add(step); - List steps = new ArrayList(); - steps.add(step); - for (Iterator it = slcExecutionNotifiers - .iterator(); it.hasNext();) { - it.next().addSteps(slcExecution, steps); - } - }*/ public void setSlcExecutionNotifiers( List slcExecutionNotifiers) { this.slcExecutionNotifiers = slcExecutionNotifiers; } -/* - protected static void addFlowsToDescriptor(ExecutionModuleDescriptor md, - Map executionFlows) { - // TODO: put this in a separate configurable object - for (String name : executionFlows.keySet()) { - ExecutionFlow executionFlow = executionFlows.get(name); - - Assert.notNull(executionFlow.getName()); - Assert.state(name.equals(executionFlow.getName())); - - ExecutionSpec executionSpec = executionFlow.getExecutionSpec(); - Assert.notNull(executionSpec); - Assert.notNull(executionSpec.getName()); - - Map values = new TreeMap(); - for (String key : executionSpec.getAttributes().keySet()) { - ExecutionSpecAttribute attribute = executionSpec - .getAttributes().get(key); - - if (executionFlow.isSetAsParameter(key)) { - Object value = executionFlow.getParameter(key); - if (attribute instanceof PrimitiveSpecAttribute) { - PrimitiveValue primitiveValue = new PrimitiveValue(); - primitiveValue - .setType(((PrimitiveSpecAttribute) attribute) - .getType()); - primitiveValue.setValue(value); - values.put(key, primitiveValue); - } else if (attribute instanceof RefSpecAttribute) { - RefValue refValue = new RefValue(); - if (value instanceof ScopedObject) { - refValue.setLabel("RUNTIME " - + value.getClass().getName()); - } else { - refValue.setLabel("STATIC " - + value.getClass().getName()); - } - values.put(key, refValue); - } else { - throw new SlcException("Unkown spec attribute type " - + attribute.getClass()); - } - } - - } - - ExecutionFlowDescriptor efd = new ExecutionFlowDescriptor(name, - values, executionSpec); - if (executionFlow.getPath() != null) - efd.setPath(executionFlow.getPath()); - - // Add execution spec if necessary - if (!md.getExecutionSpecs().contains(executionSpec)) - md.getExecutionSpecs().add(executionSpec); - - // Add execution flow - md.getExecutionFlows().add(efd); - } - } -*/ - /** - * Thread of the SLC Process, starting the sub executions. private class - * ProcessThread extends Thread { private final SlcExecution slcProcess; - * private final ThreadGroup processThreadGroup; private final - * List flowsToProcess = new ArrayList(); - * - * public ProcessThread(ThreadGroup processesThreadGroup, SlcExecution - * slcExecution) { super(processesThreadGroup, "SLC Process #" + - * slcExecution.getUuid()); this.slcProcess = slcExecution; - * processThreadGroup = new ThreadGroup("SLC Process #" + - * slcExecution.getUuid() + " thread group"); } - * - * public void run() { log.info("\n##\n## Process SLC Execution " + - * slcProcess + "\n##\n"); - * - * slcProcess.setStatus(SlcExecution.STATUS_RUNNING); - * dispatchUpdateStatus(slcProcess, SlcExecution.STATUS_SCHEDULED, - * SlcExecution.STATUS_RUNNING); - * - * flowsToProcess.addAll(slcProcess.getRealizedFlows()); - * - * while (flowsToProcess.size() > 0) { RealizedFlow flow = - * flowsToProcess.remove(0); ExecutionThread thread = new - * ExecutionThread(this, flow); thread.start(); - * - * synchronized (this) { try { wait(); } catch (InterruptedException e) { // - * silent } } } - * - * slcProcess.setStatus(SlcExecution.STATUS_FINISHED); - * dispatchUpdateStatus(slcProcess, SlcExecution.STATUS_RUNNING, - * SlcExecution.STATUS_FINISHED); } - * - * public synchronized void flowCompleted() { notifyAll(); } - * - * public SlcExecution getSlcProcess() { return slcProcess; } - * - * public ThreadGroup getProcessThreadGroup() { return processThreadGroup; } - * } - */ - - /** - * Thread of a single execution private class ExecutionThread extends Thread - * { private final RealizedFlow realizedFlow; private final ProcessThread - * processThread; - * - * public ExecutionThread(ProcessThread processThread, RealizedFlow - * realizedFlow) { super(processThread.getProcessThreadGroup(), "Flow " + - * realizedFlow.getFlowDescriptor().getName()); this.realizedFlow = - * realizedFlow; this.processThread = processThread; } - * - * public void run() { ExecutionFlowDescriptor executionFlowDescriptor = - * realizedFlow .getFlowDescriptor(); String flowName = - * executionFlowDescriptor.getName(); - * - * dispatchAddStep(processThread.getSlcProcess(), new - * SlcExecutionStep(SlcExecutionStep.TYPE_PHASE_START, "Flow " + flowName)); - * - * try { execute(realizedFlow); } catch (Exception e) { // TODO: re-throw - * exception ? String msg = "Execution of flow " + flowName + " failed."; - * log.error(msg, e); dispatchAddStep(processThread.getSlcProcess(), new - * SlcExecutionStep(msg + " " + e.getMessage())); } finally { - * processThread.flowCompleted(); - * dispatchAddStep(processThread.getSlcProcess(), new - * SlcExecutionStep(SlcExecutionStep.TYPE_PHASE_END, "Flow " + flowName)); } - * } } - */ public List getSlcExecutionNotifiers() { return slcExecutionNotifiers; diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/runtime/AbstractAgent.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/runtime/AbstractAgent.java deleted file mode 100644 index 455bd9ccb..000000000 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/runtime/AbstractAgent.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.argeo.slc.core.runtime; - -import org.argeo.slc.execution.ExecutionModulesManager; -import org.argeo.slc.process.SlcExecution; - -public abstract class AbstractAgent { -// private final static Log log = LogFactory.getLog(AbstractAgent.class); - - private ExecutionModulesManager modulesManager; - public void runSlcExecution(final SlcExecution slcExecution) { - modulesManager.process(slcExecution); - } - - public void setModulesManager(ExecutionModulesManager modulesManager) { - this.modulesManager = modulesManager; - } - - public ExecutionModulesManager getModulesManager() { - return modulesManager; - } - - -} diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/runtime/DefaultAgent.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/runtime/DefaultAgent.java new file mode 100644 index 000000000..141ccbe72 --- /dev/null +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/runtime/DefaultAgent.java @@ -0,0 +1,41 @@ +package org.argeo.slc.core.runtime; + +import java.util.List; + +import org.argeo.slc.execution.ExecutionModuleDescriptor; +import org.argeo.slc.execution.ExecutionModulesManager; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.runtime.SlcAgent; + +public class DefaultAgent implements SlcAgent { + // private final static Log log = LogFactory.getLog(AbstractAgent.class); + + private ExecutionModulesManager modulesManager; + + public void runSlcExecution(final SlcExecution slcExecution) { + modulesManager.process(slcExecution); + } + + public ExecutionModuleDescriptor getExecutionModuleDescriptor( + String moduleName, String version) { + return modulesManager.getExecutionModuleDescriptor(moduleName, + version); + } + + public List listExecutionModuleDescriptors() { + return modulesManager.listExecutionModules(); + } + + public boolean ping() { + return true; + } + + public void setModulesManager(ExecutionModulesManager modulesManager) { + this.modulesManager = modulesManager; + } + + public ExecutionModulesManager getModulesManager() { + return modulesManager; + } + +} diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java index 47e218301..89ecb2fe5 100644 --- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java +++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java @@ -13,13 +13,12 @@ import javax.jms.MessageListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.slc.SlcException; -import org.argeo.slc.core.runtime.AbstractAgent; +import org.argeo.slc.core.runtime.DefaultAgent; import org.argeo.slc.execution.ExecutionModuleDescriptor; import org.argeo.slc.msg.ExecutionAnswer; import org.argeo.slc.msg.MsgConstants; import org.argeo.slc.msg.ReferenceList; import org.argeo.slc.process.SlcExecution; -import org.argeo.slc.runtime.SlcAgent; import org.argeo.slc.runtime.SlcAgentDescriptor; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; @@ -28,8 +27,8 @@ import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.core.MessagePostProcessor; /** JMS based implementation of SLC Agent. */ -public class JmsAgent extends AbstractAgent implements SlcAgent, - InitializingBean, DisposableBean, MessageListener { +public class JmsAgent extends DefaultAgent implements InitializingBean, + DisposableBean, MessageListener { public final static String PROPERTY_QUERY = "query"; public final static String QUERY_PING_ALL = "pingAll"; @@ -98,20 +97,6 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, return messageSelector; } - public ExecutionModuleDescriptor getExecutionModuleDescriptor( - String moduleName, String version) { - return getModulesManager().getExecutionModuleDescriptor(moduleName, - version); - } - - public List listExecutionModuleDescriptors() { - return getModulesManager().listExecutionModules(); - } - - public boolean ping() { - return true; - } - public void onMessage(final Message message) { final String query; final String correlationId; diff --git a/runtime/pom.xml b/runtime/pom.xml index 0d6c3ec16..d1a43c8fe 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -46,6 +46,19 @@ + + maven-clean-plugin + + + + META-INF + + MANIFEST.MF + + + + + org.apache.maven.plugins maven-jar-plugin -- 2.39.2