Author: kmorin Date: 2013-04-29 19:32:57 +0200 (Mon, 29 Apr 2013) New Revision: 887 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/887 Log: refs #2000 [TECH] Mettre en place les messages d'erreur m?\195?\169tier Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiDatabaseMetadata.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTableMetadata.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2013-04-29 17:16:30 UTC (rev 886) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2013-04-29 17:32:57 UTC (rev 887) @@ -29,6 +29,7 @@ import com.google.common.base.Predicates; import com.google.common.collect.Lists; import fr.ifremer.tutti.TuttiIOUtil; +import fr.ifremer.tutti.TuttiTechnicalException; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,6 +41,8 @@ import java.util.Enumeration; import java.util.List; +import static org.nuiton.i18n.I18n._; + /** * A class loader that search first in a given directory before in parent * class loader. @@ -179,9 +182,7 @@ directories.toArray(new File[directories.size()])); loader = URLClassLoader.newInstance(urls, null); } catch (IOException e) { - throw new RuntimeException( - "Could not convert directories " + directories - + " to url.", e); + throw new TuttiTechnicalException(_("tutti.persistence.loader.error", directories), e); } } return loader; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiDatabaseMetadata.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiDatabaseMetadata.java 2013-04-29 17:16:30 UTC (rev 886) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiDatabaseMetadata.java 2013-04-29 17:32:57 UTC (rev 887) @@ -27,6 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import fr.ifremer.tutti.TuttiTechnicalException; import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; import org.hibernate.mapping.Table; @@ -40,6 +41,8 @@ import java.util.Map; import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * Tutti database metadatas. * @@ -61,8 +64,7 @@ this.delegate = new DatabaseMetadata(connection, dialect, true); this.meta = connection.getMetaData(); } catch (SQLException e) { - throw new RuntimeException( - "Could not init database meta on connection " + connection, e); + throw new TuttiTechnicalException(_("tutti.persistence.dbMetadata.instanciation.error", connection), e); } tables = Maps.newTreeMap(); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTableMetadata.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTableMetadata.java 2013-04-29 17:16:30 UTC (rev 886) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/synchro/TuttiTableMetadata.java 2013-04-29 17:32:57 UTC (rev 887) @@ -28,6 +28,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import org.hibernate.mapping.ForeignKey; import org.hibernate.tool.hbm2ddl.ColumnMetadata; @@ -43,6 +44,8 @@ import java.util.Set; import java.util.SortedSet; +import static org.nuiton.i18n.I18n._; + /** * Overrides of the {@link TableMetadata} with some improvements: * <ul> @@ -124,7 +127,7 @@ this.existingPrimaryKeysQuery = String.format(QUERY_SELECT_PRIMARY_KEYS, Joiner.on(',').join(pkNames), getName()); this.countQuery = String.format(QUERY_SELECT_COUNT, getName()); } catch (Exception e) { - throw new RuntimeException("Could not init " + this, e); + throw new TuttiTechnicalException(_("tutti.persistence.tableMetadata.instanciation.error", this), e); } } Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-04-29 17:16:30 UTC (rev 886) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-04-29 17:32:57 UTC (rev 887) @@ -29,7 +29,11 @@ tutti.persistence.batch.validation.vracSpeciesNotFound= tutti.persistence.config.generateEnumFile.error= tutti.persistence.config.generateFile.error= +tutti.persistence.dbmetadata.instanciation.error= +tutti.persistence.dbmetadata.table.error= +tutti.persistence.loader.error= tutti.persistence.protocol.fromFile.error= +tutti.persistence.tableMetadata.instanciation.error= tutti.sampleCategoryType.age= tutti.sampleCategoryType.maturity= tutti.sampleCategoryType.sex= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-04-29 17:16:30 UTC (rev 886) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-04-29 17:32:57 UTC (rev 887) @@ -29,7 +29,10 @@ tutti.persistence.batch.validation.vracSpeciesNotFound=Lot 'Vrac > Espèces' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.config.generateEnumFile.error=Erreur lors de la génération du fichier d'énumération de la configuration de la base de données tutti.persistence.config.generateFile.error=Erreur lors de la génération du fichier de configuration de la base de données +tutti.persistence.dbMetadata.instanciation.error=Erreur lors de l'initialisation des metadata de la base de données par la connexion %s +tutti.persistence.loader.error=Erreur de conversion du dossier %s en URL tutti.persistence.protocol.fromFile.error=Erreur lors de l'import du protocol du fichier %s +tutti.persistence.tableMetadata.instanciation.error=Erreur à l'initialisation de %s tutti.sampleCategoryType.age=Age tutti.sampleCategoryType.maturity=Maturité tutti.sampleCategoryType.sex=Sexe