Author: athimel Date: 2012-04-17 17:43:30 +0200 (Tue, 17 Apr 2012) New Revision: 174 Url: http://chorem.org/repositories/revision/vradi/174 Log: Move properties to conf Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfiguration.java trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfigurationHelper.java trunk/vradi-services/src/main/java/org/chorem/vradi/demo/StandaloneDataService.java trunk/vradi-services/src/main/resources/i18n/vradi-services_fr_FR.properties Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfiguration.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfiguration.java 2012-04-16 15:25:15 UTC (rev 173) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfiguration.java 2012-04-17 15:43:30 UTC (rev 174) @@ -316,8 +316,22 @@ "vradi.autoSend.hour", _("vradi.autoSend.hour.description"), null, - String.class, false, false); + String.class, false, false), + STANDALONE_RECIPIENT( + "vradi.standalone.recipient", + _("vradi.standalone.recipient.description"), + null, + String.class, false, false), + + STANDALONE_KEYWORDS( + "vradi.standalone.keywords", + _("vradi.standalone.keywords.description"), + "Java;J2EE;JEE;EJB;swing;struts;hibernate;Tomcat;Jetty;jboss;jonas;maven", + String.class, false, false), + + ; + public String key; public String description; Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfigurationHelper.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfigurationHelper.java 2012-04-16 15:25:15 UTC (rev 173) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfigurationHelper.java 2012-04-17 15:43:30 UTC (rev 174) @@ -291,4 +291,14 @@ boolean result = config.getOptionAsBoolean(VradiServiceOption.RECEIVE_MAIL_ENABLED.key); return result; } + + public static String getStandaloneRecipient(ApplicationConfig config) { + String result = config.getOption(VradiServiceOption.STANDALONE_RECIPIENT.key); + return result; + } + + public static String getStandaloneKeywords(ApplicationConfig config) { + String result = config.getOption(VradiServiceOption.STANDALONE_KEYWORDS.key); + return result; + } } 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 15:25:15 UTC (rev 173) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/demo/StandaloneDataService.java 2012-04-17 15:43:30 UTC (rev 174) @@ -1,5 +1,6 @@ package org.chorem.vradi.demo; +import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -64,6 +65,8 @@ protected static final String APPEL_OFFRES_FORM_TYPE = "APPEL_OFFRES"; protected static final String APPEL_OFFRES_TEMPLATE = "default_vradi_template.odt"; + protected List<String> keywords; + public StandaloneDataService(ApplicationConfig config, WikittyProxy wikittyProxy, BindingManager bindingManager, FormTypeManager formTypeManager, SearchManager searchManager, ThesaurusManager thesaurusManager) { @@ -135,20 +138,20 @@ stream.setFormTypeName(APPEL_OFFRES_FORM_TYPE); // tous - stream.addXmlFieldBinding(createXmlFieldBinding("title", Infogene.FQ_FIELD_INFOGENE_OBJET).getWikittyId()); - stream.addXmlFieldBinding(createXmlFieldBinding("link", Infogene.FQ_FIELD_INFOGENE_SOURCEURL).getWikittyId()); + 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()); + stream.addXmlFieldBinding(createXmlFieldBinding("pubDate", Form.FQ_FIELD_FORM_DATEPUB).getWikittyId()); // marchés-online - stream.addXmlFieldBinding(createXmlFieldBinding("category", APPEL_OFFRES_FORM_TYPE + ".category").getWikittyId()); - stream.addXmlFieldBinding(createXmlFieldBinding("dc:creator", Infogene.FQ_FIELD_INFOGENE_ENTITY).getWikittyId()); + stream.addXmlFieldBinding(createXmlFieldBinding("category", APPEL_OFFRES_FORM_TYPE + ".category").getWikittyId()); + stream.addXmlFieldBinding(createXmlFieldBinding("dc:creator", Infogene.FQ_FIELD_INFOGENE_ENTITY).getWikittyId()); // EdiTender - stream.addXmlFieldBinding(createXmlFieldBinding("guid", APPEL_OFFRES_FORM_TYPE + ".documents").getWikittyId()); + stream.addXmlFieldBinding(createXmlFieldBinding("guid", APPEL_OFFRES_FORM_TYPE + ".documents").getWikittyId()); // EdiTender et e-marchespublics - stream.addXmlFieldBinding(createXmlFieldBinding("author", APPEL_OFFRES_FORM_TYPE + ".Contact_administratif").getWikittyId()); + stream.addXmlFieldBinding(createXmlFieldBinding("author", APPEL_OFFRES_FORM_TYPE + ".Contact_administratif").getWikittyId()); // e-marchespublics - stream.addXmlFieldBinding(createXmlFieldBinding("department", Infogene.FQ_FIELD_INFOGENE_DEPARTMENT).getWikittyId()); + stream.addXmlFieldBinding(createXmlFieldBinding("department", Infogene.FQ_FIELD_INFOGENE_DEPARTMENT).getWikittyId()); wikittyProxy.store(stream); return stream; @@ -176,14 +179,16 @@ } - 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" - ); + public List<String> getKeywords() { + if (keywords == null || keywords.isEmpty()) { + String keywordsString = VradiServiceConfigurationHelper.getStandaloneKeywords(config); + Iterable<String> split = Splitter.on(';').split(keywordsString); + keywords = Lists.newArrayList(split); + } + return keywords; + } + public void checkGroups() { List<Group> groups = searchManager.findGroupsWithQueries(); if (groups == null || groups.isEmpty()) { @@ -193,7 +198,8 @@ wikittyProxy.store(query); User user = new UserImpl(); - user.setEmail("thimel@codelutin.com"); // TODO AThimel 16/04/2012 Move to conf + String recipient = VradiServiceConfigurationHelper.getStandaloneRecipient(config); + user.setEmail(recipient); user.setName("Standalone user"); user.setEnable(true); user.setBeginSearchDate(DateUtil.createDate(1, 1, 2012)); @@ -222,7 +228,7 @@ if (rootThesaurusList.isEmpty()) { RootThesaurus rootThesaurus = thesaurusManager.createRootThesaurus("StandaloneRootThesaurus"); - for (String keyword : keywords) { + for (String keyword : getKeywords()) { createThesaurus(rootThesaurus, keyword); } } Modified: trunk/vradi-services/src/main/resources/i18n/vradi-services_fr_FR.properties =================================================================== --- trunk/vradi-services/src/main/resources/i18n/vradi-services_fr_FR.properties 2012-04-16 15:25:15 UTC (rev 173) +++ trunk/vradi-services/src/main/resources/i18n/vradi-services_fr_FR.properties 2012-04-17 15:43:30 UTC (rev 174) @@ -74,6 +74,8 @@ vradi.sessionStatus.error=Erreur vradi.sessionStatus.sent=Envoyée vradi.sessionStatus.stopped=Stoppée +vradi.standalone.keywords.description= +vradi.standalone.recipient.description= vradi.status.nonselectionne.description=Traité et non sélectionné vradi.status.nonselectionne.name=Non sélectionné vradi.status.nontraite.description=Par défaut toute nouvelle information