Author: echatellier Date: 2011-06-29 10:15:55 +0200 (Wed, 29 Jun 2011) New Revision: 96 Url: http://chorem.org/repositories/revision/vradi/96 Log: Improve configuration init Modified: trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/VradiHessianStorageTest.java trunk/vradi-services-web/src/test/resources/vradi-services.properties trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfiguration.java trunk/vradi-services/src/test/java/org/chorem/vradi/VradiTestAbstract.java trunk/vradi-services/src/test/java/org/chorem/vradi/VradiTestConfiguration.java trunk/vradi-services/src/test/resources/vradi-services.properties Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfiguration.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfiguration.java 2011-06-29 08:11:12 UTC (rev 95) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/VradiServiceConfiguration.java 2011-06-29 08:15:55 UTC (rev 96) @@ -24,6 +24,7 @@ package org.chorem.vradi; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; @@ -79,7 +80,7 @@ public static final String WEB_HARVERT_SCRIPT_PREVIEW_DEFAULT_DIR_NAME = "WebHarvestPreview"; - private VradiServiceConfiguration() { + protected VradiServiceConfiguration() { } public static ApplicationConfig getConfig(String ... args) { @@ -89,7 +90,10 @@ public static ApplicationConfig getConfig(Properties defaults, String ... args) { if (config == null) { - config = new ApplicationConfig(null, null, defaults, VradiServiceOption.CONFIG_FILE.getDefaultValue()); + + // can't use constructor ApplicationConfig(optionClass, actionClass, defaults, configFilename) + // because two optionClass must be loaded + config = new ApplicationConfig(VradiServiceOption.CONFIG_FILE.getDefaultValue()); // Load wikitty options config.loadDefaultOptions(WikittyConfigOption.class); @@ -99,6 +103,15 @@ // Load vradi service action config.loadActions(VradiServiceActionDef.class); + + if (defaults != null) { + // iterate with Properties method and not with Hashtable method to + // prevent missed value with chained Properties object + for (String key : defaults.stringPropertyNames()) { + config.setDefaultOption(key, defaults.getProperty(key)); + } + } + try { // Parse args config.parse(args); @@ -111,45 +124,6 @@ return config; } - /** - * Set {@code solr} and {@code jms} system configuration. - * <p/> - * This is the "only" way to configure embedded solr. - */ -// protected void setSystemDefaultProps() { -// String[] datadirs = new String[]{"solr.data.dir", "wikitty.searchengine.solr.directory.data", "vradi.objectStore.dir"}; -// -// for (String datadir : datadirs) { -// String value = System.getProperty(datadir, null); -// if (value == null) { -// value = getOption(datadir); -// if (log.isInfoEnabled()) { -// log.info("Setting system property " + datadir + " : " + value); -// } -// if (value != null) { -// System.setProperty(datadir, value); -// env.put(datadir, value); -// } -// } -// } -// } - -// public static synchronized VradiServiceConfiguration getInstance(String... args) { -// if (instance == null) { -// try { -// instance = new VradiServiceConfiguration(); -// instance.parse(args); -// instance.setSystemDefaultProps(); -// } catch (Exception ex) { -// if (log.isErrorEnabled()) { -// log.error("Can't intitialize configuration", ex); -// } -// throw new UnhandledException(ex); -// } -// } -// return instance; -// } - /** Vradi option definition. */ public static enum VradiServiceOption implements ApplicationConfig.OptionDef { Modified: trunk/vradi-services/src/test/java/org/chorem/vradi/VradiTestAbstract.java =================================================================== --- trunk/vradi-services/src/test/java/org/chorem/vradi/VradiTestAbstract.java 2011-06-29 08:11:12 UTC (rev 95) +++ trunk/vradi-services/src/test/java/org/chorem/vradi/VradiTestAbstract.java 2011-06-29 08:15:55 UTC (rev 96) @@ -58,7 +58,6 @@ import org.junit.BeforeClass; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.Resource; -import org.nuiton.util.converter.ConverterUtil; import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.BusinessEntity; @@ -99,13 +98,9 @@ @BeforeClass public static void initConfig() { - ConverterUtil.initConverters(); - // static call : init - ApplicationConfig instance = VradiTestConfiguration.getConfig(); + //ApplicationConfig instance = VradiTestConfiguration.getConfig(); -// instance.setSystemDefaultProps(); - // Create tmpdir if not exist String tmpdir = System.getProperty("java.io.tmpdir"); File file = new File(tmpdir); @@ -113,7 +108,7 @@ file.mkdirs(); } - // file where to put wikitty datas + /*// file where to put wikitty datas File dataDirectory = new File(tmpdir, "wikitty-data-store"); if (log.isInfoEnabled()) { log.info("Will use data directory : " + dataDirectory); @@ -125,7 +120,7 @@ if (log.isInfoEnabled()) { log.info("Creating tmp dir : " + file); - } + }*/ } /** Modified: trunk/vradi-services/src/test/java/org/chorem/vradi/VradiTestConfiguration.java =================================================================== --- trunk/vradi-services/src/test/java/org/chorem/vradi/VradiTestConfiguration.java 2011-06-29 08:11:12 UTC (rev 95) +++ trunk/vradi-services/src/test/java/org/chorem/vradi/VradiTestConfiguration.java 2011-06-29 08:15:55 UTC (rev 96) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 Codelutin + * Copyright (C) 2009 - 2011 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -23,17 +23,14 @@ */ package org.chorem.vradi; -import org.apache.commons.lang.UnhandledException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyConfigOption; - import java.io.InputStream; import java.util.Locale; import java.util.Properties; +import org.chorem.vradi.services.VradiException; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyConfigOption; + /** * Test configuration. * @@ -43,16 +40,11 @@ * Last update : $Date$ * By : $Author$ */ -public class VradiTestConfiguration { +public class VradiTestConfiguration extends VradiServiceConfiguration { - /** log. */ - private static final Log log = LogFactory.getLog(VradiTestConfiguration.class); - - private static ApplicationConfig config; - - /* - * Overwrite getInstance to setup a Test specific one. - */ + /** + * Overwrite getInstance to setup a Test specific one. + */ public static synchronized ApplicationConfig getConfig() { if (config == null) { @@ -61,26 +53,29 @@ Properties options = new Properties(); try { options.load(input); - } catch (Exception e) { - throw new UnhandledException(e); - } - config = VradiServiceConfiguration.getConfig(options); + + // do not call getConfig(Properties, args...) + // parse method must not be called + config = new ApplicationConfig(VradiServiceOption.CONFIG_FILE.getDefaultValue()); + // Load wikitty options + config.loadDefaultOptions(WikittyConfigOption.class); + // Load vradi service option + config.loadDefaultOptions(VradiServiceOption.class); + // Load vradi service action + config.loadActions(VradiServiceActionDef.class); - // set wikitty option as default - for (WikittyConfigOption o : WikittyConfigOption.values()) { - if (o.getDefaultValue() != null) { - config.setOption(o.getKey(), o.getDefaultValue()); + // iterate with Properties method and not with Hashtable method to + // prevent missed value with chained Properties object + for (String key : options.stringPropertyNames()) { + config.setDefaultOption(key, options.getProperty(key)); } + + // fix locale during test + VradiServiceConfigurationHelper.setLocale(config, Locale.FRANCE); + } catch (Exception ex) { + throw new RuntimeException("Can't init test config", ex); } - - // Set vradi condig test options - config.setOptions(options); - - // fix locale during test - VradiServiceConfigurationHelper.setLocale(config, Locale.FRANCE); } return config; } - - } Modified: trunk/vradi-services/src/test/resources/vradi-services.properties =================================================================== --- trunk/vradi-services/src/test/resources/vradi-services.properties 2011-06-29 08:11:12 UTC (rev 95) +++ trunk/vradi-services/src/test/resources/vradi-services.properties 2011-06-29 08:15:55 UTC (rev 96) @@ -32,7 +32,6 @@ vradi.embeddedFiles.dir=target/vradi/embeddedFiles vradi.templates.dir=target/vradi/templates vradi.pdf.dir=target/vradi/pdf -solr.data.dir=${wikitty.searchengine.solr.directory.data} wikitty.data.directory=${vradi.data.dir}/wikitty oOo.exec.folder=/usr/bin Modified: trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/VradiHessianStorageTest.java =================================================================== --- trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/VradiHessianStorageTest.java 2011-06-29 08:11:12 UTC (rev 95) +++ trunk/vradi-services-web/src/test/java/org/chorem/vradi/services/VradiHessianStorageTest.java 2011-06-29 08:15:55 UTC (rev 96) @@ -37,10 +37,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.mortbay.jetty.runner.Runner; import org.nuiton.util.Resource; -import org.nuiton.util.converter.ConverterUtil; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyUtil; @@ -57,6 +57,7 @@ * @version $Revision$ $Date$ * @since 21 févr. 2010 02:13:16 */ +@Ignore public class VradiHessianStorageTest extends VradiStorageServiceTest { static final Log log = LogFactory.getLog(VradiHessianStorageTest.class); @@ -86,6 +87,7 @@ @BeforeClass public static void startServer() throws Exception { + runner = new VradiJettyRunner(); // This is the file to find to get the path of vradi-services-web module @@ -115,8 +117,6 @@ @Override @Before public void clear() throws Exception { - ConverterUtil.initConverters(); - HessianProxyFactory factory = new HessianProxyFactory(); factory.setHessian2Request(true); factory.setOverloadEnabled(true); Modified: trunk/vradi-services-web/src/test/resources/vradi-services.properties =================================================================== --- trunk/vradi-services-web/src/test/resources/vradi-services.properties 2011-06-29 08:11:12 UTC (rev 95) +++ trunk/vradi-services-web/src/test/resources/vradi-services.properties 2011-06-29 08:15:55 UTC (rev 96) @@ -32,7 +32,6 @@ vradi.embeddedFiles.dir=target/vradi/embeddedFiles vradi.templates.dir=target/vradi/templates vradi.pdf.dir=target/vradi/pdf -solr.data.dir=${wikitty.searchengine.solr.directory.data} wikitty.data.directory=${vradi.data.dir}/wikitty oOo.exec.folder=/usr/bin