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 83842edae16279f958c62a71a9316254b79ca89d 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 8442d68..8d9da57 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 64ff244..8650cf9 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 f993c14..f91c6b9 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>.