]> git.argeo.org Git - gpl/argeo-slc.git/commitdiff
Improve agent naming
authorMathieu Baudier <mbaudier@argeo.org>
Tue, 16 Feb 2010 09:01:18 +0000 (09:01 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Tue, 16 Feb 2010 09:01:18 +0000 (09:01 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@3361 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java
runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/runtime/AbstractAgent.java [deleted file]
runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/runtime/DefaultAgent.java [new file with mode: 0644]
runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java
runtime/pom.xml

index 4e5672638fb1311b40a26e847285101f67fe24b4..967c001cc77b762db50061eef7ae2ab8738ab5d4 100644 (file)
@@ -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<SlcExecutionNotifier> it = slcExecutionNotifiers
-                               .iterator(); it.hasNext();) {
-                       it.next().updateStatus(slcExecution, oldStatus, newStatus);
-               }
-       }
-
-       protected synchronized void dispatchAddStep(SlcExecution slcExecution,
-                       SlcExecutionStep step) {
-               slcExecution.getSteps().add(step);
-               List<SlcExecutionStep> steps = new ArrayList<SlcExecutionStep>();
-               steps.add(step);
-               for (Iterator<SlcExecutionNotifier> it = slcExecutionNotifiers
-                               .iterator(); it.hasNext();) {
-                       it.next().addSteps(slcExecution, steps);
-               }
-       }*/
 
        public void setSlcExecutionNotifiers(
                        List<SlcExecutionNotifier> slcExecutionNotifiers) {
                this.slcExecutionNotifiers = slcExecutionNotifiers;
        }
-/*
-       protected static void addFlowsToDescriptor(ExecutionModuleDescriptor md,
-                       Map<String, ExecutionFlow> 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<String, Object> values = new TreeMap<String, Object>();
-                       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<RealizedFlow> flowsToProcess = new ArrayList<RealizedFlow>();
-        * 
-        * 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<SlcExecutionNotifier> 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 (file)
index 455bd9c..0000000
+++ /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 (file)
index 0000000..141ccbe
--- /dev/null
@@ -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<ExecutionModuleDescriptor> listExecutionModuleDescriptors() {
+               return modulesManager.listExecutionModules();
+       }
+
+       public boolean ping() {
+               return true;
+       }
+
+       public void setModulesManager(ExecutionModulesManager modulesManager) {
+               this.modulesManager = modulesManager;
+       }
+
+       public ExecutionModulesManager getModulesManager() {
+               return modulesManager;
+       }
+
+}
index 47e218301ff08b1c7eae374398a277c140c0eb10..89ecb2fe5c3dace8285c92cc7e8caaaa39ac845d 100644 (file)
@@ -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<ExecutionModuleDescriptor> listExecutionModuleDescriptors() {
-               return getModulesManager().listExecutionModules();
-       }
-
-       public boolean ping() {
-               return true;
-       }
-
        public void onMessage(final Message message) {
                final String query;
                final String correlationId;
index 0d6c3ec161777fcc79234d425b9a7b4fa59fe70a..d1a43c8fe1d95028dc96ce185d67091e111281a7 100644 (file)
                        </resource>
                </resources>
                <plugins>
+                       <plugin>
+                               <artifactId>maven-clean-plugin</artifactId>
+                               <configuration>
+                                       <filesets>
+                                               <fileset>
+                                                       <directory>META-INF</directory>
+                                                       <includes>
+                                                               <include>MANIFEST.MF</include>
+                                                       </includes>
+                                               </fileset>
+                                       </filesets>
+                               </configuration>
+                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-jar-plugin</artifactId>