Author: athimel Date: 2012-05-29 18:16:19 +0200 (Tue, 29 May 2012) New Revision: 2555 Url: http://nuiton.org/repositories/revision/topia/2555 Log: fixes #2088 remove i18n from ToPIA Removed: trunk/topia-service-migration/src/main/resources/i18n/ trunk/topia-service-replication/src/main/resources/i18n/ Modified: trunk/pom.xml trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java trunk/topia-service-migration/pom.xml trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java trunk/topia-service-security/pom.xml trunk/topia-tutorial/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/pom.xml 2012-05-29 16:16:19 UTC (rev 2555) @@ -79,9 +79,6 @@ <mockitoVersion>1.9.0</mockitoVersion> <geronimoJpaSpecVersion>1.1</geronimoJpaSpecVersion> - <!-- i18n configuration --> - <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> - </properties> <dependencyManagement> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2012-05-29 16:16:19 UTC (rev 2555) @@ -57,8 +57,6 @@ import java.util.SortedMap; import java.util.TreeMap; -import static org.nuiton.i18n.I18n._; - /** * Une classe avec des méthodes utiles sur les entités. * @@ -1160,7 +1158,7 @@ public static void checkSize(int size, Object[] params) { if (params.length != size) { throw new IllegalArgumentException( - _("topia.persistence.error.invalid.size", size, params.length)); + String.format("Invalid parameters size. Expected:%d but was:%d", size, params.length)); } } @@ -1171,13 +1169,13 @@ Object value = params[index]; if (value == null) { throw new IllegalArgumentException( - _("topia.persistence.error.null.param.in.array", index)); + String.format("The parameter at index %d must not be null", index)); } Class<?> foundType = value.getClass(); if (!requiredType.isAssignableFrom(foundType)) { throw new IllegalArgumentException( - _("topia.persistence.error.invalid.type.in.array", + String.format("The parameter at index %d is not the expected type. Expected:%s but was:%s", index, requiredType, foundType)); } } Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-service-migration/pom.xml 2012-05-29 16:16:19 UTC (rev 2555) @@ -64,11 +64,6 @@ </dependency> <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2012-05-29 16:16:19 UTC (rev 2555) @@ -38,8 +38,6 @@ import java.sql.SQLException; import java.util.List; -import static org.nuiton.i18n.I18n._; - /** * Abstract migration callback. * @@ -115,7 +113,7 @@ try { - log.info(_("topia.migration.start.migrate", v)); + log.info(String.format("Start migration to version %s", v)); migrateForVersion(v, tx, showSql, showProgression); Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2012-05-29 16:16:19 UTC (rev 2555) @@ -49,8 +49,6 @@ import java.util.SortedSet; import java.util.TreeSet; -import static org.nuiton.i18n.I18n._; - /** * Le moteur de migration proposé par topia. Il est basé sur un {@link AbstractTopiaMigrationCallback} * qui donne la version de l'application, les version de mises à jour disponibles. @@ -276,9 +274,9 @@ boolean complete = migrateSchema(); if (!complete) { if (log.isErrorEnabled()) { - log.error(_("topia.migration.migration.incomplete")); + log.error("Database migration failed !"); } - throw new TopiaException(_("topia.migration.migration.incomplete")); + throw new TopiaException("Database migration failed !"); } } @@ -295,10 +293,14 @@ Version version = callback.getApplicationVersion(); - log.info(_("topia.migration.start.migration", - version.getVersion(), - dbVersion.getVersion()) - ); + if (log.isInfoEnabled()) { + String message = String.format( + "Starting Topia Migration Service - " + + "Application version : %s, Database version : %s", + version.getVersion(), + dbVersion.getVersion()); + log.info(message); + } if (log.isDebugEnabled()) { log.debug("Migrate schema to version = " + dbVersion); @@ -315,7 +317,7 @@ if (versionTableExist && dbVersion.equals(version)) { if (log.isInfoEnabled()) { - log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + log.info("Database is up to date, no migration needed."); } // la base est a jour return true; @@ -323,7 +325,7 @@ // Aucune version existante, la base de données est vierge if (versionTableExist && dbNotVersioned && migrateOnInit) { - log.info(_("topia.migration.skip.migration.db.is.empty")); + log.info("Database is empty, no migration needed."); // la base est vierge, aucune migration nécessaire // mise à jour de la table tmsversion saveApplicationVersion(); @@ -335,7 +337,7 @@ // on a trouvee une table depreciee tmsVersion avec la bonne version de base // il suffit donc d'enregister la version dans la nouvelle table if (log.isInfoEnabled()) { - log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + log.info("Database is up to date, no migration needed."); } // la base est a jour mais il faut migrer la table saveApplicationVersion(); @@ -346,7 +348,7 @@ new TreeSet<Version>(new VersionComparator()); allVersions.addAll(Arrays.asList(callback.getAvailableVersions())); if (log.isInfoEnabled()) { - log.info(_("topia.migration.available.versions", allVersions)); + log.info(String.format("Available versions: %s", allVersions)); } // tell if migration is needed @@ -365,11 +367,11 @@ if (versionsToApply.isEmpty()) { if (log.isInfoEnabled()) { - log.info(_("topia.migration.skip.migration.no.version.to.apply")); + log.info("No version to apply, no migration needed."); } } else { if (log.isInfoEnabled()) { - log.info(_("topia.migration.migrate.versions", versionsToApply)); + log.info(String.format("Versions to apply : %s", versionsToApply)); } // perform the migration @@ -455,7 +457,7 @@ TMSVersionDAO.deleteAll(tx); if (log.isInfoEnabled()) { - log.info(_("topia.migration.saving.db.version", version)); + log.info(String.format("Saving new database version : %s", version)); } // create new version and store it in table @@ -558,9 +560,9 @@ // etre detenu en local v = Version.VZERO; dbNotVersioned = true; - log.info(_("topia.migration.db.not.versionned")); + log.info("Database version not found, so database schema is considered as V0"); } else { - log.info(_("topia.migration.detected.db.version", v)); + log.info(String.format("detected database version : %s", v)); } dbVersion = v; versionDetected = true; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java 2012-05-29 16:16:19 UTC (rev 2555) @@ -38,8 +38,6 @@ import java.util.Arrays; import java.util.Set; -import static org.nuiton.i18n.I18n._; - /** * Builder of {@link ReplicationModel}. * @@ -128,7 +126,7 @@ if (operation == null) { throw new IllegalArgumentException( - _("topia.replication.error.unkown.operation", + String.format("The operation %s is unknown, known operations are : %s", operationClass.getSimpleName(), Arrays.toString(getOperationProvider().getOperations())) ); @@ -137,7 +135,7 @@ ReplicationNode node = model.getNode(type); if (node == null) { throw new IllegalArgumentException( - _("topia.replication.error.unkown.owner.node", + String.format("The target node (of type %s) for operation %s is unknown, known nodes are : %s", type, operationClass.getSimpleName(), model.getNodes()) Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2012-05-29 16:16:19 UTC (rev 2555) @@ -43,8 +43,6 @@ import java.util.Collections; import java.util.List; -import static org.nuiton.i18n.I18n._; - /** * Pour attacher une association. * <p/> @@ -118,7 +116,7 @@ if (ownerIds == null || ownerIds.isEmpty()) { // pas de donnees a traiter - log.info(_("topia.replication.attachAssociation.nothing.to.do", + log.info(String.format("Nothing to attach for owner %s...", ownerOperator)); return; } Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java 2012-05-29 16:16:19 UTC (rev 2555) @@ -41,8 +41,6 @@ import java.util.List; -import static org.nuiton.i18n.I18n._; - /** * Pour charger une association sur le noeud de l'operation. * <p/> @@ -74,7 +72,7 @@ if (!ownerNode.equals(operationDef.getNode())) { throw new IllegalStateException( - _("topia.replication.error.operation.loadLink.illegalSource", + String.format("The source node of loading association requires the node %s, but was %s.", operationDef.getNode(), ownerNode)); } Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-service-security/pom.xml 2012-05-29 16:16:19 UTC (rev 2555) @@ -62,11 +62,6 @@ </dependency> <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> Modified: trunk/topia-tutorial/pom.xml =================================================================== --- trunk/topia-tutorial/pom.xml 2012-05-29 15:44:36 UTC (rev 2554) +++ trunk/topia-tutorial/pom.xml 2012-05-29 16:16:19 UTC (rev 2555) @@ -34,11 +34,6 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> - - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> <dependency> <groupId>org.slf4j</groupId>