Author: bpoussin Date: 2010-12-07 01:43:56 +0100 (Tue, 07 Dec 2010) New Revision: 566 Url: http://nuiton.org/repositories/revision/wikitty/566 Log: add configuration variable wikitty.data.directory, this permit to change easily all data file storage in one line Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-03 18:01:20 UTC (rev 565) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-07 00:43:56 UTC (rev 566) @@ -126,6 +126,11 @@ _("Main configuration wikitty file"), "wikitty-config.properties", String.class, true, true), + WIKITTY_DATA_DIR( + "wikitty.data.directory", + _("Data directory where wikitty store data"), + "./target/data", String.class, false, false), + WIKITTY_STORAGE_JDBC_QUERY_FILE( "wikitty.storage.jdbc.queryfile", _("JDBC query configuration file"), @@ -138,7 +143,7 @@ WIKITTY_STORAGE_JDBC_URL( "wikitty.storage.jdbc.host", _("JDBC url"), - "jdbc:h2:file:./target/data/db", String.class, false, false), + "jdbc:h2:file:${" + WIKITTY_DATA_DIR + "}/db", String.class, false, false), WIKITTY_STORAGE_JDBC_LOGIN( "wikitty.storage.jdbc.login", _("JDBC login name"), @@ -170,7 +175,7 @@ WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA( "wikitty.searchengine.solr.directory.data", _("Solr data directory"), - "./target/data/solr", File.class, false, false), + "${" + WIKITTY_DATA_DIR + "}/solr", File.class, false, false), WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY( "wikitty.searchengine.solr.directory.factory", _("SolR storage type possible value: solr.StandardDirectoryFactory" @@ -192,7 +197,7 @@ WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE( "wikitty.WikittyServiceInMemory.persistence.file", _("Fichier ou les donnees sont stocker"), - "/tmp/wikitty-inmemory.ser", File.class, false, false), + "${" + WIKITTY_DATA_DIR + "}/wikitty-inmemory.ser", File.class, false, false), WIKITTY_WIKITTYSERVICESTORAGE_COMPONENTS( @@ -232,11 +237,11 @@ WIKITTY_EXPORT_DIRECTORY( "wikitty.addon.export.directory", _("directory path where export asynchronous file are stored"), - "/tmp", String.class, false, false), + "${" + WIKITTY_DATA_DIR + "}/export", String.class, false, false), WIKITTY_EXPORT_PUBLICURL( "wikitty.addon.export.publicurl", _("url used by client to retrieve export file when job is ended"), - "file:///tmp/", String.class, false, false), + "file://${" + WIKITTY_DATA_DIR + "}/export/", String.class, false, false), WIKITTY_CACHE_RESTORE_COPIES( "wikitty.service.cache.allwaysRestoreCopies", @@ -274,7 +279,7 @@ WIKITTY_SLAVE_SYNC_STATE_FILE( "wikitty.service.slave.sync.state.file", _("File path to store synchronisation state"), - "./target/data/syncState", String.class, false, false), + "${" + WIKITTY_DATA_DIR + "}/syncState", String.class, false, false), WIKITTY_SLAVE_MASTER_URL( "wikitty.service.slave.master.hessian.endpoint", _("Master url service, where to delegate modification action"),