Author: mfortun Date: 2011-08-17 17:09:44 +0200 (Wed, 17 Aug 2011) New Revision: 1168 Url: http://nuiton.org/repositories/revision/wikitty/1168 Log: *reorganize properties file Removed: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-codelutin.properties trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-jar.properties trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-light.properties trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-lightfallback.properties trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-test.properties Modified: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-fallback.properties Deleted: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-codelutin.properties =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-codelutin.properties 2011-08-17 14:59:50 UTC (rev 1167) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-codelutin.properties 2011-08-17 15:09:44 UTC (rev 1168) @@ -1,26 +0,0 @@ -### -# #%L -# Wikitty :: publication -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 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 -# 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 -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### -#wikitty.data.directory=/var/lib/wikitty-publication/codelutin/ -wikitty.service.server.url=http://localhost:2222/wikitty \ No newline at end of file Modified: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties 2011-08-17 14:59:50 UTC (rev 1167) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties 2011-08-17 15:09:44 UTC (rev 1168) @@ -23,7 +23,7 @@ # #L% ### -wikitty.data.directory=./targetBD1/data +wikitty.data.directory=target/wikitty-pub-storage wikitty.service.server.url=http://localhost:1111/wikitty wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties wikitty.storage.jdbc.driver=org.h2.Driver @@ -37,6 +37,7 @@ 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.publication.WikittyPublicationFallbackService,\ org.nuiton.wikitty.services.WikittyServiceNotifier,\ org.nuiton.wikitty.services.WikittyServiceCached,\ org.nuiton.wikitty.services.WikittyServiceSecurity,\ @@ -56,3 +57,6 @@ wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ wikitty.WikittyServiceAccessStat.components=\ org.nuiton.wikitty.services.WikittyServiceAccessStat$AccessStatStorageLog + +wikitty.fallback.file=wikitty-publication-ws-fallback.properties +wikitty.fallback.override=false Modified: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-fallback.properties =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-fallback.properties 2011-08-17 14:59:50 UTC (rev 1167) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-fallback.properties 2011-08-17 15:09:44 UTC (rev 1168) @@ -22,41 +22,6 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### +wikitty.WikittyService.components=org.nuiton.wikitty.publication.externalize.WikittyServiceJarLoader +wikitty.publication.repository.jar=${wikitty.data.directory}/jar -wikitty.data.directory=./targetBD1/data -wikitty.service.server.url=http://localhost:1111/wikitty -wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties -wikitty.storage.jdbc.driver=org.h2.Driver -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=${wikitty.data.directory}/data/solr -wikitty.searchengine.solr.directory.factory=solr.StandardDirectoryFactory -wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ -org.nuiton.wikitty.publication.WikittyPublicationFallbackService,\ -org.nuiton.wikitty.services.WikittyServiceNotifier,\ -org.nuiton.wikitty.services.WikittyServiceCached,\ -org.nuiton.wikitty.services.WikittyServiceSecurity,\ -org.nuiton.wikitty.services.WikittyServiceAccessStat - -wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ -org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ -org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr -wikitty.service.cache.listenevents=false -wikitty.service.cache.allwaysRestoreCopies=false -wikitty.service.event.propagate=false -wikitty.service.event.listen=false -wikitty.service.accessstat.extensions=WikittyPubText,WikittyPubData -wikitty.addon.export.threadnumber=1 -wikitty.addon.export.directory=${wikitty.data.directory}/export -wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ -wikitty.WikittyServiceAccessStat.components=\ -org.nuiton.wikitty.services.WikittyServiceAccessStat$AccessStatStorageLog - -wikitty.fallback.file=wikitty-publication-ws-jar.properties -wikitty.fallback.override=false - Deleted: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-jar.properties =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-jar.properties 2011-08-17 14:59:50 UTC (rev 1167) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-jar.properties 2011-08-17 15:09:44 UTC (rev 1168) @@ -1,29 +0,0 @@ -### -# #%L -# Wikitty :: publication -# -# $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 -# 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 -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### - - -wikitty.WikittyService.components=org.nuiton.wikitty.publication.externalize.WikittyServiceJarLoader -wikitty.publication.repository.jar=/home/Manou/testWP/ - Deleted: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-light.properties =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-light.properties 2011-08-17 14:59:50 UTC (rev 1167) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-light.properties 2011-08-17 15:09:44 UTC (rev 1168) @@ -1,28 +0,0 @@ -### -# #%L -# Wikitty :: publication -# -# $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 -# 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 -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### - - -wikitty.service.server.url=http://localhost:1111/wikitty -wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient Deleted: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-lightfallback.properties =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-lightfallback.properties 2011-08-17 14:59:50 UTC (rev 1167) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-lightfallback.properties 2011-08-17 15:09:44 UTC (rev 1168) @@ -1,28 +0,0 @@ -### -# #%L -# Wikitty :: publication -# -# $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 -# 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 -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### - - -wikitty.service.server.url=http://localhost:2222/wikitty -wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient Deleted: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-test.properties =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-test.properties 2011-08-17 14:59:50 UTC (rev 1167) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-test.properties 2011-08-17 15:09:44 UTC (rev 1168) @@ -1,56 +0,0 @@ -### -# #%L -# Wikitty :: publication -# -# $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 -# 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 -# License along with this program. If not, see -# <http://www.gnu.org/licenses/lgpl-3.0.html>. -# #L% -### - - -wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties -wikitty.storage.jdbc.driver=org.h2.Driver -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=${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,\ -org.nuiton.wikitty.services.WikittyServiceCached,\ -org.nuiton.wikitty.services.WikittyServiceSecurity,\ -org.nuiton.wikitty.services.WikittyServiceAccessStat - -wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ -org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ -org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr -wikitty.service.cache.listenevents=false -wikitty.service.cache.allwaysRestoreCopies=false -wikitty.service.event.propagate=false -wikitty.service.event.listen=false -wikitty.service.accessstat.extensions=WikittyPubText,WikittyPubData -wikitty.addon.export.threadnumber=1 -wikitty.addon.export.directory=${wikitty.data.directory}/export -wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ -wikitty.WikittyServiceAccessStat.components=\ -org.nuiton.wikitty.services.WikittyServiceAccessStat$AccessStatStorageLog
participants (1)
-
mfortun＠users.nuiton.org