Author: bpoussin Date: 2010-12-15 11:44:19 +0100 (Wed, 15 Dec 2010) New Revision: 611 Url: http://nuiton.org/repositories/revision/wikitty/611 Log: fix boggus ${WIKITTY_DATA_DIR} directory creation 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-14 21:41:35 UTC (rev 610) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-15 10:44:19 UTC (rev 611) @@ -146,7 +146,7 @@ WIKITTY_STORAGE_JDBC_URL( "wikitty.storage.jdbc.host", _("JDBC url"), - "jdbc:h2:file:${" + WIKITTY_DATA_DIR + "}/db", String.class, false, false), + "jdbc:h2:file:${" + WIKITTY_DATA_DIR.getKey() + "}/db", String.class, false, false), WIKITTY_STORAGE_JDBC_LOGIN( "wikitty.storage.jdbc.login", _("JDBC login name"), @@ -178,7 +178,7 @@ WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA( "wikitty.searchengine.solr.directory.data", _("Solr data directory"), - "${" + WIKITTY_DATA_DIR + "}/solr", File.class, false, false), + "${" + WIKITTY_DATA_DIR.getKey() + "}/solr", File.class, false, false), WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY( "wikitty.searchengine.solr.directory.factory", _("SolR storage type possible value: solr.StandardDirectoryFactory" @@ -200,7 +200,7 @@ WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE( "wikitty.WikittyServiceInMemory.persistence.file", _("Fichier ou les donnees sont stocker"), - "${" + WIKITTY_DATA_DIR + "}/wikitty-inmemory.ser", File.class, false, false), + "${" + WIKITTY_DATA_DIR.getKey() + "}/wikitty-inmemory.ser", File.class, false, false), WIKITTY_WIKITTYSERVICESTORAGE_COMPONENTS( @@ -250,11 +250,11 @@ WIKITTY_EXPORT_DIRECTORY( "wikitty.addon.export.directory", _("directory path where export asynchronous file are stored"), - "${" + WIKITTY_DATA_DIR + "}/export", String.class, false, false), + "${" + WIKITTY_DATA_DIR.getKey() + "}/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://${" + WIKITTY_DATA_DIR + "}/export/", String.class, false, false), + "file://${" + WIKITTY_DATA_DIR.getKey() + "}/export/", String.class, false, false), WIKITTY_CACHE_RESTORE_COPIES( "wikitty.service.cache.allwaysRestoreCopies", @@ -292,7 +292,7 @@ WIKITTY_SLAVE_SYNC_STATE_FILE( "wikitty.service.slave.sync.state.file", _("File path to store synchronisation state"), - "${" + WIKITTY_DATA_DIR + "}/syncState", String.class, false, false), + "${" + WIKITTY_DATA_DIR.getKey() + "}/syncState", String.class, false, false), WIKITTY_SLAVE_MASTER_URL( "wikitty.service.slave.master.hessian.endpoint", _("Master url service, where to delegate modification action"),