X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fservlet%2FServletModuleProducer.java;h=c54319e6a08ae07ae3d01463fd0331771e39dcaa;hb=89b2edf40f1b71d810243d7eb550aea1b79c94aa;hp=7119e1af79c8697a11f8ce349c0def2a7f4194aa;hpb=fa2ae3a41572f5b762b761935fc712b59c2a6933;p=mir.git diff --git a/source/mircoders/servlet/ServletModuleProducer.java b/source/mircoders/servlet/ServletModuleProducer.java index 7119e1af..c54319e6 100755 --- a/source/mircoders/servlet/ServletModuleProducer.java +++ b/source/mircoders/servlet/ServletModuleProducer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001, 2002 The Mir-coders group + * Copyright (C) 2001, 2002 The Mir-coders group * * This file is part of Mir. * @@ -18,105 +18,61 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * In addition, as a special exception, The Mir-coders gives permission to link - * the code of this program with the com.oreilly.servlet library, any library - * licensed under the Apache Software License, The Sun (tm) Java Advanced - * Imaging library (JAI), The Sun JIMI library (or with modified versions of - * the above that use the same license as the above), and distribute linked - * combinations including the two. You must obey the GNU General Public - * License in all respects for all of the code used other than the above - * mentioned libraries. If you modify this file, you may extend this exception - * to your version of the file, but you are not obligated to do so. If you do - * not wish to do so, delete this exception statement from your version. + * the code of this program with any library licensed under the Apache Software License, + * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library + * (or with modified versions of the above that use the same license as the above), + * and distribute linked combinations including the two. You must obey the + * GNU General Public License in all respects for all of the code used other than + * the above mentioned libraries. If you modify this file, you may extend this + * exception to your version of the file, but you are not obligated to do so. + * If you do not wish to do so, delete this exception statement from your version. */ - 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.ServletModuleException; -import mir.util.NullWriter; -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) throws ServletModuleException { - 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, new PrintWriter(new NullWriter())); - } - catch (Throwable t) { - throw new ServletModuleException(t.getMessage()); - } - } - - 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) throws ServletModuleException { - Map responseData; + /** + * + * @param aRequest + * @param aResponse + */ + public void showProducerQueueStatus(HttpServletRequest aRequest, HttpServletResponse aResponse) { 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 ServletModuleException(t.getMessage()); - } - } - - - public void showProducerQueueStatus(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleException { - 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(getLocale(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(); @@ -134,65 +90,96 @@ public class ServletModuleProducer extends ServletModule } generationData.put("producers", producersData); - generationData.put("queue", MirGlobal.producerEngine().getQueueStatus()); - generator.generate(aResponse.getWriter(), generationData, new PrintWriter(new NullWriter())); + generationData.put("queue", MirGlobal.getProducerEngine().getQueueStatus()); + generator.generate(aResponse.getWriter(), generationData, getLogger()); } catch (Throwable t) { - t.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE)); - throw new ServletModuleException(t.getMessage()); + throw new ServletModuleFailure(t); } } - public void produce(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException { - /* - * 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 (Exception e) { - throw new ServletModuleException(e.getMessage()); + catch (Throwable t) { + + out.println("Can't add job: " + t.getMessage()); + } } } - public void produceAllNew(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleException { + /** + * 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 (Exception e) { - throw new ServletModuleException(e.getMessage()); + catch (Throwable t) { + throw new ServletModuleFailure(t); } } - public void enqueue(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleException { + /** + * 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); - showProducerQueueStatus(aRequest, aResponse); + ServletHelper.redirect(aResponse, "Producer", "showProducerQueueStatus"); } } - catch (Exception e) { - throw new ServletModuleException(e.getMessage()); + catch (Throwable t) { + throw new ServletModuleFailure(t); } } - public void cancelAbortJob(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleException { - // 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); + } } }