@update:79; Simplify the execution of flows

[gpl/argeo-slc.git] / runtime / org.argeo.slc.server / src / main / java / org / argeo / slc / web / mvc / execution / ListModulesDescriptors.java

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java
index 32cf1383ef40f929f855bc35d5a409d1e43f3489..392e46ebcf1bf851c2a0db539c0720a7fbde4b79 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java
@@ -1,42 +1,38 @@
 package org.argeo.slc.web.mvc.execution;\r
 \r
-import java.util.ArrayList;\r
 import java.util.List;\r
 \r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import org.argeo.slc.execution.ExecutionModule;\r
 import org.argeo.slc.execution.ExecutionModuleDescriptor;\r
-import org.argeo.slc.execution.ExecutionModulesManager;\r
 import org.argeo.slc.msg.ObjectList;\r
+import org.argeo.slc.runtime.SlcAgent;\r
+import org.argeo.slc.runtime.SlcAgentFactory;\r
 import org.argeo.slc.web.mvc.AbstractServiceController;\r
 import org.springframework.web.servlet.ModelAndView;\r
 \r
 /** . */\r
 public class ListModulesDescriptors extends AbstractServiceController {\r
-       private ExecutionModulesManager modulesManager;\r
+       private SlcAgentFactory agentFactory;\r
 \r
        @Override\r
        protected void handleServiceRequest(HttpServletRequest request,\r
                        HttpServletResponse response, ModelAndView modelAndView)\r
                        throws Exception {\r
 \r
-               List<ExecutionModule> modules = modulesManager.listExecutionModules();\r
+               // TODO: use centralized agentId property (from MsgConstants)?\r
+               String agentId = request.getParameter("agentId");\r
+               \r
+               SlcAgent slcAgent = agentFactory.getAgent(agentId);\r
 \r
-               List<ExecutionModuleDescriptor> descriptors = new ArrayList<ExecutionModuleDescriptor>();\r
-               for (ExecutionModule module : modules) {\r
-                       ExecutionModuleDescriptor md = new ExecutionModuleDescriptor();\r
-                       md.setName(module.getName());\r
-                       md.setVersion(module.getVersion());\r
-                       descriptors.add(md);\r
-               }\r
+               List<ExecutionModuleDescriptor> descriptors = slcAgent.listExecutionModuleDescriptors();\r
 \r
                modelAndView.addObject(new ObjectList(descriptors));\r
        }\r
 \r
-       public void setModulesManager(ExecutionModulesManager modulesManager) {\r
-               this.modulesManager = modulesManager;\r
+       public void setAgentFactory(SlcAgentFactory agentFactory) {\r
+               this.agentFactory = agentFactory;\r
        }\r
 \r
 }\r