*/
package mircoders.servlet;
+import mir.generator.Generator;
+import mir.producer.ProducerFactory;
+import mir.servlet.AdminServletModule;
+import mir.servlet.ServletModuleFailure;
+import mir.util.HTTPRequestParser;
+import mircoders.global.MirGlobal;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Vector;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import mir.generator.Generator;
-import mir.log.LoggerWrapper;
-import mir.producer.ProducerFactory;
-import mir.servlet.ServletModule;
-import mir.servlet.ServletModuleFailure;
-import mir.util.ResourceBundleGeneratorFunction;
-import mircoders.global.MirGlobal;
-
-import org.apache.struts.util.MessageResources;
-
-public class ServletModuleProducer extends ServletModule
-{
- private static ServletModuleProducer instance = new ServletModuleProducer();
- public static ServletModule getInstance() { return instance; }
-
- Object comments;
- Map generationData;
- Generator generator;
- int totalNrComments;
- List producersData;
-
- void generateResponse(String aGeneratorIdentifier, PrintWriter aWriter, Map aResponseData, Locale aLocale) {
- try {
- generator = MirGlobal.localizer().generators().makeAdminGeneratorLibrary().makeGenerator(aGeneratorIdentifier);
- MirGlobal.localizer().producerAssistant().initializeGenerationValueSet(aResponseData);
- aResponseData.put( "lang", new ResourceBundleGeneratorFunction( aLocale, MessageResources.getMessageResources("bundles.admin")));
- generator.generate(aWriter, aResponseData, logger);
- }
- catch (Throwable t) {
- throw new ServletModuleFailure(t);
- }
- }
-
- private ServletModuleProducer() {
- super();
- logger = new LoggerWrapper("ServletModule.Producer");
- defaultAction="showProducerQueueStatus";
+public class ServletModuleProducer extends AdminServletModule {
+ public void defaultAction(HttpServletRequest aRequest, HttpServletResponse aResponse) {
+ showProducerQueueStatus(aRequest, aResponse);
}
- public void showMessage(PrintWriter aWriter, Locale aLocale, String aMessage, String anArgument1, String anArgument2) {
- Map responseData;
- try {
- responseData = new HashMap();
- responseData.put("message", aMessage);
- responseData.put("argument1", anArgument1);
- responseData.put("argument2", anArgument2);
- generateResponse("infomessage.template", aWriter, responseData, aLocale);
- }
- catch (Throwable t) {
- throw new ServletModuleFailure(t);
- }
- }
-
-
+ /**
+ *
+ * @param aRequest
+ * @param aResponse
+ */
public void showProducerQueueStatus(HttpServletRequest aRequest, HttpServletResponse aResponse) {
- Object comments;
- Map generationData;
- Generator generator;
- int totalNrComments;
- List producersData;
-
try {
- generator = MirGlobal.localizer().generators().makeAdminGeneratorLibrary().makeGenerator("producerqueue.template");
+ // TODO: use ServletHelper
+ Generator generator = MirGlobal.localizer().generators().
+ makeAdminGeneratorLibrary().makeGenerator("producerqueue.template", null);
- generationData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)});
+ Map generationData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)});
generationData.put( "thisurl", "module=Producer&do=showProducerQueueStatus");
- producersData = new Vector();
- Iterator i = MirGlobal.localizer().producers().factories().iterator();
+ List producersData = new ArrayList();
+ Iterator i = MirGlobal.getProducerEngine().getFactories().iterator();
while (i.hasNext()) {
ProducerFactory factory = (ProducerFactory) i.next();
- List producerVerbs = new Vector();
- Iterator j = factory.verbs();
+ List producerVerbs = new ArrayList();
+ Iterator j = factory.verbs().iterator();
while (j.hasNext()) {
Map verbData = new HashMap();
ProducerFactory.ProducerVerb verb = (ProducerFactory.ProducerVerb) j.next();
}
generationData.put("producers", producersData);
- generationData.put("queue", MirGlobal.producerEngine().getQueueStatus());
- generator.generate(aResponse.getWriter(), generationData, logger);
+ generationData.put("queue", MirGlobal.getProducerEngine().getQueueStatus());
+ generator.generate(aResponse.getWriter(), generationData, getLogger());
}
catch (Throwable t) {
throw new ServletModuleFailure(t);
}
}
- public void produce(HttpServletRequest req, HttpServletResponse res) {
- /*
- * This method will only be called by external scripts (e.g. from cron jobs).
- * The output therefore is very simple.
- *
- */
-
+ /**
+ * This method will only be called by external scripts (e.g. from cron jobs).
+ * The output therefore is very simple.
+ */
+ public void produce(HttpServletRequest aRequest, HttpServletResponse aResponse) {
+ PrintWriter out;
try {
- PrintWriter out = res.getWriter();
+ out = aResponse.getWriter();
+ }
+ catch (IOException e) {
+ throw new ServletModuleFailure(e);
+ }
- if (req.getParameter("producer")!=null) {
- String producerParam = req.getParameter("producer");
- String verbParam = req.getParameter("verb");
+ if (aRequest.getParameter("producer")!=null) {
+ String producerParam = aRequest.getParameter("producer");
+ String verbParam = aRequest.getParameter("verb");
+
+ try {
+ MirGlobal.getProducerEngine().addJob(producerParam, verbParam);
- MirGlobal.producerEngine().addJob(producerParam, verbParam);
out.println("job added");
}
- }
- catch (Throwable t) {
- throw new ServletModuleFailure(t);
+ catch (Throwable t) {
+
+ out.println("Can't add job: " + t.getMessage());
+ }
}
}
- public void produceAllNew(HttpServletRequest aRequest, HttpServletResponse aResponse) {
+ /**
+ * Servlet action to propduce a preconfigured combination of producers
+ * (e.g. "generate all new")
+ */
+ public void producerecipe(HttpServletRequest aRequest, HttpServletResponse aResponse) {
try {
- MirGlobal.localizer().producers().produceAllNew();
- showMessage(aResponse.getWriter(), getLocale(aRequest), "produceAllNewAddedToQueue", "", "");
+ String recipe = aRequest.getParameter("recipe");
+ MirGlobal.localizer().producers().produceRecipe(recipe);
+
+ ServletHelper.generateInfoMessage(aRequest, aResponse,
+ new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)},
+ "bundles/admin", "etc/bundles/adminlocal", "recipeAddedToQueue", recipe, "");
}
catch (Throwable t) {
throw new ServletModuleFailure(t);
}
}
+ /**
+ * Servlet action to enqueue a producer job
+ */
public void enqueue(HttpServletRequest aRequest, HttpServletResponse aResponse) {
try {
if (aRequest.getParameter("producer")!=null) {
String producerParam = aRequest.getParameter("producer");
String verbParam = aRequest.getParameter("verb");
- MirGlobal.producerEngine().addJob(producerParam, verbParam);
+ MirGlobal.getProducerEngine().addJob(producerParam, verbParam);
ServletHelper.redirect(aResponse, "Producer", "showProducerQueueStatus");
}
}
}
- public void cancelAbortJob(HttpServletRequest aRequest, HttpServletResponse aResponse) {
- // ML: to be coded
+ public void cancel(HttpServletRequest aRequest, HttpServletResponse aResponse) {
+ try {
+ HTTPRequestParser requestParser = new HTTPRequestParser(aRequest);
+
+ if (requestParser.getParameter("cancelall") != null) {
+ MirGlobal.getProducerEngine().cancelAllJobs();
+ }
+ else {
+ List jobs = new ArrayList(requestParser.getParameterList("jobid"));
+
+ MirGlobal.getProducerEngine().cancelJobs(jobs);
+ }
+ ServletHelper.redirect(aResponse, "Producer", "showProducerQueueStatus");
+ }
+ catch (Throwable t) {
+ throw new ServletModuleFailure(t);
+ }
}
}
projects / mir.git / blobdiff