Author: bpoussin Date: 2011-04-13 18:59:23 +0200 (Wed, 13 Apr 2011) New Revision: 805 Url: http://nuiton.org/repositories/revision/wikitty/805 Log: - Evolution #1459: Refactor WikittyConfig, don't herite from ApplicationConfig, but become factory Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigAction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java Modified: trunk/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServerStart.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheSimple.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoClient.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoServer.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyI18nTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/InMemorySearchTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCachedTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceTransactionTest.java trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianClient.java trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianServer.java trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/ProxyTest.java trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTest.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/pom.xml 2011-04-13 16:59:23 UTC (rev 805) @@ -515,7 +515,7 @@ <!-- common versions used in sub-poms --> <eugeneVersion>2.3.1</eugeneVersion> - <nuitonUtilsVersion>2.1</nuitonUtilsVersion> + <nuitonUtilsVersion>2.2-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.2</nuitonI18nVersion> <processPluginVersion>1.1</processPluginVersion> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2011-04-13 16:59:23 UTC (rev 805) @@ -1,43 +1,37 @@ /* * #%L * Wikitty :: api - * + * * $Id$ * $HeadURL$ * %% * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ package org.nuiton.wikitty; -import org.nuiton.wikitty.services.XMPPNotifierTransporter; -import org.nuiton.wikitty.services.WikittyServiceInMemory; -import java.io.File; import java.util.Properties; import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; -import org.nuiton.wikitty.services.WikittyCacheJCS; -import org.nuiton.wikitty.services.WikittyServiceAccessStat.AccessStatStorageWikitty; /** * Configuration de tous les modules Wikitty. La configuration par defaut doit @@ -65,36 +59,29 @@ * Last update: $Date$ * by : $Author$ */ -public class WikittyConfig extends ApplicationConfig { +public class WikittyConfig { /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittyConfig.class); - /** - * Create WikittyConfig with default value and load wikitty-config.properties - */ - public WikittyConfig() { - this((String[]) null); + private WikittyConfig() { } - public WikittyConfig(String [] args) { - super(); - init(); - try { - parse(args); - } catch (ArgumentsParserException eee) { - if (log.isErrorEnabled()) { - log.error("Can't load wikitty configuration", eee); - } - } + + static public ApplicationConfig getConfig() { + return getConfig(null, null); } + static public ApplicationConfig getConfig(String[] args) { + return getConfig(null, null, args); + } + /** * Create WikittyConfig and load particular configuration filename * @param configFilename name of wikitty config file */ - public WikittyConfig(String configFilename) { - this(new String[]{"--option", ApplicationConfig.CONFIG_FILE_NAME, configFilename}); + static public ApplicationConfig getConfig(String configFilename) { + return getConfig(null, configFilename); } /** @@ -102,363 +89,35 @@ * * @param props as default value */ - public WikittyConfig(Properties props) { - this(); - - // iterate with Properties method and not with Hashtable method to - // prevent missed value with chained Properties object - for (String key : props.stringPropertyNames()) { - setDefaultOption(key, props.getProperty(key)); - } + static public ApplicationConfig getConfig(Properties props) { + return getConfig(props, null); } - protected void init() { - // init configuration with default options - loadDefaultOptions(WikittyOption.class); - - // init actions - loadActions(WikittyAction.class); - } - - /** - * TODO poussin 20101219 extract this class from WikittyConfig - * Configuration option for all modules - */ - public static enum WikittyOption implements OptionDef { - - WIKITTY_CONFIG_FILE( - CONFIG_FILE_NAME, - n_("Main configuration wikitty file"), - "wikitty-config.properties", String.class, true, true), - - WIKITTY_DATA_DIR( - "wikitty.data.directory", - n_("Data directory where wikitty store data"), - "./target/data", String.class, false, false), - - WIKITTY_STORAGE_JDBC_QUERY_FILE( - "wikitty.storage.jdbc.queryfile", - n_("JDBC query configuration file. You can put more than one file" - + " to load specific SQL statement for your database." - + " Exemple: wikitty-jdbc-query.properties,wikitty-jdbc-query-mysql.properties"), - "wikitty-jdbc-query.properties", String.class, false, false), - - WIKITTY_STORAGE_JDBC_DRIVER( - "wikitty.storage.jdbc.driver", - n_("JDBC driver name"), - "org.h2.Driver", String.class, false, false), - WIKITTY_STORAGE_JDBC_URL( - "wikitty.storage.jdbc.host", - n_("JDBC url"), - "jdbc:h2:file:${" + WIKITTY_DATA_DIR.getKey() + "}/db", String.class, false, false), - WIKITTY_STORAGE_JDBC_LOGIN( - "wikitty.storage.jdbc.login", - n_("JDBC login name"), - "sa", String.class, false, false), - WIKITTY_STORAGE_JDBC_PASSWORD( - "wikitty.storage.jdbc.password", - n_("JDBC password"), - "", String.class, false, false), - WIKITTY_STORAGE_JDBC_XADATASOURCE( - "wikitty.storage.jdbc.xadatasource", - n_("JDBC xadatasource driver"), - "org.h2.jdbcx.JdbcDataSource", String.class, false, false), - WIKITTY_STORAGE_JDBC_XADATASOURCE_H2_URL( - "wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL", - n_("JDBC xadatasource property h2 url"), - "${"+WIKITTY_STORAGE_JDBC_URL.getKey() + "}", String.class, false, false), - WIKITTY_STORAGE_JDBC_XADATASOURCE_H2_USER( - "wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user", - n_("JDBC xadatasource property h2 username"), - "${"+WIKITTY_STORAGE_JDBC_LOGIN.getKey() + "}", String.class, false, false), - WIKITTY_STORAGE_JDBC_XADATASOURCE_H2_PASSWORD( - "wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password", - n_("JDBC xadatasource property h2 password"), - "${"+WIKITTY_STORAGE_JDBC_PASSWORD.getKey() + "}", String.class, false, false), - - WIKITTY_SEARCHENGINE_SOLR_HOME( - "wikitty.searchengine.solr.home", - n_("SolR directory home. You can put solr.xml config file in. If" - + " not null, replace solr.solr.home environment vairable"), - null, String.class, false, false), - /* Solr config name are used directly in solr config file. If - * you change it, change too in module - * wikitty-solr-impl/src/main/resources/solrconfig.xml */ - WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA( - "wikitty.searchengine.solr.directory.data", - n_("Solr data directory"), - "${" + WIKITTY_DATA_DIR.getKey() + "}/solr", File.class, false, false), - WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY( - "wikitty.searchengine.solr.directory.factory", - n_("SolR storage type possible value: solr.StandardDirectoryFactory" - + " or org.nuiton.wikitty.storage.solr.RAMDirectoryFactory" - + " (or when solr 4.0 will be used org.apache.solr.core.RAMDirectoryFactory)"), - "solr.StandardDirectoryFactory", String.class, false, false), - - - WIKITTY_WIKITTYSERVICE_COMPONENTS( - "wikitty.WikittyService.components", - n_("WikittyService to use (list must be in right order. " - + "ex: org.nuiton.wikitty.WikittyServiceStorage,org.nuiton.wikitty.WikittyServiceNotifier,org.nuiton.wikitty.WikittyServiceCached,org.nuiton.wikitty.WikittyServiceSecurity)"), - WikittyServiceInMemory.class.getName(), String.class, false, false), - - WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE( - "wikitty.WikittyServiceInMemory.persistence", - n_("Indique si les donnees sont stocker entre deux utilisations."), - "false", Boolean.class, false, false), - WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE( - "wikitty.WikittyServiceInMemory.persistence.file", - n_("Fichier ou les donnees sont stocker"), - "${" + WIKITTY_DATA_DIR.getKey() + "}/wikitty-inmemory.ser", File.class, false, false), - - - WIKITTY_WIKITTYSERVICESTORAGE_COMPONENTS( - "wikitty.WikittyServiceStorage.components", - n_("WikittyServiceStorage component to use (ExtensionStorage, WikittyStorage, SearchEngine)"), - "org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC," - + "org.nuiton.wikitty.jdbc.WikittyStorageJDBC," - + "org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr", String.class, false, false), - - WIKITTY_WIKITTYSERVICENOTIFIER_COMPONENTS( - "wikitty.WikittyServiceNotifier.components", - n_("WikittyServiceNotifier component to use (transporter class" - + "to use for propagate or listen remote event)"), - XMPPNotifierTransporter.class.getName(), String.class, false, false), - - WIKITTY_TRANSACTION_WIKITTYSERVICE_COMPONENTS( - "wikitty.transaction.WikittyService.components", - n_("WikittyService to use for transaction (must be in memory)" - + "ex: org.nuiton.wikitty.services.WikittyServiceInMemory" - + " or org.nuiton.wikitty.services.WikittyServiceInMemoryJdbcSolr)"), - WikittyServiceInMemory.class.getName(), String.class, false, false), - - WIKITTY_WIKITTYSERVICECACHED_COMPONENTS( - "wikitty.WikittyServiceCached.components", - n_("Indique le composant a utiliser pour le cache"), - WikittyCacheJCS.class.getName(), String.class, false, false), - - WIKITTY_CACHE_PRIORITY_EXTENSIONS( - "wikitty.service.cache.priority.extensions", - n_("Indique la liste des extensions qui doivent etre conservee prioritairement"), - "", String.class, false, false), - - WIKITTY_CACHE_SIMPLE_REFERENCE_TYPE( - "wikitty.service.cache.simple.reference.type", - n_("Indique le type de reference a utiliser pour les extensions" - + " non prioritaires dans le WikittyCacheSimple (soft ou hard)"), - "soft", String.class, false, false), - - WIKITTY_WIKITTYSERVICEACCESSSTAT_COMPONENTS( - "wikitty.WikittyServiceAccessStat.components", - n_("Indique le composant a utiliser pour le stockage des acces"), - AccessStatStorageWikitty.class.getName(), String.class, false, false), - - WIKITTY_ACCESSSTAT_EXTENSIONS( - "wikitty.service.accessstat.extensions", - n_("Indique la liste d'extension dont il faut monitorer l'acces"), - "WikittyPubText,WikittyPubData", String.class, false, false), - - WIKITTY_SERVER_CONFIG( - "wikitty.service.server.config", - n_("Jetty server configuration file name"), - "wikitty-server-config.xml", String.class, false, false), - WIKITTY_SERVER_URL( - "wikitty.service.server.url", - n_("Hessian server url, use by server to know path and port to bind" - + " servlet and client to contact server"), - "http://service.codelutin.com/wikitty", String.class, false, false), - - WIKITTY_EXPORT_THREADNUMBER( - "wikitty.addon.export.threadnumber", - n_("number of thread used to export task"), - "1", Integer.class, false, false), - WIKITTY_EXPORT_DIRECTORY( - "wikitty.addon.export.directory", - n_("directory path where export asynchronous file are stored"), - "${" + WIKITTY_DATA_DIR.getKey() + "}/export", String.class, false, false), - WIKITTY_EXPORT_PUBLICURL( - "wikitty.addon.export.publicurl", - n_("url used by client to retrieve export file when job is ended"), - "file://${" + WIKITTY_DATA_DIR.getKey() + "}/export/", String.class, false, false), - - WIKITTY_CACHE_RESTORE_COPIES( - "wikitty.service.cache.allwaysRestoreCopies", - n_("Indique si le cache retourne des copies des objets ou des proxies"), - "false", Boolean.class, false, false), - - WIKITTY_EVENT_PROPAGATE( - "wikitty.service.event.propagate", - n_("Indique si le service d'event propage sur le reseau les evenements"), - "false", Boolean.class, false, false), - WIKITTY_EVENT_LISTEN( - "wikitty.service.event.listen", - n_("Indique si le service d'event ecoute sur le reseau les evenements"), - "false", Boolean.class, false, false), - - WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER( - "wikitty.service.event.transporter.xmpp.server", - n_("XMPP server to use for XMPP transporter"), - "im.codelutin.com", String.class, false, false), - WIKITTY_EVENT_TRANSPORTER_XMPP_ROOM( - "wikitty.service.event.transporter.xmpp.room", - n_("Room to use for XMPP transporter"), - "test@conference.im.codelutin.com", String.class, false, false), - - WIKITTY_SLAVE_SYNC_STATE_INTERVALE( - "wikitty.service.slave.sync.state.intervale", - n_("Intervale in second where slave service save state" - + " synchronisation time"), - "300", Integer.class, false, false), - WIKITTY_SLAVE_SYNC_STATE_FILE( - "wikitty.service.slave.sync.state.file", - n_("File path to store synchronisation state"), - "${" + WIKITTY_DATA_DIR.getKey() + "}/syncState", String.class, false, false), - WIKITTY_SLAVE_MASTER_URL( - "wikitty.service.slave.master.hessian.endpoint", - n_("Master url service, where to delegate modification action"), - null, String.class, false, false), - WIKITTY_SLAVE_MASTER_XMPP_SERVER( - "wikitty.service.slave.master.xmpp.server", - n_("XMPP server to use for synchronization with master"), - "im.codelutin.com", String.class, false, false), - WIKITTY_SLAVE_MASTER_XMPP_ROOM( - "wikitty.service.slave.master.xmpp.room", - n_("Room to use for synchronization with master," - + " this room must have history activated"), - "test@conference.im.codelutin.com", String.class, false, false), - - WIKITTY_PROXY_TIME_TO_LOG_INFO( - "wikitty.proxy.timeToLog.info", - n_("maximum time before send log info with time consumed"), - "1000", Integer.class, false, false), - WIKITTY_PROXY_TIME_TO_LOG_WARN( - "wikitty.proxy.timeToLog.warn", - n_("maximum time before send log warn with time consumed"), - "3000", Integer.class, false, false), - - JCS_DEFAULT( - "jcs.default", - n_("jcs auxiliares to use"), - "", String.class, false, false), - - JCS_DEFAULT_CACHEATTRIBUTES_MAXOBJECTS( - "jcs.default.cacheattributes.MaxObjects", - n_("jcs maximum number of items allowed in memory"), - "1000", String.class, false, false); - - public String key; - public String description; - public String defaultValue; - public Class<?> type; - public boolean isTransient; - public boolean isFinal; - - private WikittyOption(String key, String description, String defaultValue, Class<?> type, boolean isTransient, boolean isFinal) { - this.key = key; - this.description = description; - this.defaultValue = defaultValue; - this.type = type; - this.isTransient = isTransient; - this.isFinal = isFinal; + static public ApplicationConfig getConfig( + Properties props, String configFilename, String ... args) { + ApplicationConfig conf = new ApplicationConfig( + WikittyConfigOption.class, WikittyConfigAction.class, + props, configFilename); + + try { + conf.parse(args); + } catch (ArgumentsParserException eee) { + if (log.isErrorEnabled()) { + log.error("Can't load wikitty configuration", eee); + } } + return conf; + } - @Override - public boolean isFinal() { - return isFinal; - } - - @Override - public boolean isTransient() { - return isTransient; - } - - @Override - public String getDefaultValue() { - return defaultValue; - } - - @Override - public String getDescription() { - return description; - } - - @Override - public String getKey() { - return key; - } - - @Override - public Class<?> getType() { - return type; - } - - @Override - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } - - @Override - public void setTransient(boolean isTransient) { - this.isTransient = isTransient; - } - - @Override - public void setFinal(boolean isFinal) { - this.isFinal = isFinal; - } - } - - public static enum WikittyAction implements ActionDef { - - HELP(n_("Wikitty help"), - WikittyConfig.class.getName() + "#help", "-h", "--help"); - - public String description; - public String action; - public String[] aliases; - - private WikittyAction(String description, String action, String... aliases) { - this.description = description; - this.action = action; - this.aliases = aliases; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - @Override - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - @Override - public String[] getAliases() { - return aliases; - } - - public void setAliases(String[] aliases) { - this.aliases = aliases; - } - } - static public void help() { System.out.println("Wikitty configuration and action"); System.out.println("Options (set with --option <key> <value>:"); - for (WikittyOption o : WikittyOption.values()) { + for (WikittyConfigOption o : WikittyConfigOption.values()) { log.debug("\t" + o.key + "(" + o.defaultValue + "):" + _(o.description)); } log.debug("Actions:"); - for (WikittyAction a : WikittyAction.values()) { + for (WikittyConfigAction a : WikittyConfigAction.values()) { log.debug("\t" + java.util.Arrays.toString(a.aliases) + "(" + a.action + "):" + _(a.description)); } System.exit(0); Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigAction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigAction.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigAction.java 2011-04-13 16:59:23 UTC (rev 805) @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2011 poussin. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +package org.nuiton.wikitty; + +import static org.nuiton.i18n.I18n.n_; + +import org.nuiton.util.ApplicationConfig.ActionDef; + +/** + * + * @author poussin + */ +public enum WikittyConfigAction implements ActionDef { + HELP(n_("Wikitty help"), WikittyConfig.class.getName() + "#help", "-h", "--help"); + public String description; + public String action; + public String[] aliases; + + private WikittyConfigAction(String description, String action, String... aliases) { + this.description = description; + this.action = action; + this.aliases = aliases; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + @Override + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + @Override + public String[] getAliases() { + return aliases; + } + + public void setAliases(String[] aliases) { + this.aliases = aliases; + } + +} Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java 2011-04-13 16:59:23 UTC (rev 805) @@ -0,0 +1,338 @@ +/* + * Copyright (c) 2011 poussin. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +package org.nuiton.wikitty; + +import static org.nuiton.i18n.I18n.n_; + +import java.io.File; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.ApplicationConfig.OptionDef; +import org.nuiton.wikitty.services.WikittyCacheJCS; +import org.nuiton.wikitty.services.WikittyServiceAccessStat.AccessStatStorageWikitty; +import org.nuiton.wikitty.services.WikittyServiceInMemory; +import org.nuiton.wikitty.services.XMPPNotifierTransporter; + +/** + * + * @author poussin + */ +public enum WikittyConfigOption implements OptionDef { + + WIKITTY_CONFIG_FILE( + ApplicationConfig.CONFIG_FILE_NAME, + n_("Main configuration wikitty file"), + "wikitty-config.properties", + String.class, true, true), + WIKITTY_DATA_DIR( + "wikitty.data.directory", + n_("Data directory where wikitty store data"), + "./target/data", + String.class, false, false), + WIKITTY_STORAGE_JDBC_QUERY_FILE( + "wikitty.storage.jdbc.queryfile", + n_("JDBC query configuration file. You can put more than one file" + + " to load specific SQL statement for your database." + + " Exemple: wikitty-jdbc-query.properties,wikitty-jdbc-query-mysql.properties"), + "wikitty-jdbc-query.properties", + String.class, false, false), + WIKITTY_STORAGE_JDBC_DRIVER( + "wikitty.storage.jdbc.driver", + n_("JDBC driver name"), + "org.h2.Driver", + String.class, false, false), + WIKITTY_STORAGE_JDBC_URL( + "wikitty.storage.jdbc.host", + n_("JDBC url"), + "jdbc:h2:file:${" + WIKITTY_DATA_DIR.getKey() + "}/db", + String.class, false, false), + WIKITTY_STORAGE_JDBC_LOGIN( + "wikitty.storage.jdbc.login", + n_("JDBC login name"), + "sa", + String.class, false, false), + WIKITTY_STORAGE_JDBC_PASSWORD( + "wikitty.storage.jdbc.password", + n_("JDBC password"), + "", + String.class, false, false), + WIKITTY_STORAGE_JDBC_XADATASOURCE( + "wikitty.storage.jdbc.xadatasource", + n_("JDBC xadatasource driver"), + "org.h2.jdbcx.JdbcDataSource", + String.class, false, false), + WIKITTY_STORAGE_JDBC_XADATASOURCE_H2_URL( + "wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL", + n_("JDBC xadatasource property h2 url"), + "${" + WIKITTY_STORAGE_JDBC_URL.getKey() + "}", + String.class, false, false), + WIKITTY_STORAGE_JDBC_XADATASOURCE_H2_USER( + "wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user", + n_("JDBC xadatasource property h2 username"), + "${" + WIKITTY_STORAGE_JDBC_LOGIN.getKey() + "}", + String.class, false, false), + WIKITTY_STORAGE_JDBC_XADATASOURCE_H2_PASSWORD( + "wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password", + n_("JDBC xadatasource property h2 password"), + "${" + WIKITTY_STORAGE_JDBC_PASSWORD.getKey() + "}", + String.class, false, false), + WIKITTY_SEARCHENGINE_SOLR_HOME("wikitty.searchengine.solr.home", + n_("SolR directory home. You can put solr.xml config file in. If" + + " not null, replace solr.solr.home environment vairable"), + null, + String.class, false, false), + /* Solr config name are used directly in solr config file. If + * you change it, change too in module + * wikitty-solr-impl/src/main/resources/solrconfig.xml */ + WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA( + "wikitty.searchengine.solr.directory.data", + n_("Solr data directory"), + "${" + WIKITTY_DATA_DIR.getKey() + "}/solr", + File.class, false, false), + WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY( + "wikitty.searchengine.solr.directory.factory", + n_("SolR storage type possible value: solr.StandardDirectoryFactory" + + " or org.nuiton.wikitty.storage.solr.RAMDirectoryFactory" + + " (or when solr 4.0 will be used org.apache.solr.core.RAMDirectoryFactory)"), + "solr.StandardDirectoryFactory", + String.class, false, false), + WIKITTY_WIKITTYSERVICE_COMPONENTS( + "wikitty.WikittyService.components", + n_("WikittyService to use (list must be in right order. " + + "ex: org.nuiton.wikitty.WikittyServiceStorage,org.nuiton.wikitty.WikittyServiceNotifier," + + "org.nuiton.wikitty.WikittyServiceCached,org.nuiton.wikitty.WikittyServiceSecurity)"), + WikittyServiceInMemory.class.getName(), + String.class, false, false), + WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE( + "wikitty.WikittyServiceInMemory.persistence", + n_("Indique si les donnees sont stocker entre deux utilisations."), + "false", + Boolean.class, false, false), + WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE( + "wikitty.WikittyServiceInMemory.persistence.file", + n_("Fichier ou les donnees sont stocker"), + "${" + WIKITTY_DATA_DIR.getKey() + "}/wikitty-inmemory.ser", + File.class, false, false), + WIKITTY_WIKITTYSERVICESTORAGE_COMPONENTS( + "wikitty.WikittyServiceStorage.components", + n_("WikittyServiceStorage component to use" + + " (ExtensionStorage, WikittyStorage, SearchEngine)"), + "org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC," + + "org.nuiton.wikitty.jdbc.WikittyStorageJDBC," + + "org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr", + String.class, false, false), + WIKITTY_WIKITTYSERVICENOTIFIER_COMPONENTS( + "wikitty.WikittyServiceNotifier.components", + n_("WikittyServiceNotifier component to use (transporter class" + + "to use for propagate or listen remote event)"), + XMPPNotifierTransporter.class.getName(), + String.class, false, false), + WIKITTY_TRANSACTION_WIKITTYSERVICE_COMPONENTS( + "wikitty.transaction.WikittyService.components", + n_("WikittyService to use for transaction (must be in memory)" + + "ex: org.nuiton.wikitty.services.WikittyServiceInMemory" + + " or org.nuiton.wikitty.services.WikittyServiceInMemoryJdbcSolr)"), + WikittyServiceInMemory.class.getName(), + String.class, false, false), + WIKITTY_WIKITTYSERVICECACHED_COMPONENTS( + "wikitty.WikittyServiceCached.components", + n_("Indique le composant a utiliser pour le cache"), + WikittyCacheJCS.class.getName(), + String.class, false, false), + WIKITTY_CACHE_PRIORITY_EXTENSIONS( + "wikitty.service.cache.priority.extensions", + n_("Indique la liste des extensions qui doivent etre " + + "conservee prioritairement"), + "", + String.class, false, false), + WIKITTY_CACHE_SIMPLE_REFERENCE_TYPE( + "wikitty.service.cache.simple.reference.type", + n_("Indique le type de reference a utiliser pour les extensions" + + " non prioritaires dans le WikittyCacheSimple (soft ou hard)"), + "soft", + String.class, false, false), + WIKITTY_WIKITTYSERVICEACCESSSTAT_COMPONENTS( + "wikitty.WikittyServiceAccessStat.components", + n_("Indique le composant a utiliser pour le stockage des acces"), + AccessStatStorageWikitty.class.getName(), + String.class, false, false), + WIKITTY_ACCESSSTAT_EXTENSIONS( + "wikitty.service.accessstat.extensions", + n_("Indique la liste d'extension dont il faut monitorer l'acces"), + "WikittyPubText,WikittyPubData", + String.class, false, false), + WIKITTY_SERVER_CONFIG( + "wikitty.service.server.config", + n_("Jetty server configuration file name"), + "wikitty-server-config.xml", + String.class, false, false), + WIKITTY_SERVER_URL( + "wikitty.service.server.url", + n_("Hessian server url, use by server to know path and port to bind" + + " servlet and client to contact server"), + "http://service.codelutin.com/wikitty", + String.class, false, false), + WIKITTY_EXPORT_THREADNUMBER( + "wikitty.addon.export.threadnumber", + n_("number of thread used to export task"), + "1", + Integer.class, false, false), + WIKITTY_EXPORT_DIRECTORY( + "wikitty.addon.export.directory", + n_("directory path where export asynchronous file are stored"), + "${" + WIKITTY_DATA_DIR.getKey() + "}/export", + String.class, false, false), + WIKITTY_EXPORT_PUBLICURL( + "wikitty.addon.export.publicurl", + n_("url used by client to retrieve export file when job is ended"), + "file://${" + WIKITTY_DATA_DIR.getKey() + "}/export/", + String.class, false, false), + WIKITTY_CACHE_RESTORE_COPIES( + "wikitty.service.cache.allwaysRestoreCopies", + n_("Indique si le cache retourne des copies des objets ou des proxies"), + "false", + Boolean.class, false, false), + WIKITTY_EVENT_PROPAGATE("wikitty.service.event.propagate", + n_("Indique si le service d'event propage sur le reseau les evenements"), + "false", + Boolean.class, false, false), + WIKITTY_EVENT_LISTEN( + "wikitty.service.event.listen", + n_("Indique si le service d'event ecoute sur le reseau les evenements"), + "false", + Boolean.class, false, false), + WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER( + "wikitty.service.event.transporter.xmpp.server", + n_("XMPP server to use for XMPP transporter"), + "im.codelutin.com", + String.class, false, false), + WIKITTY_EVENT_TRANSPORTER_XMPP_ROOM( + "wikitty.service.event.transporter.xmpp.room", + n_("Room to use for XMPP transporter"), + "test@conference.im.codelutin.com", + String.class, false, false), + WIKITTY_SLAVE_SYNC_STATE_INTERVALE( + "wikitty.service.slave.sync.state.intervale", + n_("Intervale in second where slave service save state" + + " synchronisation time"), + "300", + Integer.class, false, false), + WIKITTY_SLAVE_SYNC_STATE_FILE( + "wikitty.service.slave.sync.state.file", + n_("File path to store synchronisation state"), + "${" + WIKITTY_DATA_DIR.getKey() + "}/syncState", + String.class, false, false), + WIKITTY_SLAVE_MASTER_URL("wikitty.service.slave.master.hessian.endpoint", + n_("Master url service, where to delegate modification action"), + null, + String.class, false, false), + WIKITTY_SLAVE_MASTER_XMPP_SERVER( + "wikitty.service.slave.master.xmpp.server", + n_("XMPP server to use for synchronization with master"), + "im.codelutin.com", + String.class, false, false), + WIKITTY_SLAVE_MASTER_XMPP_ROOM( + "wikitty.service.slave.master.xmpp.room", + n_("Room to use for synchronization with master," + + " this room must have history activated"), + "test@conference.im.codelutin.com", + String.class, false, false), + WIKITTY_PROXY_TIME_TO_LOG_INFO( + "wikitty.proxy.timeToLog.info", + n_("maximum time before send log info with time consumed"), + "1000", + Integer.class, false, false), + WIKITTY_PROXY_TIME_TO_LOG_WARN( + "wikitty.proxy.timeToLog.warn", + n_("maximum time before send log warn with time consumed"), + "3000", + Integer.class, false, false), + JCS_DEFAULT("jcs.default", + n_("jcs auxiliares to use"), + "", + String.class, false, false), + JCS_DEFAULT_CACHEATTRIBUTES_MAXOBJECTS( + "jcs.default.cacheattributes.MaxObjects", + n_("jcs maximum number of items allowed in memory"), + "1000", + String.class, false, false); + public String key; + public String description; + public String defaultValue; + public Class<?> type; + public boolean isTransient; + public boolean isFinal; + + private WikittyConfigOption(String key, String description, + String defaultValue, Class<?> type, boolean isTransient, boolean isFinal) { + this.key = key; + this.description = description; + this.defaultValue = defaultValue; + this.type = type; + this.isTransient = isTransient; + this.isFinal = isFinal; + } + + @Override + public boolean isFinal() { + return isFinal; + } + + @Override + public boolean isTransient() { + return isTransient; + } + + @Override + public String getDefaultValue() { + return defaultValue; + } + + public String getOptionValue(ApplicationConfig config) { + String result = config.getOption(getKey()); + return result; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public String getKey() { + return key; + } + + @Override + public Class<?> getType() { + return type; + } + + @Override + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + @Override + public void setTransient(boolean isTransient) { + this.isTransient = isTransient; + } + + @Override + public void setFinal(boolean isFinal) { + this.isFinal = isFinal; + } +} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-04-13 16:59:23 UTC (rev 805) @@ -94,9 +94,9 @@ public WikittyProxy(ApplicationConfig config) { if (config != null) { - long timeToLogInfo = config.getOptionAsInt(WikittyConfig.WikittyOption. + long timeToLogInfo = config.getOptionAsInt(WikittyConfigOption. WIKITTY_PROXY_TIME_TO_LOG_INFO.getKey()); - long timeToLogWarn = config.getOptionAsInt(WikittyConfig.WikittyOption. + long timeToLogWarn = config.getOptionAsInt(WikittyConfigOption. WIKITTY_PROXY_TIME_TO_LOG_WARN.getKey()); timeLog.setTimeToLogInfo(timeToLogInfo); timeLog.setTimeToLogWarn(timeToLogWarn); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServerStart.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServerStart.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServerStart.java 2011-04-13 16:59:23 UTC (rev 805) @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; /** * Read wikitty config file and create WikittyService as asked in config. @@ -46,7 +47,7 @@ static private Log log = LogFactory.getLog(WikittyServerStart.class); static public void main(String ... args) { - WikittyConfig config = new WikittyConfig(args); + ApplicationConfig config = WikittyConfig.getConfig(args); WikittyService ws = WikittyServiceFactory.buildWikittyService(config); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java 2011-04-13 16:59:23 UTC (rev 805) @@ -43,6 +43,7 @@ import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyService; @@ -103,12 +104,12 @@ this.ws = ws; exportDirectory = config.getOption( - WikittyConfig.WikittyOption.WIKITTY_EXPORT_DIRECTORY.getKey()); + WikittyConfigOption.WIKITTY_EXPORT_DIRECTORY.getKey()); exportPublicURL = config.getOption( - WikittyConfig.WikittyOption.WIKITTY_EXPORT_PUBLICURL.getKey()); + WikittyConfigOption.WIKITTY_EXPORT_PUBLICURL.getKey()); int maxThread = config.getOptionAsInt( - WikittyConfig.WikittyOption.WIKITTY_EXPORT_THREADNUMBER.getKey()); + WikittyConfigOption.WIKITTY_EXPORT_THREADNUMBER.getKey()); this.importExportExecutor = Executors.newFixedThreadPool(maxThread); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java 2011-04-13 16:59:23 UTC (rev 805) @@ -67,7 +67,7 @@ * @return extension names */ public Collection<String> getExtensionNames(); - + /** * Return list of all field for this object. * Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java 2011-04-13 16:59:23 UTC (rev 805) @@ -145,6 +145,11 @@ getWikitty().setField(ext, fieldName, value); } + /** + * Return list of all extension that this entity has by definition + * (design time) and not extension added during execution time + * @return static extension + */ public Collection<WikittyExtension> getStaticExtensions() { return Collections.emptyList(); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java 2011-04-13 16:59:23 UTC (rev 805) @@ -38,6 +38,7 @@ import org.apache.jcs.engine.control.CompositeCacheManager; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.entities.WikittyExtension; @@ -79,7 +80,7 @@ public WikittyCacheJCS(ApplicationConfig config) { try { List<String> priorityExtensions = config.getOptionAsList( - WikittyConfig.WikittyOption.WIKITTY_CACHE_PRIORITY_EXTENSIONS.getKey()).getOption(); + WikittyConfigOption.WIKITTY_CACHE_PRIORITY_EXTENSIONS.getKey()).getOption(); getPriorityExtensions().addAll(priorityExtensions); CompositeCacheManager cacheMgr = CompositeCacheManager.getUnconfiguredInstance(); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheSimple.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheSimple.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheSimple.java 2011-04-13 16:59:23 UTC (rev 805) @@ -38,6 +38,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.entities.WikittyExtension; /** @@ -82,11 +83,11 @@ */ public WikittyCacheSimple(ApplicationConfig config) { List<String> priorityExtensions = config.getOptionAsList( - WikittyConfig.WikittyOption.WIKITTY_CACHE_PRIORITY_EXTENSIONS.getKey()).getOption(); + WikittyConfigOption.WIKITTY_CACHE_PRIORITY_EXTENSIONS.getKey()).getOption(); this.priorityExtensions.addAll(priorityExtensions); String refType = config.getOption( - WikittyConfig.WikittyOption.WIKITTY_CACHE_SIMPLE_REFERENCE_TYPE.getKey()); + WikittyConfigOption.WIKITTY_CACHE_SIMPLE_REFERENCE_TYPE.getKey()); if ("soft".equalsIgnoreCase(refType)) { wikittyCache = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); extensionCache = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java 2011-04-13 16:59:23 UTC (rev 805) @@ -43,6 +43,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.nuiton.wikitty.WikittyConfigOption; /** * @@ -102,7 +103,7 @@ this.statStorage = statStorage; if (statStorage == null) { if (log.isWarnEnabled()) { - String statSto = config.getOption(WikittyConfig.WikittyOption. + String statSto = config.getOption(WikittyConfigOption. WIKITTY_WIKITTYSERVICEACCESSSTAT_COMPONENTS.getKey()); log.warn(String.format( "No AccessStatStorage available, access stat can't work (%s)", @@ -110,7 +111,7 @@ } } else { // if no statStorage, make empty extensions to never call statStorage - List<String> exts = config.getOptionAsList(WikittyConfig.WikittyOption. + List<String> exts = config.getOptionAsList(WikittyConfigOption. WIKITTY_ACCESSSTAT_EXTENSIONS.getKey()).getOption(); if (log.isInfoEnabled()) { log.info(String.format("Monitor access to extensions %s", exts)); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2011-04-13 16:59:23 UTC (rev 805) @@ -36,6 +36,7 @@ import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.entities.WikittyCopyOnWrite; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.WikittyService; @@ -92,7 +93,7 @@ if (cache == null) { if (log.isWarnEnabled()) { - String cacheClassName = config.getOption(WikittyConfig.WikittyOption. + String cacheClassName = config.getOption(WikittyConfigOption. WIKITTY_WIKITTYSERVICECACHED_COMPONENTS.getKey()); log.warn(String.format( "No cache class implementation available (%s), use simple cache", @@ -118,7 +119,7 @@ // reading configuration and set allwaysRestoreCopies accordingly allwaysRestoreCopies = config.getOptionAsBoolean( - WikittyConfig.WikittyOption.WIKITTY_CACHE_RESTORE_COPIES.getKey()); + WikittyConfigOption.WIKITTY_CACHE_RESTORE_COPIES.getKey()); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoClient.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoClient.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoClient.java 2011-04-13 16:59:23 UTC (rev 805) @@ -30,6 +30,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyService; @@ -49,7 +50,7 @@ public WikittyServiceCajoClient(ApplicationConfig config) { try { - String url = config.getOption(WikittyConfig.WikittyOption. + String url = config.getOption(WikittyConfigOption. WIKITTY_SERVER_URL.getKey()); // cajo url is not http or other protocol, url must start with // Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoServer.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoServer.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCajoServer.java 2011-04-13 16:59:23 UTC (rev 805) @@ -32,6 +32,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyService; @@ -58,7 +59,7 @@ setDelegate(ws); // port and path from hessian server url in config - String urlString = config.getOption(WikittyConfig.WikittyOption. + String urlString = config.getOption(WikittyConfigOption. WIKITTY_SERVER_URL.getKey()); // get port and path part of server url, only that is used for cajo Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java 2011-04-13 16:59:23 UTC (rev 805) @@ -40,6 +40,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; /** * WARNING In memory implementation of WikittyService, currently used for test only. @@ -76,10 +77,10 @@ if (config != null) { boolean persist = config.getOptionAsBoolean( - WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE.getKey()); + WikittyConfigOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE.getKey()); if (persist) { persistenceFile = config.getOptionAsFile( - WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE.getKey()); + WikittyConfigOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE.getKey()); restoreFromPersistenceFile(persistenceFile); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java 2011-04-13 16:59:23 UTC (rev 805) @@ -36,6 +36,7 @@ import org.jivesoftware.smackx.muc.MultiUserChat; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; @@ -82,9 +83,9 @@ * @param props */ public XMPPNotifierTransporter(ApplicationConfig config) { - propagateEvent = config.getOptionAsBoolean(WikittyConfig.WikittyOption. + propagateEvent = config.getOptionAsBoolean(WikittyConfigOption. WIKITTY_EVENT_PROPAGATE.getKey()); - listenEvent = config.getOptionAsBoolean(WikittyConfig.WikittyOption. + listenEvent = config.getOptionAsBoolean(WikittyConfigOption. WIKITTY_EVENT_LISTEN.getKey()); initXMPP(config); @@ -108,10 +109,10 @@ // on verifie qu'on a besoin reellement de faire l'init if (propagateEvent || listenEvent) { String server = config.getOption( - WikittyConfig.WikittyOption.WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER.getKey()); + WikittyConfigOption.WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER.getKey()); // Keep them to verify that is not us notifications - room = config.getOption(WikittyConfig.WikittyOption. + room = config.getOption(WikittyConfigOption. WIKITTY_EVENT_TRANSPORTER_XMPP_ROOM.getKey()); pseudo = WikittyUtil.getUniqueLoginName(); try { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyI18nTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyI18nTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyI18nTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -35,6 +35,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; @@ -58,7 +59,7 @@ @Test public void testI18n() throws Exception { // creation d'un proxy sur un ws in memory - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); WikittyService ws = new WikittyServiceInMemory(config); WikittyProxy proxy = new WikittyProxy(ws); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -25,6 +25,7 @@ package org.nuiton.wikitty.addons; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; @@ -42,8 +43,9 @@ @Test public void testFindAllByLabel() { - WikittyConfig config = new WikittyConfig(); - WikittyService ws = WikittyServiceFactory.buildWikittyService(config); + ApplicationConfig config = WikittyConfig.getConfig(); + WikittyService ws = WikittyServiceFactory.buildWikittyService( + config); WikittyProxy proxy = new WikittyProxy(ws); WikittyExtension ext = ExtensionFactory.create("test", "1").addField("toto", TYPE.NUMERIC).extension(); Wikitty w = new WikittyImpl(); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/importexport/ImportExportCSVTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -36,6 +36,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.search.Criteria; @@ -69,7 +70,7 @@ @BeforeClass static public void loadWikittyService() throws Exception { - WikittyConfig config = new WikittyConfig(); // default config for in memory + ApplicationConfig config = WikittyConfig.getConfig(); // default config for in memory // String msg = "Try to passe test with "+ config.getPrintableConfig("wikitty.*", 50); // log.info(msg); ws = WikittyServiceFactory.buildWikittyService(config); @@ -183,7 +184,7 @@ proxy.storeExtension(extensionTag); // declare import service - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); WikittyImportExportService wsImport = new WikittyImportExportService(config, null, ws); String[] importFiles = { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/InMemorySearchTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/InMemorySearchTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/InMemorySearchTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.api; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.services.WikittyServiceInMemory; @@ -40,7 +41,7 @@ public WikittyService getWikittyService() { if (service == null) { - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); service = new WikittyServiceInMemory(config); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -518,7 +518,7 @@ Assert.assertEquals(wikittyId, labelWikitty.getId()); Assert.assertEquals(Collections.singleton("Test"),labelWikitty.getFieldAsObject(WikittyLabel.EXT_WIKITTYLABEL,WikittyLabel.FIELD_WIKITTYLABEL_LABELS)); - ApplicationConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); WikittyServiceInMemory ws = new WikittyServiceInMemory(config); ws.store(null, Collections.singleton(labelWikitty), false); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -65,7 +65,7 @@ @Override public ApplicationConfig getConfig() { if (config == null) { - config = new WikittyConfig(); // default config for in memory + config = WikittyConfig.getConfig(); // default config for in memory // String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); // log.info(msg); } @@ -79,8 +79,9 @@ protected WikittyImportExportService getImportExportService() { if (ieService == null) { - WikittyConfig config = new WikittyConfig(); - ieService = new WikittyImportExportService(config, null, getWikittyService()); + ApplicationConfig config = WikittyConfig.getConfig(); + ieService = new WikittyImportExportService( + config, null, getWikittyService()); } return ieService; } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java 2011-04-13 16:59:23 UTC (rev 805) @@ -35,6 +35,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; @@ -64,7 +65,7 @@ @BeforeClass static public void loadWikittyService() throws Exception { - WikittyConfig config = new WikittyConfig(); // default config for in memory + ApplicationConfig config = WikittyConfig.getConfig(); // default config for in memory // String msg = "Try to passe test with "+ config.getPrintableConfig("wikitty.*", 50); // log.info(msg); ws = WikittyServiceFactory.buildWikittyService(config); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -53,7 +53,7 @@ @Override public ApplicationConfig getConfig() { if (config == null) { - config = new WikittyConfig(); // default config for in memory + config = WikittyConfig.getConfig(); // default config for in memory // String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); // log.info(msg); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -33,8 +33,10 @@ import org.junit.Before; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.services.WikittyCacheJCS; import org.nuiton.wikitty.services.WikittyServiceCached; import org.nuiton.wikitty.services.WikittyServiceInMemory; @@ -44,7 +46,7 @@ @Before public void setUpWikittyServiceCachedTest() { - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); setService(new WikittyServiceCached(config, new WikittyServiceInMemory(config), new WikittyCacheJCS(config))); @@ -94,9 +96,9 @@ @Test public void testRestoreAllwaysCopyPolicy() throws Exception { - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); config.setOption( - WikittyConfig.WikittyOption.WIKITTY_CACHE_RESTORE_COPIES.getKey(), + WikittyConfigOption.WIKITTY_CACHE_RESTORE_COPIES.getKey(), "true"); setService(new WikittyServiceCached(config, Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -34,6 +34,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.Before; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyAuthorisation; @@ -68,7 +69,7 @@ @Before public void setUpWikittyServiceSecurityTest() { - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); WikittyService inMemoryService = new WikittyServiceInMemory(config); WikittyServiceSecurity securityService = Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -37,10 +37,12 @@ import org.junit.Before; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.entities.ExtensionFactory; import org.nuiton.wikitty.entities.FieldType.TYPE; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.services.WikittyServiceEnhanced; @@ -53,7 +55,7 @@ @Before public void init() throws Exception { - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); wikittyService = new WikittyServiceInMemory(config); } @@ -71,12 +73,12 @@ tempPersistFile.delete(); tempPersistFile.deleteOnExit(); - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); config.setOption( - WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE.getKey(), + WikittyConfigOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE.getKey(), "true"); config.setOption( - WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE.getKey(), + WikittyConfigOption.WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE.getKey(), tempPersistFile.getPath()); wikittyService = new WikittyServiceInMemory(config); String extName = "MyExtName"; Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -34,7 +34,9 @@ import org.jivesoftware.smackx.muc.DiscussionHistory; import org.jivesoftware.smackx.muc.MultiUserChat; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.WikittyServiceNotifier; @@ -57,9 +59,9 @@ public void testXMPP() throws Exception { String server = "im.codelutin.com"; String room = "test@conference.im.codelutin.com"; - WikittyConfig config = new WikittyConfig(); - config.setOption(WikittyConfig.WikittyOption.WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER.getKey(), server); - config.setOption(WikittyConfig.WikittyOption.WIKITTY_EVENT_TRANSPORTER_XMPP_ROOM.getKey(), room); + ApplicationConfig config = WikittyConfig.getConfig(); + config.setOption(WikittyConfigOption.WIKITTY_EVENT_TRANSPORTER_XMPP_SERVER.getKey(), server); + config.setOption(WikittyConfigOption.WIKITTY_EVENT_TRANSPORTER_XMPP_ROOM.getKey(), room); // Envoi d'un message avec le transporter normal WikittyServiceNotifier.RemoteNotifierTransporter transporteur = Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -28,6 +28,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyImpl; @@ -47,7 +48,7 @@ @Test public void testPutGet() throws Exception { - WikittyConfig config = new WikittyConfig(); + ApplicationConfig config = WikittyConfig.getConfig(); WikittyCacheJCS cache = new WikittyCacheJCS(config); Wikitty w = new WikittyImpl(); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCachedTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCachedTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCachedTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -37,6 +37,7 @@ import java.util.ArrayList; import java.util.List; +import org.nuiton.wikitty.WikittyConfigOption; /** * @@ -52,14 +53,14 @@ static private Log log = LogFactory.getLog(WikittyServiceCachedTest.class); protected ApplicationConfig getConfig() { - WikittyConfig result = new WikittyConfig(); + ApplicationConfig result = WikittyConfig.getConfig(); return result; } @Test public void testCache() throws Exception { ApplicationConfig config = getConfig(); - config.setOption(WikittyConfig.WikittyOption + config.setOption(WikittyConfigOption .JCS_DEFAULT_CACHEATTRIBUTES_MAXOBJECTS.getKey(), "10"); WikittyServiceInMemory ws = new WikittyServiceInMemory(config); WikittyCache cache = new WikittyCacheJCS(config); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -32,7 +32,9 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceFactory; @@ -56,12 +58,12 @@ protected WikittyService startServer() throws Exception { Properties props = new Properties(); - props.setProperty(WikittyConfig.WikittyOption.WIKITTY_SERVER_URL.getKey(), + props.setProperty(WikittyConfigOption.WIKITTY_SERVER_URL.getKey(), url); - props.setProperty(WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), + props.setProperty(WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), WikittyServiceInMemory.class.getName() + "," + WikittyServiceCajoServer.class.getName()); - WikittyConfig config = new WikittyConfig(props); + ApplicationConfig config = WikittyConfig.getConfig(props); WikittyService result = WikittyServiceFactory.buildWikittyService(config); return result; } @@ -74,11 +76,11 @@ protected WikittyService getClient() throws Exception { Properties props = new Properties(); - props.setProperty(WikittyConfig.WikittyOption.WIKITTY_SERVER_URL.getKey(), + props.setProperty(WikittyConfigOption.WIKITTY_SERVER_URL.getKey(), url); - props.setProperty(WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), + props.setProperty(WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), WikittyServiceCajoClient.class.getName()); - WikittyConfig config = new WikittyConfig(props); + ApplicationConfig config = WikittyConfig.getConfig(props); WikittyService result = WikittyServiceFactory.buildWikittyService(config); return result; } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -29,7 +29,9 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.storage.WikittyExtensionStorageInMemory; @@ -52,11 +54,11 @@ @Test public void testBuild() throws Exception { Properties props = new Properties(); - props.setProperty(WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), + props.setProperty(WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), WikittyServiceInMemory.class.getName() + "," + WikittyServiceNotifier.class.getName() + "," + WikittyServiceCached.class.getName()); - WikittyConfig config = new WikittyConfig(props); + ApplicationConfig config = WikittyConfig.getConfig(props); WikittyService ws = WikittyServiceFactory.buildWikittyService(config); Assert.assertEquals(WikittyServiceCached.class, ws.getClass()); @@ -69,9 +71,10 @@ @Test public void testSampleConfig() throws Exception { { - WikittyConfig config = new WikittyConfig("wikitty-config-sample-inmemory.properties"); + ApplicationConfig config = WikittyConfig.getConfig( + "wikitty-config-sample-inmemory.properties"); // surcharge certain option qui ont besoin d'autre module que api - config.setOption(WikittyConfig.WikittyOption.WIKITTY_WIKITTYSERVICESTORAGE_COMPONENTS.getKey(), + config.setOption(WikittyConfigOption.WIKITTY_WIKITTYSERVICESTORAGE_COMPONENTS.getKey(), WikittyStorageInMemory.class.getName() + "," + WikittyExtensionStorageInMemory.class.getName() + "," + WikittySearchEngineInMemory.class.getName()); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceTransactionTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceTransactionTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceTransactionTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -50,7 +50,7 @@ static private Log log = LogFactory.getLog(WikittyServiceTransactionTest.class); protected ApplicationConfig getConfig() { - WikittyConfig result = new WikittyConfig(); + ApplicationConfig result = WikittyConfig.getConfig(); return result; } Modified: trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java =================================================================== --- trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -31,6 +31,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.WikittyUtil; @@ -46,7 +47,7 @@ @Before public void clear() throws Exception { - WikittyConfig config = new WikittyConfig("refcomp-test.properties"); + ApplicationConfig config = WikittyConfig.getConfig("refcomp-test.properties"); WikittyService ws = WikittyServiceFactory.buildWikittyService(config); ws.clear(null); Modified: trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianClient.java =================================================================== --- trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianClient.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianClient.java 2011-04-13 16:59:23 UTC (rev 805) @@ -28,7 +28,7 @@ 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 org.nuiton.wikitty.WikittyService; import org.wikitty.hessian.WikittyHessianFactory; @@ -46,7 +46,7 @@ static private Log log = LogFactory.getLog(WikittyServiceHessianClient.class); public WikittyServiceHessianClient(ApplicationConfig config) { - String url = config.getOption(WikittyConfig.WikittyOption. + String url = config.getOption(WikittyConfigOption. WIKITTY_SERVER_URL.getKey()); WikittyService ws = WikittyHessianFactory.getWikittyService(url); setDelegate(ws); Modified: trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java =================================================================== --- trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java 2011-04-13 16:59:23 UTC (rev 805) @@ -40,7 +40,7 @@ import org.jivesoftware.smackx.muc.DiscussionHistory; import org.jivesoftware.smackx.muc.MultiUserChat; import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyUtil; @@ -94,7 +94,7 @@ super(ws); this.config = config; - File file = config.getOptionAsFile(WikittyConfig.WikittyOption. + File file = config.getOptionAsFile(WikittyConfigOption. WIKITTY_SLAVE_SYNC_STATE_FILE.getKey()); if (!file.exists()) { throw new WikittyException(String.format( @@ -108,10 +108,10 @@ throw new WikittyException("Can't create file to store slave state", eee); } - syncIntervale = config.getOptionAsInt(WikittyConfig.WikittyOption. + syncIntervale = config.getOptionAsInt(WikittyConfigOption. WIKITTY_SLAVE_SYNC_STATE_INTERVALE.getKey()); - String masterURL = config.getOption(WikittyConfig.WikittyOption. + String masterURL = config.getOption(WikittyConfigOption. WIKITTY_SLAVE_MASTER_URL.getKey()); // creation du WikittyService master @@ -163,11 +163,11 @@ * @param props */ protected void initXMPP(ApplicationConfig config) { - String server = config.getOption(WikittyConfig.WikittyOption. + String server = config.getOption(WikittyConfigOption. WIKITTY_SLAVE_MASTER_XMPP_SERVER.getKey()); // Keep them to verify that is not us notifications - room = config.getOption(WikittyConfig.WikittyOption. + room = config.getOption(WikittyConfigOption. WIKITTY_SLAVE_MASTER_XMPP_ROOM.getKey()); pseudo = WikittyUtil.getUniqueLoginName(); try { Modified: trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianServer.java =================================================================== --- trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianServer.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-hessian-server/src/main/java/org/nuiton/wikitty/services/WikittyServiceHessianServer.java 2011-04-13 16:59:23 UTC (rev 805) @@ -39,7 +39,7 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.xml.XmlConfiguration; -import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; /** * @@ -64,10 +64,10 @@ servlet.setHome(this); // create servlet container - String jettyConfig = config.getOption(WikittyConfig.WikittyOption. + String jettyConfig = config.getOption(WikittyConfigOption. WIKITTY_SERVER_CONFIG.getKey()); // port and path from hessian server url in config - String urlString = config.getOption(WikittyConfig.WikittyOption. + String urlString = config.getOption(WikittyConfigOption. WIKITTY_SERVER_URL.getKey()); int port = 80; Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-04-13 16:59:23 UTC (rev 805) @@ -51,7 +51,7 @@ 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 org.nuiton.wikitty.WikittyException; /** @@ -188,7 +188,7 @@ // list of all properties file to load List<String> wikittyQueryFiles = config.getOptionAsList( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_QUERY_FILE.getKey()) + WikittyConfigOption.WIKITTY_STORAGE_JDBC_QUERY_FILE.getKey()) .getOption(); for (String file : wikittyQueryFiles) { @@ -234,16 +234,16 @@ */ public static synchronized Connection getConnection(ApplicationConfig conf) { String driver = conf.getOption( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_DRIVER.getKey()); + WikittyConfigOption.WIKITTY_STORAGE_JDBC_DRIVER.getKey()); String host = conf.getOption( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_URL.getKey()); + WikittyConfigOption.WIKITTY_STORAGE_JDBC_URL.getKey()); String username = conf.getOption( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_LOGIN.getKey()); + WikittyConfigOption.WIKITTY_STORAGE_JDBC_LOGIN.getKey()); String password = conf.getOption( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_PASSWORD.getKey()); + WikittyConfigOption.WIKITTY_STORAGE_JDBC_PASSWORD.getKey()); String xaDataSourceClassName = conf.getOption( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey()); + WikittyConfigOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey()); try { TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager(); @@ -267,10 +267,10 @@ for(Entry<Object, Object> properties : conf.getFlatOptions().entrySet()) { String propertyName = (String) properties.getKey(); if (propertyName.startsWith( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey() + WikittyConfigOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey() + "." + xaDataSourceClassName + ".")) { propertyName = propertyName.replaceFirst( - WikittyConfig.WikittyOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey() + WikittyConfigOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey() + "." + xaDataSourceClassName + ".", ""); if(fields.contains(propertyName)) { String propertyValue = (String) properties.getValue(); Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2011-04-13 16:59:23 UTC (rev 805) @@ -32,6 +32,7 @@ import org.apache.solr.core.RAMDirectoryFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC; import org.nuiton.wikitty.jdbc.WikittyStorageJDBC; import org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr; @@ -56,16 +57,16 @@ // we use unique db name (this permit to use simultaneously many // WikittyServiceInMemoryJdbcSolr) String dbName = "wikitty-tx-" + UUID.randomUUID().toString(); - ApplicationConfig config = new WikittyConfig(); - config.setOption(WikittyConfig.WikittyOption. + ApplicationConfig config = WikittyConfig.getConfig(); + config.setOption(WikittyConfigOption. WIKITTY_STORAGE_JDBC_URL.getKey(), "jdbc:h2:mem:" + dbName); // solr meme en RAMDirectoryFactory peut creer des fichiers si // la config est mauvaise, pour prevenir tous problemes on fixe un // repertoire unique si jamais ca arrive pour eviter les problemes - config.setOption(WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.getKey(), + config.setOption(WikittyConfigOption.WIKITTY_DATA_DIR.getKey(), config.getOption("java.io.tmpdir") + File.separator + dbName); - config.setOption(WikittyConfig.WikittyOption. + config.setOption(WikittyConfigOption. WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(), RAMDirectoryFactory.class.getName()); // others defaults value in config normaly is correct Modified: trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java =================================================================== --- trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/jdbc/test/StorageJDBCTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -30,6 +30,7 @@ import org.junit.Before; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.conform.StorageTest; @@ -50,8 +51,8 @@ @Override public ApplicationConfig getConfig() { if (config == null) { - config = new WikittyConfig("wikitty-config-sample-standalone.properties"); - config.setOption(WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.getKey(), + config = WikittyConfig.getConfig("wikitty-config-sample-standalone.properties"); + config.setOption(WikittyConfigOption.WIKITTY_DATA_DIR.getKey(), "./target/data"); // String msg = "Try to passe test with " + config.getPrintableConfig("wikitty.*", 50); // log.info(msg); Modified: trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/ProxyTest.java =================================================================== --- trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/ProxyTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/ProxyTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -40,6 +40,8 @@ import org.nuiton.wikitty.entities.WikittyTreeNodeImpl; import java.util.Collections; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyConfigOption; /** * @@ -56,11 +58,12 @@ @Test public void testProxyStoreRestoreTreeNode() throws Exception { - WikittyConfig config = new WikittyConfig("wikitty-config-sample-standalone.properties"); - config.setOption(WikittyConfig.WikittyOption. + ApplicationConfig config = WikittyConfig.getConfig( + "wikitty-config-sample-standalone.properties"); + config.setOption(WikittyConfigOption. WIKITTY_STORAGE_JDBC_URL.getKey(), "jdbc:h2:file:./target/data/db"); - config.setOption(WikittyConfig.WikittyOption. + config.setOption(WikittyConfigOption. WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(), "./target/data/solr"); Modified: trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java =================================================================== --- trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolrTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; /** * @@ -46,7 +47,7 @@ @Override protected ApplicationConfig getConfig() { ApplicationConfig result = super.getConfig(); - result.setOption(WikittyConfig.WikittyOption. + result.setOption(WikittyConfigOption. WIKITTY_TRANSACTION_WIKITTYSERVICE_COMPONENTS.getKey(), WikittyServiceInMemoryJdbcSolr.class.getName()); log.info(result.getPrintableConfig("wikitty.*", 50)); Modified: trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTest.java =================================================================== --- trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -40,6 +40,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import org.nuiton.util.ApplicationConfig; public class PerfTest { @@ -47,7 +48,7 @@ static private Log log = LogFactory.getLog(PerfTest.class); public static void main(String[] args) { - WikittyConfig config = new WikittyConfig(args); + ApplicationConfig config = WikittyConfig.getConfig(args); int threadsNb = 20; int researches = 2001; int loopsToAvg = 5; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java 2011-04-13 16:59:23 UTC (rev 805) @@ -45,6 +45,7 @@ import org.nuiton.util.ObjectUtil; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; @@ -273,13 +274,13 @@ log.info(String.format("Try to load config file '%s'", filename)); ApplicationConfig wsConfigDefault; - wsConfigDefault = new WikittyConfig(filename); + wsConfigDefault = WikittyConfig.getConfig(filename); // change juste data dir with context path String dataDir = wsConfigDefault.getOption( - WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.getKey()); + WikittyConfigOption.WIKITTY_DATA_DIR.getKey()); wsConfigDefault.setOption( - WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.getKey(), + WikittyConfigOption.WIKITTY_DATA_DIR.getKey(), dataDir + File.separator + wsContext); // read specifique configuration with default config as default properties Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-04-13 16:59:23 UTC (rev 805) @@ -63,7 +63,7 @@ import org.apache.commons.lang.StringUtils; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.TimeLog; -import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; import org.nuiton.wikitty.search.Search; @@ -105,7 +105,7 @@ if (config != null) { // choix du storage (file or Ram) String solrDirFactoryKey = - WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(); + WikittyConfigOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(); String solrDirFactory = config.getOption(solrDirFactoryKey); if (solrDirFactory != null) { System.setProperty(solrDirFactoryKey, solrDirFactory); @@ -114,7 +114,7 @@ // on utilise le directory que si on est pas en Ram if (solrDirFactory != null && !solrDirFactory.contains("RAMDirectoryFactory")) { String solrDataDirKey = - WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(); + WikittyConfigOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(); String solrDataDir = config.getOption(solrDataDirKey); // make sure that dir exists if (solrDataDir != null) { Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java 2011-04-13 16:59:23 UTC (rev 805) @@ -25,17 +25,16 @@ package org.nuiton.wikitty.storage.solr; import org.junit.Before; -import org.junit.BeforeClass; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.services.WikittyServiceEnhanced; public abstract class AbstractTestSolr { protected WikittyProxy proxy = null; - protected static WikittyConfig instance = new WikittyConfig("wikitty-config-sample-inmemory.properties"); + protected static ApplicationConfig instance = WikittyConfig.getConfig("wikitty-config-sample-inmemory.properties"); protected static WikittyServiceEnhanced ws; Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java 2011-04-13 16:59:23 UTC (rev 805) @@ -25,6 +25,7 @@ package org.nuiton.wikitty.storage.solr; import org.junit.BeforeClass; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.api.AbstractSearchTest; @@ -37,7 +38,7 @@ WikittyService service; - static protected WikittyConfig config = new WikittyConfig("wikitty-config-sample-inmemory.properties"); + static protected ApplicationConfig config = WikittyConfig.getConfig("wikitty-config-sample-inmemory.properties"); @BeforeClass public static void initTests() { Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java 2011-04-13 16:59:23 UTC (rev 805) @@ -5,6 +5,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; /** * User: couteau @@ -29,7 +30,7 @@ } // set data dir configuration - config.setOption(WikittyConfig.WikittyOption.WIKITTY_DATA_DIR.key, + config.setOption(WikittyConfigOption.WIKITTY_DATA_DIR.key, dataDirectory.getAbsolutePath()); } } Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java 2011-04-13 15:28:43 UTC (rev 804) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java 2011-04-13 16:59:23 UTC (rev 805) @@ -36,6 +36,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.*; @@ -62,7 +63,7 @@ protected static WikittyServiceSolr ws; - protected static WikittyConfig instance = new WikittyConfig("wikitty-config-sample-inmemory.properties"); + protected static ApplicationConfig instance = WikittyConfig.getConfig("wikitty-config-sample-inmemory.properties"); protected WikittyProxy proxy = new WikittyProxy(ws);