branch feature/6944 updated (734d720 -> 1859e26)
This is an automated email from the git hooks/post-receive script. New change to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git from 734d720 fix zoom new 6395c16 refs #6944 Déplacement des resources pour en faire un zip à intégrer dans le class-path new 628da48 refs #6944 creation de la resources sur la partie catographie dans le build new 1859e26 refs #6944 copie des resources de cartographie The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1859e267e5d86a8802d9a933ebd184bb3fd348a9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 20 19:49:39 2015 +0200 refs #6944 copie des resources de cartographie commit 628da48a0691f154eca34d245486f097e8a44416 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 20 19:42:46 2015 +0200 refs #6944 creation de la resources sur la partie catographie dans le build commit 6395c16aa62ef227b65aafb7cb4b42635133b425 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 20 19:41:54 2015 +0200 refs #6944 Déplacement des resources pour en faire un zip à intégrer dans le class-path Summary of changes: .../main/java/fr/ird/observe/IObserveConfig.java | 2 ++ observe-swing/pom.xml | 22 ++++++++++++++++++ observe-swing/src/main/assembly/map.xml | 20 +++++++++++++++++ .../java/fr/ird/observe/ObserveConfigOption.java | 11 +++++++++ .../fr/ird/observe/ObserveResourceManager.java | 25 ++++++++++++++++----- .../main/java/fr/ird/observe/ObserveRunner.java | 9 +++++--- .../map/shapeFiles/borders/WDBII_border_l_L1.dbf | Bin .../map/shapeFiles/borders/WDBII_border_l_L1.prj | 0 .../map/shapeFiles/borders/WDBII_border_l_L1.shp | Bin .../map/shapeFiles/borders/WDBII_border_l_L1.shx | Bin .../map/shapeFiles/continents/GSHHS_l_L1.dbf | Bin .../map/shapeFiles/continents/GSHHS_l_L1.prj | 0 .../map/shapeFiles/continents/GSHHS_l_L1.shp | Bin .../map/shapeFiles/continents/GSHHS_l_L1.shx | Bin .../map/shapeFiles/continents/GSHHS_l_L6.dbf | Bin .../map/shapeFiles/continents/GSHHS_l_L6.prj | 0 .../map/shapeFiles/continents/GSHHS_l_L6.shp | Bin .../map/shapeFiles/continents/GSHHS_l_L6.shx | Bin .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf | Bin .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj | 0 .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp | Bin .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.dbf | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.prj | 0 .../map/shapeFiles/zee/World_EEZ_v8_2014.sbn | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.sbx | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.shp | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml | 0 .../map/shapeFiles/zee/World_EEZ_v8_2014.shx | Bin .../src/main/{resources => }/map/style.xml | 0 .../resources/i18n/observe-swing_en_GB.properties | 2 ++ .../resources/i18n/observe-swing_es_ES.properties | 2 ++ .../resources/i18n/observe-swing_fr_FR.properties | 2 ++ 33 files changed, 87 insertions(+), 8 deletions(-) create mode 100644 observe-swing/src/main/assembly/map.xml rename observe-swing/src/main/{resources => }/map/shapeFiles/borders/WDBII_border_l_L1.dbf (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/borders/WDBII_border_l_L1.prj (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/borders/WDBII_border_l_L1.shp (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/borders/WDBII_border_l_L1.shx (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L1.dbf (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L1.prj (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L1.shp (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L1.shx (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L6.dbf (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L6.prj (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L6.shp (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/continents/GSHHS_l_L6.shx (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/zee/World_EEZ_v8_2014.dbf (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/zee/World_EEZ_v8_2014.prj (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/zee/World_EEZ_v8_2014.sbn (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/zee/World_EEZ_v8_2014.sbx (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/zee/World_EEZ_v8_2014.shp (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml (100%) rename observe-swing/src/main/{resources => }/map/shapeFiles/zee/World_EEZ_v8_2014.shx (100%) rename observe-swing/src/main/{resources => }/map/style.xml (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit 6395c16aa62ef227b65aafb7cb4b42635133b425 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 20 19:41:54 2015 +0200 refs #6944 Déplacement des resources pour en faire un zip à intégrer dans le class-path --- .../map/shapeFiles/borders/WDBII_border_l_L1.dbf | Bin .../map/shapeFiles/borders/WDBII_border_l_L1.prj | 0 .../map/shapeFiles/borders/WDBII_border_l_L1.shp | Bin .../map/shapeFiles/borders/WDBII_border_l_L1.shx | Bin .../map/shapeFiles/continents/GSHHS_l_L1.dbf | Bin .../map/shapeFiles/continents/GSHHS_l_L1.prj | 0 .../map/shapeFiles/continents/GSHHS_l_L1.shp | Bin .../map/shapeFiles/continents/GSHHS_l_L1.shx | Bin .../map/shapeFiles/continents/GSHHS_l_L6.dbf | Bin .../map/shapeFiles/continents/GSHHS_l_L6.prj | 0 .../map/shapeFiles/continents/GSHHS_l_L6.shp | Bin .../map/shapeFiles/continents/GSHHS_l_L6.shx | Bin .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf | Bin .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj | 0 .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp | Bin .../map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.dbf | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.prj | 0 .../map/shapeFiles/zee/World_EEZ_v8_2014.sbn | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.sbx | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.shp | Bin .../map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml | 0 .../map/shapeFiles/zee/World_EEZ_v8_2014.shx | Bin observe-swing/src/main/{resources => }/map/style.xml | 0 .../src/main/resources/i18n/observe-swing_en_GB.properties | 2 ++ .../src/main/resources/i18n/observe-swing_es_ES.properties | 2 ++ .../src/main/resources/i18n/observe-swing_fr_FR.properties | 2 ++ 27 files changed, 6 insertions(+) diff --git a/observe-swing/src/main/resources/map/shapeFiles/borders/WDBII_border_l_L1.dbf b/observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.dbf similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/borders/WDBII_border_l_L1.dbf rename to observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.dbf diff --git a/observe-swing/src/main/resources/map/shapeFiles/borders/WDBII_border_l_L1.prj b/observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.prj similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/borders/WDBII_border_l_L1.prj rename to observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.prj diff --git a/observe-swing/src/main/resources/map/shapeFiles/borders/WDBII_border_l_L1.shp b/observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shp similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/borders/WDBII_border_l_L1.shp rename to observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shp diff --git a/observe-swing/src/main/resources/map/shapeFiles/borders/WDBII_border_l_L1.shx b/observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shx similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/borders/WDBII_border_l_L1.shx rename to observe-swing/src/main/map/shapeFiles/borders/WDBII_border_l_L1.shx diff --git a/observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L1.dbf b/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.dbf similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L1.dbf rename to observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.dbf diff --git a/observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L1.prj b/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.prj similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L1.prj rename to observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.prj diff --git a/observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L1.shp b/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shp similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L1.shp rename to observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shp diff --git a/observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L1.shx b/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shx similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L1.shx rename to observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L1.shx diff --git a/observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L6.dbf b/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.dbf similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L6.dbf rename to observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.dbf diff --git a/observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L6.prj b/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.prj similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L6.prj rename to observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.prj diff --git a/observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L6.shp b/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shp similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L6.shp rename to observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shp diff --git a/observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L6.shx b/observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shx similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/continents/GSHHS_l_L6.shx rename to observe-swing/src/main/map/shapeFiles/continents/GSHHS_l_L6.shx diff --git a/observe-swing/src/main/resources/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf b/observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf rename to observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.dbf diff --git a/observe-swing/src/main/resources/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj b/observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj rename to observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.prj diff --git a/observe-swing/src/main/resources/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp b/observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp rename to observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shp diff --git a/observe-swing/src/main/resources/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx b/observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx rename to observe-swing/src/main/map/shapeFiles/lakesAndSeas/GSHHS_l_L2.shx diff --git a/observe-swing/src/main/resources/map/shapeFiles/zee/World_EEZ_v8_2014.dbf b/observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/zee/World_EEZ_v8_2014.dbf rename to observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.dbf diff --git a/observe-swing/src/main/resources/map/shapeFiles/zee/World_EEZ_v8_2014.prj b/observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/zee/World_EEZ_v8_2014.prj rename to observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.prj diff --git a/observe-swing/src/main/resources/map/shapeFiles/zee/World_EEZ_v8_2014.sbn b/observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/zee/World_EEZ_v8_2014.sbn rename to observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbn diff --git a/observe-swing/src/main/resources/map/shapeFiles/zee/World_EEZ_v8_2014.sbx b/observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/zee/World_EEZ_v8_2014.sbx rename to observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.sbx diff --git a/observe-swing/src/main/resources/map/shapeFiles/zee/World_EEZ_v8_2014.shp b/observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/zee/World_EEZ_v8_2014.shp rename to observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp diff --git a/observe-swing/src/main/resources/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml b/observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml rename to observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml diff --git a/observe-swing/src/main/resources/map/shapeFiles/zee/World_EEZ_v8_2014.shx b/observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx similarity index 100% rename from observe-swing/src/main/resources/map/shapeFiles/zee/World_EEZ_v8_2014.shx rename to observe-swing/src/main/map/shapeFiles/zee/World_EEZ_v8_2014.shx diff --git a/observe-swing/src/main/resources/map/style.xml b/observe-swing/src/main/map/style.xml similarity index 100% rename from observe-swing/src/main/resources/map/style.xml rename to observe-swing/src/main/map/style.xml diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties index cb46acf..be9bfb3 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties @@ -950,6 +950,7 @@ observe.config.defaultGpsMaxSpeed=Maximum speed observe.config.defaultI18nDirectory.description=Default i18n directory where to store i18n resources observe.config.defaultInitialDbDump.description=Default location of initial database observe.config.defaultLocalDbDirectory.description=Default directory where to store local data source +observe.config.defaultMapDirectory.description= observe.config.defaultReportDirectory.description=Default directory where to store report definition files observe.config.defaultResourcesDirectory.description=Default user resources directory observe.config.defaultTmpDirectory.description=Default temporary directory used by application and clean at each launch. @@ -1407,6 +1408,7 @@ observe.routes.title=Routes observe.runner.config.loaded= observe.runner.config.migrate.file= observe.runner.context.loaded= +observe.runner.copy.default.map.file= observe.runner.copy.default.report.file= observe.runner.copy.default.ui.file= observe.runner.create.directory= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties index 776d3e9..8a8a625 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties @@ -950,6 +950,7 @@ observe.config.defaultGpsMaxSpeed=Velocidad máxima por defecto entre 2 puntos p observe.config.defaultI18nDirectory.description=Directorio por defecto de recursos de traducción de la aplicación observe.config.defaultInitialDbDump.description=Base empotrada creada durante la primera importación de una base remota observe.config.defaultLocalDbDirectory.description=Directorio de almacenamiento de la base local +observe.config.defaultMapDirectory.description= observe.config.defaultReportDirectory.description=Directorio por defecto de los informes de la aplicación observe.config.defaultResourcesDirectory.description=Directorio de almacenamiento de los recursos de usuario como las traducciones o la consultas de informes observe.config.defaultTmpDirectory.description=Directorio temporal por defecto @@ -1407,6 +1408,7 @@ observe.routes.title= observe.runner.config.loaded=Configuración de Observe v. %1$s cargada. observe.runner.config.migrate.file=El fichero de configuración %1$s ha sido reemplazado por \n%2$s\nvers\n%3$s observe.runner.context.loaded=Finlazada la inicialización del contexto en %1$s. +observe.runner.copy.default.map.file= observe.runner.copy.default.report.file=Creación del archivo de informes %1$s. observe.runner.copy.default.ui.file=Creación del archivo de - Création du fichier de cosmétique %1$s. observe.runner.create.directory=Creación del directorio %1$s diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index 58bd292..3fb9d33 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -950,6 +950,7 @@ observe.config.defaultGpsMaxSpeed=La vitesse maximum par défaut en tre dexu poi observe.config.defaultI18nDirectory.description=Répertoire par défault des resources de traduction de l'application observe.config.defaultInitialDbDump.description=La base embarquée créee lors de le premier import d'une base distante. observe.config.defaultLocalDbDirectory.description=Le répertoire où est stockée la base locale. +observe.config.defaultMapDirectory.description= observe.config.defaultReportDirectory.description=Répertoire par défaut des rapports de l'application observe.config.defaultResourcesDirectory.description=Le répertoire où sont stockées les resources de l'utilisateur comme les traductions ou les requètes de rapports. observe.config.defaultTmpDirectory.description=Le répertoire temporaire par défaut @@ -1405,6 +1406,7 @@ observe.routes.title=Routes observe.runner.config.loaded=Configuration d'ObServe v. %1$s chargée. observe.runner.config.migrate.file=Le fichier de configuration %1$s a été déplacée de \n%2$s\nvers\n%3$s observe.runner.context.loaded=Initialisation du contexte terminée en %1$s. +observe.runner.copy.default.map.file= observe.runner.copy.default.report.file=Création du fichier de reports %1$s. observe.runner.copy.default.ui.file=Création du fichier de cosmétique %1$s. observe.runner.create.directory=Création du répertoire %1$s -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit 628da48a0691f154eca34d245486f097e8a44416 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 20 19:42:46 2015 +0200 refs #6944 creation de la resources sur la partie catographie dans le build --- observe-swing/pom.xml | 22 ++++++++++++++++++++++ observe-swing/src/main/assembly/map.xml | 20 ++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 20155d8..83abcb5 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -405,6 +405,28 @@ </executions> </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/map.xml</descriptor> + </descriptors> + <attach>false</attach> + <finalName>map</finalName> + <appendAssemblyId>false</appendAssemblyId> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + </configuration> + <executions> + <execution> + <id>create-assemblies</id> + <phase>process-resources</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> diff --git a/observe-swing/src/main/assembly/map.xml b/observe-swing/src/main/assembly/map.xml new file mode 100644 index 0000000..f03fb54 --- /dev/null +++ b/observe-swing/src/main/assembly/map.xml @@ -0,0 +1,20 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>maps</id> + <formats> + <format>zip</format> + </formats> + + <fileSets> + + <fileSet> + <directory>src/main/map</directory> + <outputDirectory/> + <fileMode>0755</fileMode> + <includes> + <include>**/*</include> + </includes> + </fileSet> + + </fileSets> +</assembly> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit 1859e267e5d86a8802d9a933ebd184bb3fd348a9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 20 19:49:39 2015 +0200 refs #6944 copie des resources de cartographie --- .../main/java/fr/ird/observe/IObserveConfig.java | 2 ++ .../java/fr/ird/observe/ObserveConfigOption.java | 11 ++++++++++ .../fr/ird/observe/ObserveResourceManager.java | 25 +++++++++++++++++----- .../main/java/fr/ird/observe/ObserveRunner.java | 9 +++++--- 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java b/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java index c002ee5..5d9dc7a 100644 --- a/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java +++ b/observe-business/src/main/java/fr/ird/observe/IObserveConfig.java @@ -155,6 +155,8 @@ public interface IObserveConfig { String PROPERTY_REPORT_DIRECTORY = "reportDirectory"; + String PROPERTY_MAP_DIRECTORY = "mapDirectory"; + String PROPERTY_TMP_DIRECTORY = "tmpDirectory"; String PROPERTY_DISPLAY_MAIN_UI = "displayMainUI"; diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveConfigOption.java b/observe-swing/src/main/java/fr/ird/observe/ObserveConfigOption.java index c89cd3a..764b913 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ObserveConfigOption.java +++ b/observe-swing/src/main/java/fr/ird/observe/ObserveConfigOption.java @@ -142,6 +142,17 @@ public enum ObserveConfigOption implements ConfigOptionDef { false ), + /** le repertoire ou sont stockees les cartes de l'utilisateur */ + MAP_DIRECTORY( + "map.directory", + IObserveConfig.PROPERTY_MAP_DIRECTORY, + n("observe.config.defaultMapDirectory.description"), + "${resources.directory}/map", + File.class, + false, + false + ), + /** le repertoire ou sont stockees les reports de validation de l'utilisateur */ VALIDATION_REPORT_DIRECTORY( "validation.report.directory", diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java b/observe-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java index b6f8403..95c955f 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java +++ b/observe-swing/src/main/java/fr/ird/observe/ObserveResourceManager.java @@ -25,6 +25,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.SortedProperties; +import org.nuiton.util.ZipUtil; import java.io.BufferedInputStream; import java.io.File; @@ -61,8 +62,8 @@ public class ObserveResourceManager { public static final String OBSERVE_MAP_BACKGROUND = "/shapefiles/backgroundes/background.shp"; - public static final String OBSERVE_MAP_LAYERS = - "/shapeFiles"; + public static final String OBSERVE_MAP_ARCHIVE = + "/map.zip"; /** Logger */ static private Log log = LogFactory.getLog(ObserveResourceManager.class); @@ -72,7 +73,7 @@ public class ObserveResourceManager { ui(OBSERVE_UI_PROPERTIES), application(OBSERVE_APPLICATION_PROPERTIES), report(OBSERVE_REPORTS_PROPERTIES), - mapLayers(OBSERVE_MAP_LAYERS); + mapLayers(OBSERVE_MAP_ARCHIVE); private final String location; @@ -103,7 +104,6 @@ public class ObserveResourceManager { protected Map<String, Properties> resources; - public Map<String, Properties> getResources() { if (resources == null) { resources = new TreeMap<String, Properties>(); @@ -111,6 +111,7 @@ public class ObserveResourceManager { return resources; } + public Properties getResource(Resource resource) throws IOException { URL url = resource.getUrl(); @@ -118,7 +119,6 @@ public class ObserveResourceManager { return result; } - public Properties getResource(File file) throws IOException { URL url = file.toURI().toURL(); @@ -128,6 +128,7 @@ public class ObserveResourceManager { return result; } + public Properties getResource(URL url) throws IOException { String path = url.toString(); @@ -309,4 +310,18 @@ public class ObserveResourceManager { } } + public File unzipToDirectory(Resource resource, ObserveConfig config, ObserveConfigOption option, String message) throws IOException { + + File dir = config.getOptionAsFile(option.key); + createDirectory(dir); + InputStream inputStream = openInternalStream(resource.getUrl()); + try { + ZipUtil.uncompress(inputStream, dir); + return dir; + } finally { + inputStream.close(); + + } + } + } diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java b/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java index 432f4a2..68a2118 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java +++ b/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java @@ -60,6 +60,7 @@ import static fr.ird.observe.ObserveConfigOption.DATA_DIRECTORY; import static fr.ird.observe.ObserveConfigOption.DB_DIRECTORY; import static fr.ird.observe.ObserveConfigOption.INITIAL_DB_DUMP; import static fr.ird.observe.ObserveConfigOption.REPORT_DIRECTORY; +import static fr.ird.observe.ObserveConfigOption.MAP_DIRECTORY; import static fr.ird.observe.ObserveConfigOption.RESOURCES_DIRECTORY; import static fr.ird.observe.ObserveConfigOption.TMP_DIRECTORY; import static fr.ird.observe.ObserveConfigOption.VALIDATION_REPORT_DIRECTORY; @@ -461,9 +462,11 @@ public abstract class ObserveRunner extends ApplicationRunner { // 9 - resources shapeFiles -// String message = t("observe.runner.copy.default.report.file", eezShapeFile); -// -// resourceManager.copyDirectory(Resource.mapLayers, config, RESOURCES_DIRECTORY, massage); + File mapdirectory = resourceManager.createDirectory(config, MAP_DIRECTORY); + + String message = t("observe.runner.copy.default.map.file", mapdirectory); + + resourceManager.unzipToDirectory(Resource.mapLayers, config, RESOURCES_DIRECTORY, message); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm