Author: chatellier Date: 2011-01-24 17:13:16 +0000 (Mon, 24 Jan 2011) New Revision: 561 Log: Split indicators and maps results in two directories Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2011-01-24 17:12:10 UTC (rev 560) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2011-01-24 17:13:16 UTC (rev 561) @@ -142,11 +142,16 @@ return result; } - public File getWebProjectsDirectory() { - File result = getOptionAsFile(CoserBusinessOption.WEB_PROJECTS_DIRECTORY.key); + public File getWebIndicatorsProjectsDirectory() { + File result = getOptionAsFile(CoserBusinessOption.WEB_INDICATORS_PROJECTS_DIRECTORY.key); return result; } + public File getWebMapsProjectsDirectory() { + File result = getOptionAsFile(CoserBusinessOption.WEB_MAPS_PROJECTS_DIRECTORY.key); + return result; + } + public File getWebIndicatorsFile() { File result = getOptionAsFile(CoserBusinessOption.WEB_INDICATORS.key); return result; @@ -195,7 +200,8 @@ /** Server side. */ WEB_PROPERTIES_FILE("coser.web.properties.file", _("coser.config.web.properties.file.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "web.properties", String.class, false, false), - WEB_PROJECTS_DIRECTORY("coser.web.projects.directory", _("coser.config.web.projects.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webprojects", String.class, false, false), + WEB_INDICATORS_PROJECTS_DIRECTORY("coser.web.indicators.projects.directory", _("coser.config.web.indicators.projects.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webindicatorsprojects", String.class, false, false), + WEB_MAPS_PROJECTS_DIRECTORY("coser.web.maps.projects.directory", _("coser.config.web.maps.projects.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webmapsprojects", String.class, false, false), WEB_INDICATORS("coser.web.indicators.file", _("coser.config.web.indicators.file.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webindicators.csv", String.class, false, false), WEB_ZONES("coser.web.zones.file", _("coser.config.web.zones.file.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "webzones.csv", String.class, false, false), WEB_PUBLICATION_EMAIL("coser.web.newresult.emails", _("coser.config.web.newresult.emails.description"), null, String.class, false, false); Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-01-24 17:12:10 UTC (rev 560) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-01-24 17:13:16 UTC (rev 561) @@ -114,8 +114,9 @@ coser.config.validator.directory.description=Validation files directory location coser.config.web.frontend.description=Coser server url coser.config.web.indicators.file.description=Indicators match file +coser.config.web.indicators.projects.directory.description=Web indicators projects storage directory +coser.config.web.maps.projects.directory.description=Web maps projects storage directory coser.config.web.newresult.emails.description=New results notification receivers -coser.config.web.projects.directory.description=Web projects storage directory coser.config.web.properties.file.description=Web informations properties file coser.config.web.uploadurl.description=Coser server upload result url coser.config.web.zones.file.description=Zones match file Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-01-24 17:12:10 UTC (rev 560) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-01-24 17:13:16 UTC (rev 561) @@ -114,8 +114,9 @@ coser.config.validator.directory.description=Emplacement des fichiers de validations coser.config.web.frontend.description=Adresse du serveur web coser coser.config.web.indicators.file.description=Fichier de correspondance des indicateurs +coser.config.web.indicators.projects.directory.description=Dossier de stockage des projets indicateurs pour le Web +coser.config.web.maps.projects.directory.description=Dossier de stockage des projets cartes pour le Web coser.config.web.newresult.emails.description=Liste des destinataires des notifications de nouveaux r\u00E9sultats -coser.config.web.projects.directory.description=Dossier de stockage des projets pour le Web coser.config.web.properties.file.description=Fichier d'enregistrement des informations serveur coser.config.web.uploadurl.description=Adresse d'envoi des r\u00E9sultats coser.config.web.zones.file.description=Fichier de correspondance des zones Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-01-24 17:12:10 UTC (rev 560) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-01-24 17:13:16 UTC (rev 561) @@ -116,14 +116,14 @@ registerUploadedResult("/web/upload2.zip"); // some tests (from first) - assertFileNotExists(config.getWebProjectsDirectory() + "/projet1/selections/selection11/results/result111"); - assertFileExists(config.getWebProjectsDirectory() + "/projet1/selections/selection11/results/result112"); - assertFileNotExists(config.getWebProjectsDirectory() + "/projet1/selections/selection12"); - assertFileNotExists(config.getWebProjectsDirectory() + "/projet2"); + assertFileNotExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection11/results/result111"); + assertFileExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection11/results/result112"); + assertFileNotExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection12"); + assertFileNotExists(config.getWebIndicatorsProjectsDirectory() + "/projet2"); // some tests (from second) - assertFileExists(config.getWebProjectsDirectory() + "/projet1/selections/selection11/results/result113"); - assertFileExists(config.getWebProjectsDirectory() + "/projet1/selections/selection11/results/result114"); - assertFileExists(config.getWebProjectsDirectory() + "/projet3/selections/selection31/results/result311"); + assertFileExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection11/results/result113"); + assertFileExists(config.getWebIndicatorsProjectsDirectory() + "/projet1/selections/selection11/results/result114"); + assertFileExists(config.getWebIndicatorsProjectsDirectory() + "/projet3/selections/selection31/results/result311"); } /** Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2011-01-24 17:12:10 UTC (rev 560) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2011-01-24 17:13:16 UTC (rev 561) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as