branch develop updated (d3a1984 -> 6be3ada)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See http://git.nuiton.org/topia.git from d3a1984 fixes #3659: Use nuitonpom 1.8.2 new 6be3ada fixes #3660: Show migration error The 1 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 6be3ada002e2262300834b3dec9cd1ccb9c8fdf7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 22 13:49:22 2015 +0100 fixes #3660: Show migration error Summary of changes: .../nuiton/topia/migration/AbstractTopiaMigrationCallback.java | 8 +++++--- .../main/resources/i18n/topia-service-migration_en_GB.properties | 1 + .../main/resources/i18n/topia-service-migration_es_ES.properties | 1 + .../main/resources/i18n/topia-service-migration_fr_FR.properties | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit 6be3ada002e2262300834b3dec9cd1ccb9c8fdf7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Mar 22 13:49:22 2015 +0100 fixes #3660: Show migration error --- .../nuiton/topia/migration/AbstractTopiaMigrationCallback.java | 8 +++++--- .../main/resources/i18n/topia-service-migration_en_GB.properties | 1 + .../main/resources/i18n/topia-service-migration_es_ES.properties | 1 + .../main/resources/i18n/topia-service-migration_fr_FR.properties | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java b/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java index 52ab25f..3e788ec 100644 --- a/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java +++ b/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java @@ -97,7 +97,7 @@ public abstract class AbstractTopiaMigrationCallback { Version dbVersion, boolean showSql, boolean showProgression, - List<Version> versions) { + List<Version> versions) throws MigrationServiceException { boolean doMigrate = askUser(dbVersion, versions); if (!doMigrate) { @@ -127,7 +127,7 @@ public abstract class AbstractTopiaMigrationCallback { // rollback du travail en cours tx.rollbackTransaction(); // propagation de l'erreur - throw eee; + throw new MigrationServiceException(t("topia.migration.migration.failed", v), eee); } finally { // close database connexion if (tx != null) { @@ -135,7 +135,9 @@ public abstract class AbstractTopiaMigrationCallback { } } - } catch (Exception eee) { + } catch (MigrationServiceException eee) { + throw eee; + }catch (Exception eee) { log.error("Error lors de la tentative de migration", eee); doMigrate = false; // toute erreur arrête la mgration diff --git a/topia-service-migration/src/main/resources/i18n/topia-service-migration_en_GB.properties b/topia-service-migration/src/main/resources/i18n/topia-service-migration_en_GB.properties index 5e06f2a..668aece 100644 --- a/topia-service-migration/src/main/resources/i18n/topia-service-migration_en_GB.properties +++ b/topia-service-migration/src/main/resources/i18n/topia-service-migration_en_GB.properties @@ -3,6 +3,7 @@ topia.migration.db.not.versionned=Database version not found, so database schema topia.migration.detected.db.version=detected database version \: %1$s topia.migration.end.sql=Request [%1$-4s/%2$-4s] executed in %3$s. topia.migration.migrate.versions=Versions to apply \: %1$s +topia.migration.migration.failed=Fail to migrate to version %s topia.migration.migration.incomplete=Database migration not succesfully ended \! topia.migration.saving.db.version=Saving new database version \: %1$s topia.migration.skip.migration.db.is.empty=Database is empty, no migration needed. diff --git a/topia-service-migration/src/main/resources/i18n/topia-service-migration_es_ES.properties b/topia-service-migration/src/main/resources/i18n/topia-service-migration_es_ES.properties index edd110d..5a70cfe 100644 --- a/topia-service-migration/src/main/resources/i18n/topia-service-migration_es_ES.properties +++ b/topia-service-migration/src/main/resources/i18n/topia-service-migration_es_ES.properties @@ -3,6 +3,7 @@ topia.migration.db.not.versionned=La base de datos no tiene versión, se conside topia.migration.detected.db.version=Versión de la base \: %1$s topia.migration.end.sql=Consulta [%1$-4s/%2$-4s] ejecutada en %3$s. topia.migration.migrate.versions=Actualización para instalar \: %1$s +topia.migration.migration.failed=Fail to migrate to version % topia.migration.migration.incomplete=\\u00a1La migración de la base de datos ha fallado o se ha cancelado\! topia.migration.saving.db.version=Copia de seguridad de la nueva versión de la base \: %1$s topia.migration.skip.migration.db.is.empty=Base de datos vacía, no es necesaria la migración. diff --git a/topia-service-migration/src/main/resources/i18n/topia-service-migration_fr_FR.properties b/topia-service-migration/src/main/resources/i18n/topia-service-migration_fr_FR.properties index 294063a..c88cdc5 100644 --- a/topia-service-migration/src/main/resources/i18n/topia-service-migration_fr_FR.properties +++ b/topia-service-migration/src/main/resources/i18n/topia-service-migration_fr_FR.properties @@ -3,6 +3,7 @@ topia.migration.db.not.versionned=La base de données n'est pas versionnée, ell topia.migration.detected.db.version=Version de base détectée \: %1$s topia.migration.end.sql=Requête [%1$-4s/%2$-4s] exécutée en %3$s. topia.migration.migrate.versions=Mises à jour à installer \: %1$s +topia.migration.migration.failed=La migration de la version %s a échouée topia.migration.migration.incomplete=La migration de la base s'est mal déroulée ou a été annulée\! topia.migration.saving.db.version=Sauvegarde de la nouvelle version de la base \: %1$s topia.migration.skip.migration.db.is.empty=La base de données est vierge, aucune migration nécessaire. -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm