X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fweb%2Fmvc%2Fexecution%2FGetModuleDescriptor.java;h=c8e4f6d019ef84bbf0266335853927c442b74280;hb=1fdb1b4e7b1d2b0cabb6483238301b857a6392fa;hp=b6a64b2efc84ff80f776a6ddd43f6781588141f7;hpb=4810532845c8a54c04a850c7db3a9fe00e8ebc6a;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/GetModuleDescriptor.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/GetModuleDescriptor.java
index b6a64b2ef..c8e4f6d01 100644
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/GetModuleDescriptor.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/GetModuleDescriptor.java
@@ -1,32 +1,52 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.web.mvc.execution;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.argeo.slc.execution.ExecutionModuleDescriptor;
-import org.argeo.slc.execution.ExecutionModulesManager;
+import org.argeo.slc.runtime.SlcAgent;
+import org.argeo.slc.runtime.SlcAgentFactory;
 import org.argeo.slc.web.mvc.AbstractServiceController;
 import org.springframework.web.servlet.ModelAndView;
 
 /** . */
 public class GetModuleDescriptor extends AbstractServiceController {
-	private ExecutionModulesManager modulesManager;
+	private SlcAgentFactory agentFactory;
 
 	@Override
 	protected void handleServiceRequest(HttpServletRequest request,
 			HttpServletResponse response, ModelAndView modelAndView)
 			throws Exception {
 
+		String agentId = request.getParameter("agentId");
 		String moduleName = request.getParameter("moduleName");
 		String version = request.getParameter("version");
 
-		ExecutionModuleDescriptor md = modulesManager
-				.getExecutionModuleDescriptor(moduleName, version);
+		SlcAgent slcAgent = agentFactory.getAgent(agentId);
+
+		ExecutionModuleDescriptor md = slcAgent.getExecutionModuleDescriptor(
+				moduleName, version);
 		modelAndView.addObject(md);
 	}
 
-	public void setModulesManager(ExecutionModulesManager modulesManager) {
-		this.modulesManager = modulesManager;
+	public void setAgentFactory(SlcAgentFactory agentFactory) {
+		this.agentFactory = agentFactory;
 	}
 
 }