Author: bleny Date: 2011-03-25 13:05:05 +0000 (Fri, 25 Mar 2011) New Revision: 1095 Log: prepare release Added: trunk/src/announcement/release-email-2.1.1.txt Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java Added: trunk/src/announcement/release-email-2.1.1.txt =================================================================== --- trunk/src/announcement/release-email-2.1.1.txt (rev 0) +++ trunk/src/announcement/release-email-2.1.1.txt 2011-03-25 13:05:05 UTC (rev 1095) @@ -0,0 +1,21 @@ +La nouvelle version 2.1 de l'applicatif Wao est disponible ! + +Nouveautés : + +- [bleny] #2615 : Utiliser l'identifiant technique unique pour l'unicité d'un contact dans l'import/export CSV + +Corrections : + +- [bleny] #2638 : Impossible d'ajouter un contact commençant le dernier jour d'un mois + +Documentation : + +http://suiviobsmer.labs.libre-entreprise.org/wao/ + +Téléchargement : + +https://labs.libre-entreprise.org/frs/?group_id=154 + +Cordialement, + +L'équipe Wao Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-03-24 18:03:24 UTC (rev 1094) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-03-25 13:05:05 UTC (rev 1095) @@ -799,7 +799,7 @@ } @Override - protected void addTerrestrialDivisions_3_0(List<String> queries) { + protected void addTerrestrialDivisions_2_1_1(List<String> queries) { queries.add("CREATE TABLE TerrestrialDivision (" + "topiaId CHARACTER VARYING(255) PRIMARY KEY," + "topiaVersion BIGINT NOT NULL," + @@ -818,7 +818,7 @@ } @Override - protected void addObsDebToSampleRows_3_0(List<String> queries) { + protected void addObsDebToSampleRows_2_1_1(List<String> queries) { queries.add("ALTER TABLE SampleRow ADD day TIMESTAMP WITHOUT TIME ZONE;"); queries.add("ALTER TABLE SampleRow ADD groupName CHARACTER VARYING(255);"); queries.add("ALTER TABLE SampleRow ADD observationUnit CHARACTER VARYING(255);"); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2011-03-24 18:03:24 UTC (rev 1094) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2011-03-25 13:05:05 UTC (rev 1095) @@ -133,9 +133,9 @@ protected abstract void addCreationDateToContacts_2_1_1(List<String> queries); - protected abstract void addTerrestrialDivisions_3_0(List<String> queries); + protected abstract void addTerrestrialDivisions_2_1_1(List<String> queries); - protected abstract void addObsDebToSampleRows_3_0(List<String> queries); + protected abstract void addObsDebToSampleRows_2_1_1(List<String> queries); protected abstract void addAdminRolesToAdmin_3_0(TopiaContextImplementor tx, List<String> queries) throws TopiaException; @@ -481,6 +481,10 @@ addCreationDateToContacts_2_1_1(queries); + addTerrestrialDivisions_2_1_1(queries); + + addObsDebToSampleRows_2_1_1(queries); + String[] strings = queries.toArray(new String[queries.size()]); executeSQL(tx, showSql, showProgression, strings); } @@ -493,10 +497,6 @@ addAdminRolesToAdmin_3_0(tx, queries); - addTerrestrialDivisions_3_0(queries); - - addObsDebToSampleRows_3_0(queries); - String[] strings = queries.toArray(new String[queries.size()]); executeSQL(tx, showSql, showProgression, strings); }