Author: athimel Date: 2012-04-16 17:21:52 +0200 (Mon, 16 Apr 2012) New Revision: 171 Url: http://chorem.org/repositories/revision/vradi/171 Log: No need to use VradiStorageServiceImpl Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiStandaloneMain.java trunk/vradi-services/src/main/java/org/chorem/vradi/beans/XmlStreamImportResult.java trunk/vradi-services/src/main/java/org/chorem/vradi/demo/StandaloneDataService.java trunk/vradi-services/src/test/java/org/chorem/vradi/services/InternalUsageTest.java Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiStandaloneMain.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/VradiStandaloneMain.java 2012-04-16 13:06:33 UTC (rev 170) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/VradiStandaloneMain.java 2012-04-16 15:21:52 UTC (rev 171) @@ -1,39 +1,82 @@ package org.chorem.vradi; import org.chorem.vradi.demo.StandaloneDataService; +import org.chorem.vradi.entities.XmlStream; import org.chorem.vradi.services.VradiException; import org.chorem.vradi.services.VradiServiceContext; -import org.chorem.vradi.services.VradiStorageServiceImpl; import org.chorem.vradi.services.managers.BindingManager; import org.chorem.vradi.services.managers.FormManager; import org.chorem.vradi.services.managers.FormTypeManager; +import org.chorem.vradi.services.managers.MailingManager; import org.chorem.vradi.services.managers.SearchManager; import org.chorem.vradi.services.managers.ThesaurusManager; +import org.chorem.vradi.services.tasks.AssignXmlStreamTasks; +import org.chorem.vradi.services.tasks.AutoSendTasks; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyProxy; +import java.util.List; + /** * @author Arnaud Thimel <thimel@codelutin.com> */ public class VradiStandaloneMain { - public static void main(String[] args) throws VradiException { - ApplicationConfig config = VradiServiceConfiguration.getConfig(); - WikittyProxy wikittyProxy = VradiServiceContext.getWikittyProxy(); + protected ApplicationConfig config; + protected WikittyProxy wikittyProxy; - FormTypeManager formTypeManager = new FormTypeManager(config, wikittyProxy); - ThesaurusManager thesaurusManager = new ThesaurusManager(wikittyProxy); - SearchManager searchManager = new SearchManager(wikittyProxy, thesaurusManager); - FormManager formManager = new FormManager(config, wikittyProxy, thesaurusManager, searchManager); - BindingManager bindingManager = new BindingManager(config, wikittyProxy, formTypeManager, formManager); + protected FormTypeManager formTypeManager; + protected ThesaurusManager thesaurusManager; + protected SearchManager searchManager; + protected FormManager formManager; + protected BindingManager bindingManager; + protected MailingManager mailingManager; - StandaloneDataService standaloneDataService = new StandaloneDataService(config, bindingManager, formTypeManager, searchManager, thesaurusManager, wikittyProxy); + protected StandaloneDataService standaloneDataService; + + public VradiStandaloneMain() { + config = VradiServiceConfiguration.getConfig(); + wikittyProxy = VradiServiceContext.getWikittyProxy(); + + formTypeManager = new FormTypeManager(config, wikittyProxy); + thesaurusManager = new ThesaurusManager(wikittyProxy); + searchManager = new SearchManager(wikittyProxy, thesaurusManager); + formManager = new FormManager(config, wikittyProxy, thesaurusManager, searchManager); + bindingManager = new BindingManager(config, wikittyProxy, formTypeManager, formManager); + mailingManager = new MailingManager(config, wikittyProxy, formTypeManager); + + standaloneDataService = new StandaloneDataService(config, wikittyProxy, + bindingManager, formTypeManager, searchManager, thesaurusManager); + } + + public void prepare() throws VradiException { standaloneDataService.checkThesaurus(); standaloneDataService.checkStreams(); standaloneDataService.checkGroups(); + } - VradiStorageServiceImpl vradiStorageService = new VradiStorageServiceImpl(); // Needed to start tasks programming + public void run() { + List<XmlStream> xmlStreams = bindingManager.getAllXmlStreams(); + for (XmlStream xmlStream : xmlStreams) { + if (xmlStream != null) { + String xmlStreamId = xmlStream.getWikittyId(); + AssignXmlStreamTasks task = new AssignXmlStreamTasks(config, wikittyProxy, + bindingManager, thesaurusManager, formManager, xmlStreamId); + task.run(); + } + } + + AutoSendTasks task = new AutoSendTasks(formManager, mailingManager); + task.run(); } + public static void main(String[] args) throws Exception { + VradiStandaloneMain standalone = new VradiStandaloneMain(); + standalone.prepare(); + standalone.run(); + + System.exit(0); // Need to kill app because of SolrCore executor's thread + } + } Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/beans/XmlStreamImportResult.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/beans/XmlStreamImportResult.java 2012-04-16 13:06:33 UTC (rev 170) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/beans/XmlStreamImportResult.java 2012-04-16 15:21:52 UTC (rev 171) @@ -26,6 +26,7 @@ import java.io.Serializable; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; /** @@ -56,7 +57,7 @@ protected int numberParsingError; - protected Set<String> createdFormsIds; + protected Set<String> createdFormsIds = new LinkedHashSet<String>();; public int getCreatedFormCount() { return createdFormCount; @@ -99,9 +100,6 @@ } public void addCreatedFormsIds(String wikittyId) { - if (createdFormsIds == null) { - createdFormsIds = new HashSet<String>(); - } createdFormsIds.add(wikittyId); } } Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/demo/StandaloneDataService.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/demo/StandaloneDataService.java 2012-04-16 13:06:33 UTC (rev 170) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/demo/StandaloneDataService.java 2012-04-16 15:21:52 UTC (rev 171) @@ -58,12 +58,15 @@ protected BindingManager bindingManager; protected FormTypeManager formTypeManager; protected ThesaurusManager thesaurusManager; + protected WikittyProxy wikittyProxy; protected static final String APPEL_OFFRES_FORM_TYPE = "APPEL_OFFRES"; protected static final String APPEL_OFFRES_TEMPLATE = "default_vradi_template.odt"; - public StandaloneDataService(ApplicationConfig config, BindingManager bindingManager, FormTypeManager formTypeManager, SearchManager searchManager, ThesaurusManager thesaurusManager, WikittyProxy wikittyProxy) { + public StandaloneDataService(ApplicationConfig config, WikittyProxy wikittyProxy, + BindingManager bindingManager, FormTypeManager formTypeManager, + SearchManager searchManager, ThesaurusManager thesaurusManager) { this.config = config; this.bindingManager = bindingManager; this.formTypeManager = formTypeManager; @@ -130,15 +133,14 @@ stream.setName(name); stream.setUrl(url); stream.setFormTypeName(APPEL_OFFRES_FORM_TYPE); - stream.setAutoAssign(true); - stream.setImportTime("08:00"); // TODO AThimel 16/04/2012 Move to conf + // tous stream.addXmlFieldBinding(createXmlFieldBinding("title", Infogene.FQ_FIELD_INFOGENE_OBJET).getWikittyId()); stream.addXmlFieldBinding(createXmlFieldBinding("link", Infogene.FQ_FIELD_INFOGENE_SOURCEURL).getWikittyId()); stream.addXmlFieldBinding(createXmlFieldBinding("description", Infogene.FQ_FIELD_INFOGENE_DESCRIPTION).getWikittyId()); stream.addXmlFieldBinding(createXmlFieldBinding("pubDate", Form.FQ_FIELD_FORM_DATEPUB).getWikittyId()); - // marchésonline + // marchés-online stream.addXmlFieldBinding(createXmlFieldBinding("category", APPEL_OFFRES_FORM_TYPE + ".category").getWikittyId()); stream.addXmlFieldBinding(createXmlFieldBinding("dc:creator", Infogene.FQ_FIELD_INFOGENE_ENTITY).getWikittyId()); // EdiTender @@ -173,12 +175,14 @@ checkStream(allXmlStreams, "e-Marchés Publics", "https://www.e-marchespublics.com/rss/rss.php?v=2&l=200&c=Service"); } + public static final List<String> keywords = Lists.newArrayList( // TODO AThimel 16/04/2012 Move to conf "Java", "J2EE", "JEE", "EJB", "swing", "struts", "hibernate", "Tomcat", "Jetty", "jboss", "jonas", - "maven" + "maven", + "Transbeauce" ); public void checkGroups() { @@ -217,7 +221,7 @@ public void checkThesaurus() throws VradiException { List<RootThesaurus> rootThesaurusList = thesaurusManager.getRootThesaurus(); if (rootThesaurusList.isEmpty()) { - RootThesaurus rootThesaurus = thesaurusManager.createRootThesaurus("VradiRootThesaurus"); + RootThesaurus rootThesaurus = thesaurusManager.createRootThesaurus("StandaloneRootThesaurus"); for (String keyword : keywords) { createThesaurus(rootThesaurus, keyword); Modified: trunk/vradi-services/src/test/java/org/chorem/vradi/services/InternalUsageTest.java =================================================================== --- trunk/vradi-services/src/test/java/org/chorem/vradi/services/InternalUsageTest.java 2012-04-16 13:06:33 UTC (rev 170) +++ trunk/vradi-services/src/test/java/org/chorem/vradi/services/InternalUsageTest.java 2012-04-16 15:21:52 UTC (rev 171) @@ -39,7 +39,7 @@ formManager = new FormManager(config, wikittyProxy, thesaurusManager, searchManager); bindingManager = new BindingManager(config, wikittyProxy, formTypeManager, formManager); - StandaloneDataService standaloneDataService = new StandaloneDataService(config, bindingManager, formTypeManager, searchManager, thesaurusManager, wikittyProxy); + StandaloneDataService standaloneDataService = new StandaloneDataService(config, wikittyProxy, bindingManager, formTypeManager, searchManager, thesaurusManager); standaloneDataService.checkStreams(); }