Fix SVN issues

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.simple / src / main / java / org / argeo / slc / core / execution / AbstractSpringExecutionModule.java

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java
index 1cac123a81daf00a9489529a07e967aa5533eddb..bca30d0ed2baa1c5715e641ce82c8bffae7aafd5 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java
@@ -19,25 +19,22 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.util.Assert;
 
-public abstract class AbstractSpringExecutionModule implements ExecutionModule,
-               ApplicationContextAware {
+@Deprecated
+public abstract class AbstractSpringExecutionModule implements ExecutionModule
+                {
+/*
+       protected ApplicationContext applicationContext;
 
-       private ApplicationContext applicationContext;
+       protected ExecutionContext executionContext;
 
-       private ExecutionContext executionContext;
-
-       private ExecutionFlowDescriptorConverter descriptorConverter = new DefaultDescriptorConverter();
+       protected ExecutionFlowDescriptorConverter descriptorConverter = new DefaultDescriptorConverter();
 
        public ExecutionModuleDescriptor getDescriptor() {
                ExecutionModuleDescriptor md = new ExecutionModuleDescriptor();
                md.setName(getName());
                md.setVersion(getVersion());
 
-               GenericBeanFactoryAccessor accessor = new GenericBeanFactoryAccessor(
-                               applicationContext);
-               Map<String, ExecutionFlow> executionFlows = accessor
-                               .getBeansOfType(ExecutionFlow.class);
-
+               Map<String, ExecutionFlow> executionFlows = listFlows();
                for (String name : executionFlows.keySet()) {
                        ExecutionFlow executionFlow = executionFlows.get(name);
 
@@ -103,13 +100,21 @@ public abstract class AbstractSpringExecutionModule implements ExecutionModule,
                return md;
        }
 
+       protected Map<String, ExecutionFlow> listFlows() {
+               GenericBeanFactoryAccessor accessor = new GenericBeanFactoryAccessor(
+                               applicationContext);
+               Map<String, ExecutionFlow> executionFlows = accessor
+                               .getBeansOfType(ExecutionFlow.class);
+               return executionFlows;
+       }
+
        public void execute(ExecutionFlowDescriptor executionFlowDescriptor) {
                if (descriptorConverter != null)
                        executionContext.addVariables(descriptorConverter
                                        .convertValues(executionFlowDescriptor));
                ExecutionFlow flow = (ExecutionFlow) applicationContext.getBean(
                                executionFlowDescriptor.getName(), ExecutionFlow.class);
-               flow.execute();
+               flow.run();
        }
 
        public void setApplicationContext(ApplicationContext applicationContext)
@@ -124,6 +129,6 @@ public abstract class AbstractSpringExecutionModule implements ExecutionModule,
        public void setDescriptorConverter(
                        ExecutionFlowDescriptorConverter descriptorConverter) {
                this.descriptorConverter = descriptorConverter;
-       }
+       }*/
 
 }