Author: bpoussin Date: 2010-12-07 01:48:49 +0100 (Tue, 07 Dec 2010) New Revision: 570 Url: http://nuiton.org/repositories/revision/wikitty/570 Log: use new wikitty.data.directory configuration facility Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties 2010-12-07 00:48:07 UTC (rev 569) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties 2010-12-07 00:48:49 UTC (rev 570) @@ -22,6 +22,7 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### +wikitty.data.directory=/var/lib/wikitty wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties wikitty.storage.jdbc.driver=org.h2.Driver wikitty.storage.jdbc.host=jdbc:h2:mem:db @@ -43,5 +44,5 @@ wikitty.service.event.propagate=false wikitty.service.event.listen=false wikitty.addon.export.threadnumber=1 -wikitty.addon.export.directory=/tmp/wikitty -wikitty.addon.export.publicurl=file:///tmp/wikitty/ +wikitty.addon.export.directory=${wikitty.data.directory}/export +wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties 2010-12-07 00:48:07 UTC (rev 569) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties 2010-12-07 00:48:49 UTC (rev 570) @@ -22,16 +22,17 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### +wikitty.data.directory=/var/lib/wikitty wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties wikitty.storage.jdbc.driver=org.h2.Driver -wikitty.storage.jdbc.host=jdbc:h2:file:/var/lib/wikitty/data/db +wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db wikitty.storage.jdbc.login=sa wikitty.storage.jdbc.password= wikitty.storage.jdbc.xadatasource=org.h2.jdbcx.JdbcDataSource wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL=${wikitty.storage.jdbc.host} wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user=${wikitty.storage.jdbc.login} wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password=${wikitty.storage.jdbc.password} -wikitty.searchengine.solr.directory.data=/var/lib/wikitty/data/solr +wikitty.searchengine.solr.directory.data=${wikitty.data.directory}/data/solr wikitty.searchengine.solr.directory.factory=solr.StandardDirectoryFactory wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ org.nuiton.wikitty.services.WikittyServiceSlave,\ @@ -54,5 +55,5 @@ wikitty.service.slave.master.xmpp.server=im.codelutin.com wikitty.service.slave.master.xmpp.room=master@conference.im.codelutin.com wikitty.addon.export.threadnumber=1 -wikitty.addon.export.directory=/tmp/wikitty -wikitty.addon.export.publicurl=file:///tmp/wikitty/ +wikitty.addon.export.directory=${wikitty.data.directory}/export +wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties 2010-12-07 00:48:07 UTC (rev 569) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties 2010-12-07 00:48:49 UTC (rev 570) @@ -22,16 +22,17 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### +wikitty.data.directory=/var/lib/wikitty wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties wikitty.storage.jdbc.driver=org.h2.Driver -wikitty.storage.jdbc.host=jdbc:h2:file:/var/lib/wikitty/data/db +wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db wikitty.storage.jdbc.login=sa wikitty.storage.jdbc.password= wikitty.storage.jdbc.xadatasource=org.h2.jdbcx.JdbcDataSource wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL=${wikitty.storage.jdbc.host} wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user=${wikitty.storage.jdbc.login} wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password=${wikitty.storage.jdbc.password} -wikitty.searchengine.solr.directory.data=/var/lib/wikitty/data/solr +wikitty.searchengine.solr.directory.data=${wikitty.data.directory}/data/solr wikitty.searchengine.solr.directory.factory=solr.StandardDirectoryFactory wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ org.nuiton.wikitty.services.WikittyServiceNotifier,\ @@ -50,5 +51,5 @@ wikitty.service.event.transporter.xmpp.server=im.codelutin.com wikitty.service.event.transporter.xmpp.room=master@conference.im.codelutin.com wikitty.addon.export.threadnumber=1 -wikitty.addon.export.directory=/tmp/wikitty -wikitty.addon.export.publicurl=file:///tmp/wikitty +wikitty.addon.export.directory=${wikitty.data.directory}/export +wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties 2010-12-07 00:48:07 UTC (rev 569) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties 2010-12-07 00:48:49 UTC (rev 570) @@ -22,16 +22,17 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### +wikitty.data.directory=/var/lib/wikitty wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties wikitty.storage.jdbc.driver=org.h2.Driver -wikitty.storage.jdbc.host=jdbc:h2:file:/var/lib/wikitty/data/db +wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db wikitty.storage.jdbc.login=sa wikitty.storage.jdbc.password= wikitty.storage.jdbc.xadatasource=org.h2.jdbcx.JdbcDataSource wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL=${wikitty.storage.jdbc.host} wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user=${wikitty.storage.jdbc.login} wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password=${wikitty.storage.jdbc.password} -wikitty.searchengine.solr.directory.data=/var/lib/wikitty/data/solr +wikitty.searchengine.solr.directory.data=${wikitty.data.directory}/data/solr wikitty.searchengine.solr.directory.factory=solr.StandardDirectoryFactory wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ org.nuiton.wikitty.services.WikittyServiceNotifier,\ @@ -45,5 +46,5 @@ wikitty.service.event.propagate=false wikitty.service.event.listen=false wikitty.addon.export.threadnumber=1 -wikitty.addon.export.directory=/tmp/wikitty -wikitty.addon.export.publicurl=file:///tmp/wikitty +wikitty.addon.export.directory=${wikitty.data.directory}/export +wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/