March 2012 - Wao-commits - mailman.cloud.codelutin.com

r1582 - in trunk: . wao-business wao-ui
by maven-release＠users.forge.codelutin.com 27 Mar '12

27 Mar '12

Author: maven-release Date: 2012-03-27 11:19:17 +0200 (Tue, 27 Mar 2012) New Revision: 1582 Url: http://forge.codelutin.com/repositories/revision/wao/1582 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-27 09:19:09 UTC (rev 1581) +++ trunk/pom.xml 2012-03-27 09:19:17 UTC (rev 1582) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> <modules> <module>wao-business</module> @@ -354,12 +354,12 @@ <scm> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.3 + scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.3 + scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/wao/tags/wao-3.3</url> + <url>http://forge.codelutin.com/repositories/browse/wao/trunk</url> </scm> <distributionManagement> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2012-03-27 09:19:09 UTC (rev 1581) +++ trunk/wao-business/pom.xml 2012-03-27 09:19:17 UTC (rev 1582) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2012-03-27 09:19:09 UTC (rev 1581) +++ trunk/wao-ui/pom.xml 2012-03-27 09:19:17 UTC (rev 1582) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1581 - in tags: . wao-3.3
by maven-release＠users.forge.codelutin.com 27 Mar '12

27 Mar '12

Author: maven-release Date: 2012-03-27 11:19:09 +0200 (Tue, 27 Mar 2012) New Revision: 1581 Url: http://forge.codelutin.com/repositories/revision/wao/1581 Log: [maven-release-plugin] copy for tag wao-3.3 Added: tags/wao-3.3/ Property changes on: tags/wao-3.3 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.idea target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

r1580 - in trunk: . wao-business wao-ui
by maven-release＠users.forge.codelutin.com 27 Mar '12

27 Mar '12

Author: maven-release Date: 2012-03-27 11:19:02 +0200 (Tue, 27 Mar 2012) New Revision: 1580 Url: http://forge.codelutin.com/repositories/revision/wao/1580 Log: [maven-release-plugin] prepare release wao-3.3 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-27 09:12:09 UTC (rev 1579) +++ trunk/pom.xml 2012-03-27 09:19:02 UTC (rev 1580) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3</version> <modules> <module>wao-business</module> @@ -354,12 +354,12 @@ <scm> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk + scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.3 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk + scm:svn:http://svn.forge.codelutin.com/svn/wao/tags/wao-3.3 </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/wao/trunk</url> + <url>http://forge.codelutin.com/repositories/browse/wao/tags/wao-3.3</url> </scm> <distributionManagement> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2012-03-27 09:12:09 UTC (rev 1579) +++ trunk/wao-business/pom.xml 2012-03-27 09:19:02 UTC (rev 1580) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2012-03-27 09:12:09 UTC (rev 1579) +++ trunk/wao-ui/pom.xml 2012-03-27 09:19:02 UTC (rev 1580) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1579 - trunk/wao-business
by bleny＠users.forge.codelutin.com 27 Mar '12

27 Mar '12

Author: bleny Date: 2012-03-27 11:12:09 +0200 (Tue, 27 Mar 2012) New Revision: 1579 Url: http://forge.codelutin.com/repositories/revision/wao/1579 Log: suite ?\195?\160 la t?\195?\162che #768 (Supprimer tout ce qui concerne les calendriers d'activit?\195?\169), la d?\195?\169pendance vers log4j est de trop Modified: trunk/wao-business/pom.xml Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2012-03-27 08:49:37 UTC (rev 1578) +++ trunk/wao-business/pom.xml 2012-03-27 09:12:09 UTC (rev 1579) @@ -64,10 +64,6 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency>  <dependency> <groupId>ical4j</groupId>

1 0

r1578 - trunk/wao-business/src/test/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com 27 Mar '12

27 Mar '12

Author: bleny Date: 2012-03-27 10:49:37 +0200 (Tue, 27 Mar 2012) New Revision: 1578 Url: http://forge.codelutin.com/repositories/revision/wao/1578 Log: suppression du couplage vers javacsv (nuiton-csv doit cache tout ?\195?\167a) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2012-03-27 08:27:48 UTC (rev 1577) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2012-03-27 08:49:37 UTC (rev 1578) @@ -21,7 +21,6 @@ package fr.ifremer.wao.service; -import com.csvreader.CsvReader; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.bean.ConnectedUser; @@ -103,8 +102,6 @@ protected Contact contactReference; @Mock protected ConnectedUser creator; - @Mock - protected CsvReader reader; protected void prepareData(boolean needBoat, boolean needObserver) throws TopiaException {

1 0

r1577 - in trunk/wao-business/src: main/java/fr/ifremer/wao/bean main/java/fr/ifremer/wao/entity main/java/fr/ifremer/wao/io/csv2/models main/java/fr/ifremer/wao/io/csv2/models/operations test/java/fr/ifremer/wao test/java/fr/ifremer/wao/io/csv2/models
by bleny＠users.forge.codelutin.com 27 Mar '12

27 Mar '12

Author: bleny Date: 2012-03-27 10:27:48 +0200 (Tue, 27 Mar 2012) New Revision: 1577 Url: http://forge.codelutin.com/repositories/revision/wao/1577 Log: ajout des ent?\195?\170tes de licence Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/WaoFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ShipOwnerDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/ObservedDataControlParserFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowCodeParserFormatter.java trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModelTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/WaoFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/WaoFilterImpl.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/WaoFilterImpl.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.bean; public abstract class WaoFilterImpl extends WaoFilter { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatDAOImpl.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoDAOHelper; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ObservedDataControl.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoUtils; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoQueryHelper; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ShipOwnerDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ShipOwnerDAOImpl.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ShipOwnerDAOImpl.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoQueryHelper; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionDAOImpl.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionDAOImpl.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import org.nuiton.topia.TopiaException; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2.models; import fr.ifremer.wao.bean.ObsProgram; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2.models.operations; import fr.ifremer.wao.entity.DCF5Code; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2.models.operations; import fr.ifremer.wao.WaoUtils; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/ObservedDataControlParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/ObservedDataControlParserFormatter.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/ObservedDataControlParserFormatter.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2.models.operations; import fr.ifremer.wao.entity.ObservedDataControl; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowCodeParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowCodeParserFormatter.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowCodeParserFormatter.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2.models.operations; import fr.ifremer.wao.WaoUtils; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao; import org.junit.Assert; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModelTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModelTest.java 2012-03-26 13:11:38 UTC (rev 1576) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModelTest.java 2012-03-27 08:27:48 UTC (rev 1577) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2.models; import org.junit.Assert;

1 0

r1576 - in trunk/wao-business/src/main/java/fr/ifremer/wao: entity service
by bleny＠users.forge.codelutin.com 26 Mar '12

26 Mar '12

Author: bleny Date: 2012-03-26 15:11:38 +0200 (Mon, 26 Mar 2012) New Revision: 1576 Url: http://forge.codelutin.com/repositories/revision/wao/1576 Log: #664 Passer la synth?\195?\168se sur un filtrage au niveau contacts : dans la premi?\195?\168re synth?\195?\168se on restreint l'affichage aux dates d?\195?\169finies dans les filtres Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2012-03-21 09:59:37 UTC (rev 1575) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2012-03-26 13:11:38 UTC (rev 1576) @@ -40,6 +40,7 @@ import fr.ifremer.wao.bean.PieChartDataImpl; import fr.ifremer.wao.bean.PieChartSeries; import fr.ifremer.wao.bean.PieChartSeriesImpl; +import org.apache.commons.lang3.Range; import org.apache.commons.lang3.time.DateUtils; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; @@ -349,19 +350,25 @@ .addEquals(query.getMainAlias() + "." + Contact.PROPERTY_VALIDATION_COMPANY, true) .addEquals(query.getMainAlias() + "." + Contact.PROPERTY_VALIDATION_PROGRAM, true); + Range<Date> range = Range.between(monthsPeriod.getFromDate(), monthsPeriod.getThruDate()); + for (Contact contact : findAllByQuery(query)) { Date month = DateUtils.truncate(contact.getObservationBeginDate(), Calendar.MONTH); - Integer count = actualObservationsMyMonths.get(month); + if (range.contains(month)) { - if (count == null) { - count = 0; - } + Integer count = actualObservationsMyMonths.get(month); - count += 1; + if (count == null) { + count = 0; + } - actualObservationsMyMonths.put(month, count); + count += 1; + + actualObservationsMyMonths.put(month, count); + + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-03-21 09:59:37 UTC (rev 1575) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowDAOImpl.java 2012-03-26 13:11:38 UTC (rev 1576) @@ -6,6 +6,7 @@ import fr.ifremer.wao.bean.ObservationType; import fr.ifremer.wao.bean.SamplingFilter; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.Range; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; @@ -229,10 +230,14 @@ List<Object[]> res = context.findByQuery(query); + Range<Date> range = Range.between(monthsPeriod.getFromDate(), monthsPeriod.getThruDate()); + for (Object[] line : res) { Date month = (Date)line[0]; - int expectedValue = ((Long) line[1]).intValue(); - expectedObservationsByMonths.put(month, expectedValue); + if (range.contains(month)) { + int expectedValue = ((Long) line[1]).intValue(); + expectedObservationsByMonths.put(month, expectedValue); + } } return expectedObservationsByMonths; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2012-03-21 09:59:37 UTC (rev 1575) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2012-03-26 13:11:38 UTC (rev 1576) @@ -111,16 +111,15 @@ TopiaContext transaction, ContactFilter filter) throws TopiaException { - PeriodDates monthsPeriod = new PeriodDates(filter.getPeriod().getFromDate(), filter.getPeriod().getThruDate()); - monthsPeriod.initDayOfMonthExtremities(); - filter.getSamplingFilter().setPeriod(monthsPeriod); - SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); ContactDAO contactDAO = WaoDAOHelper.getContactDAO(transaction); // Pour le calcul du programmé + PeriodDates monthsPeriod = new PeriodDates(filter.getPeriod().getFromDate(), filter.getPeriod().getThruDate()); + filter.getSamplingFilter().setPeriod(monthsPeriod); SortedMap<Date, Integer> expectedObservationsByMonths = dao.getExpectedObservationsByMonths(filter.getSamplingFilter()); + filter.getSamplingFilter().setPeriod(null); // Pour le calcul du réalisé SortedMap<Date, Integer> actualObservationsMyMonths =

1 0

r1575 - trunk
by bleny＠users.forge.codelutin.com 21 Mar '12

21 Mar '12

Author: bleny Date: 2012-03-21 10:59:37 +0100 (Wed, 21 Mar 2012) New Revision: 1575 Url: http://forge.codelutin.com/repositories/revision/wao/1575 Log: utilisation de mavenpom 3.2 (m?\195?\160j redmine) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-21 09:59:07 UTC (rev 1574) +++ trunk/pom.xml 2012-03-21 09:59:37 UTC (rev 1575) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.1.1</version> + <version>3.2</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r1574 - trunk/wao-business/src/main/xmi
by bleny＠users.forge.codelutin.com 21 Mar '12

21 Mar '12

Author: bleny Date: 2012-03-21 10:59:07 +0100 (Wed, 21 Mar 2012) New Revision: 1574 Url: http://forge.codelutin.com/repositories/revision/wao/1574 Log: activation de l'indexation des cl?\195?\169s ?\195?\169trang?\195?\168res Modified: trunk/wao-business/src/main/xmi/wao.properties Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2012-03-20 14:00:03 UTC (rev 1573) +++ trunk/wao-business/src/main/xmi/wao.properties 2012-03-21 09:59:07 UTC (rev 1574) @@ -27,7 +27,7 @@ model.tagValue.notGenerateToString=true model.tagValue.constantPrefix=PROPERTY_ model.tagValue.useEnumerationName=true -# model.tagValue.indexForeignKeys=true +model.tagValue.indexForeignKeys=true # model.tagValue.doNotGenerateBooleanGetMethods=true

1 0

r1573 - trunk
by bleny＠users.forge.codelutin.com 20 Mar '12

20 Mar '12

Author: bleny Date: 2012-03-20 15:00:03 +0100 (Tue, 20 Mar 2012) New Revision: 1573 Url: http://forge.codelutin.com/repositories/revision/wao/1573 Log: mise ?\195?\160 jour des d?\195?\169pendances Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-20 13:56:25 UTC (rev 1572) +++ trunk/pom.xml 2012-03-20 14:00:03 UTC (rev 1573) @@ -215,7 +215,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.164</version> + <version>1.3.165</version> </dependency> <dependency> <groupId>postgresql</groupId> @@ -340,7 +340,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonUtilsVersion>2.4.5</nuitonUtilsVersion> <nuitonWebVersion>1.10</nuitonWebVersion> - <topiaVersion>2.6.7</topiaVersion> + <topiaVersion>2.6.8</topiaVersion> <eugeneVersion>2.4.2</eugeneVersion> <tapestryVersion>5.2.5</tapestryVersion> <hibernateVersion>3.6.10.Final</hibernateVersion>

1 0