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

r1639 - in tags: . wao-3.3.6
by maven-release＠users.forge.codelutin.com Jan. 14, 2013

Jan. 14, 2013

Author: maven-release Date: 2013-01-14 10:37:18 +0100 (Mon, 14 Jan 2013) New Revision: 1639 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1639 Log: [maven-release-plugin] copy for tag wao-3.3.6 Added: tags/wao-3.3.6/ Property changes on: tags/wao-3.3.6 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.idea target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

r1638 - in trunk: . wao-business wao-ui
by maven-release＠users.forge.codelutin.com Jan. 14, 2013

Jan. 14, 2013

Author: maven-release Date: 2013-01-14 10:37:09 +0100 (Mon, 14 Jan 2013) New Revision: 1638 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1638 Log: [maven-release-plugin] prepare release wao-3.3.6 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-11 16:35:03 UTC (rev 1637) +++ trunk/pom.xml 2013-01-14 09:37:09 UTC (rev 1638) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.6</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.6 </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.6 </developerConnection> - <url>http://forge.codelutin.com/repositories/browse/wao/trunk</url> + <url>http://forge.codelutin.com/repositories/browse/wao/tags/wao-3.3.6</url> </scm> <distributionManagement> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2013-01-11 16:35:03 UTC (rev 1637) +++ trunk/wao-business/pom.xml 2013-01-14 09:37:09 UTC (rev 1638) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.6</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2013-01-11 16:35:03 UTC (rev 1637) +++ trunk/wao-ui/pom.xml 2013-01-14 09:37:09 UTC (rev 1638) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.3.6-SNAPSHOT</version> + <version>3.3.6</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0

r1637 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com Jan. 11, 2013

Jan. 11, 2013

Author: bleny Date: 2013-01-11 17:35:03 +0100 (Fri, 11 Jan 2013) New Revision: 1637 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1637 Log: update file headers, trying to commit something Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoat.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatAbstract.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartography.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyAbstract.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChart.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContact.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactAbstract.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNews.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsAbstract.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferential.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialAbstract.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSampling.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingAbstract.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesis.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisAbstract.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUser.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserAbstract.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoat.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoat.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoat.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.BoatFilter; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatAbstract.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatAbstract.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatAbstract.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.BoatFilter; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartography.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartography.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartography.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.io.ImportResults; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyAbstract.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyAbstract.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyAbstract.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.io.ImportResults; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChart.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChart.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChart.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.bean.PieChartData; public interface ServiceChart { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContact.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContact.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContact.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactAbstract.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactAbstract.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactAbstract.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNews.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNews.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNews.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.entity.News; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsAbstract.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsAbstract.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsAbstract.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.entity.News; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferential.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferential.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferential.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ObsProgram; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialAbstract.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialAbstract.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialAbstract.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ContactState; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSampling.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSampling.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSampling.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingAbstract.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingAbstract.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingAbstract.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesis.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesis.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesis.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.BoardingResult; import fr.ifremer.wao.bean.ContactAverageReactivity; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisAbstract.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisAbstract.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisAbstract.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.BoardingResult; import fr.ifremer.wao.bean.ContactAverageReactivity; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUser.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUser.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUser.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserAbstract.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserAbstract.java 2013-01-09 14:35:16 UTC (rev 1636) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserAbstract.java 2013-01-11 16:35:03 UTC (rev 1637) @@ -1,5 +1,28 @@ package fr.ifremer.wao.service; +/* + * #%L + * Wao :: Business + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 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% + */ + import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ConnectedUser;

1 0

r1636 - trunk/wao-ui
by bleny＠users.forge.codelutin.com Jan. 9, 2013

Jan. 9, 2013

Author: bleny Date: 2013-01-09 15:35:16 +0100 (Wed, 09 Jan 2013) New Revision: 1636 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1636 Log: add redmine.releaseFiles property Modified: trunk/wao-ui/pom.xml Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2012-12-29 14:38:16 UTC (rev 1635) +++ trunk/wao-ui/pom.xml 2013-01-09 14:35:16 UTC (rev 1636) @@ -168,6 +168,7 @@ <properties> <deployFiles>target/${project.build.finalName}.war</deployFiles> + <redmine.releaseFiles>target/${project.build.finalName}.war</redmine.releaseFiles> </properties> <build>

1 0

r1635 - trunk
by tchemit＠users.forge.codelutin.com Dec. 29, 2012

Dec. 29, 2012

Author: tchemit Date: 2012-12-29 15:38:16 +0100 (Sat, 29 Dec 2012) New Revision: 1635 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1635 Log: updates mavenpom to 3.4.7 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-24 10:21:47 UTC (rev 1634) +++ trunk/pom.xml 2012-12-29 14:38:16 UTC (rev 1635) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.3</version> + <version>3.4.7</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r1634 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com Dec. 24, 2012

Dec. 24, 2012

Author: bleny Date: 2012-12-24 11:21:47 +0100 (Mon, 24 Dec 2012) New Revision: 1634 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1634 Log: fixes #1900 Dans la synth?\195?\168se sur le taux de r?\195?\169alisation, le calcul de l'indicateur est erron?\195?\169 Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 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-11-22 21:45:18 UTC (rev 1633) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2012-12-24 10:21:47 UTC (rev 1634) @@ -71,6 +71,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; +import java.util.TreeSet; /** * ServiceSynthesisImpl @@ -309,24 +310,23 @@ Pair<SortedMap<Date, Integer>, SortedMap<Date, Integer>> res = getDataSampling(filter); + PeriodDates monthsPeriod = new PeriodDates(filter.getPeriod().getFromDate(), filter.getPeriod().getThruDate()); + int totalNumberOfRealized = 0; int totalNumberOfPlanned = 0; - for (Map.Entry<Date, Integer> entry : res.getRight().entrySet()) { - // res.get(1) contains number of realized - // while res.get(0) contains planned + for (Date month : monthsPeriod.getMonths()) { - Date date = entry.getKey(); - // both variables will contains planned and realized at the same date - Integer numberOfPlanned = res.getLeft().get(date); - Integer numberOfRealized = entry.getValue(); + // both variables will contains planned and realized at the same month + Integer numberOfPlanned = res.getLeft().get(month); + Integer numberOfRealized = res.getRight().get(month); totalNumberOfPlanned += numberOfPlanned == null ? 0 : numberOfPlanned; totalNumberOfRealized += numberOfRealized == null ? 0 : numberOfRealized; if (log.isDebugEnabled()) { log.debug(String.format( - "at month %s:number of planed %s (%s), number of realized %s (%s)", - date, + "at month %s: number of planed %s (%s), number of realized %s (%s)", + month, numberOfPlanned, totalNumberOfPlanned, numberOfRealized, totalNumberOfRealized)); }

1 0

r1633 - in trunk/wao-business/src/test: java/fr/ifremer/wao/business/fixtures java/fr/ifremer/wao/service resources/import
by bleny＠users.forge.codelutin.com Nov. 22, 2012

Nov. 22, 2012

Author: bleny Date: 2012-11-22 22:45:18 +0100 (Thu, 22 Nov 2012) New Revision: 1633 Url: http://forge.codelutin.com/repositories/revision/wao/1633 Log: fix tests Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java trunk/wao-business/src/test/resources/import/echantillonnage.csv Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java 2012-11-22 21:10:18 UTC (rev 1632) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/business/fixtures/ObsMerFixtures.java 2012-11-22 21:45:18 UTC (rev 1633) @@ -96,6 +96,10 @@ return getWaoUser("jmichmuche", "mdp", "Jean", "Michmuche", tartanpion()); } + public WaoUser jacquesMichmuche() { + return getWaoUser("j.michmuche", "mdp", "Jacques", "Michmuche", tartanpion()); + } + public WaoUser billMurray() { return getWaoUser("BillMurray", "mdp", "Bill", "Murray", bis()); } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactTest.java 2012-11-22 21:10:18 UTC (rev 1632) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactTest.java 2012-11-22 21:45:18 UTC (rev 1633) @@ -85,7 +85,7 @@ Contact contact = obsMerFixtures.defaultContact(); WaoUser observer1 = obsMerFixtures.jeanMichmuche(); - WaoUser observer2 = obsMerFixtures.billMurray(); + WaoUser observer2 = obsMerFixtures.jacquesMichmuche(); contact.addSecondaryObservers(observer1); contact.addSecondaryObservers(observer2); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java 2012-11-22 21:10:18 UTC (rev 1632) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingTest.java 2012-11-22 21:45:18 UTC (rev 1633) @@ -154,6 +154,7 @@ } SampleRow row = serviceSampling.newSampleRow(obsMerFixtures.jeanMichmucheAsAdmin()); + row.setCompany(obsMerFixtures.homerSimpson().getCompany()); row.setCode("2010_03"); row.setNbObservants(3); row.setAverageTideTime(2.5); Modified: trunk/wao-business/src/test/resources/import/echantillonnage.csv =================================================================== --- trunk/wao-business/src/test/resources/import/echantillonnage.csv 2012-11-22 21:10:18 UTC (rev 1632) +++ trunk/wao-business/src/test/resources/import/echantillonnage.csv 2012-11-22 21:45:18 UTC (rev 1633) @@ -1,6 +1,6 @@ "PLAN_CODE";"SOCIETE_NOM";"PECHE_DIVISION";"PECHE_AUTRE";"METIER_CODE_DCF5";"METIER_MAILLAGE";"METIER_TAILLE";"METIER_AUTRE";"METIER_LIBELLE";"METIER_ESPECES";"PROGRAMME_CODE";"PROGRAMME_DEBUT";"PROGRAMME_FIN";"12/2009";"01/2010";"02/2010";"03/2010";"04/2010";"05/2010";"06/2010";"07/2010";"08/2010";"09/2010";"10/2010";"11/2010";"12/2010";"01/2011";"02/2011";"03/2011";"PLAN_DUREE_MOY";"PLAN_NB_OBSERV";"PLAN_COMMENT";"TAUX_COUVERTURE_APPLIQUE" "2010_M0001";"TARTANPION";"IId / I";;"DRB_ALG";;;;;;"MA-2009";"03/2010";"01/2011";;;;0;0;0;0;0;0;0;2;0;0;4;;;"1.5";1;"Un petit commentaire";5 -"2010_M0002";;"IId";;"DRH_CAT et DRH_CRU";;;;"Fileyage";"poissons tubes";"MANY";"01/2008";"12/2008";;20;0;0;21;0;0;21;0;0;21;0;0;;;;1;1;;5 +"2010_M0002";"TARTANPION";"IId";;"DRH_CAT et DRH_CRU";;;;"Fileyage";"poissons tubes";"MANY";"01/2008";"12/2008";;20;0;0;21;0;0;21;0;0;21;0;0;;;;1;1;;5 "2010_M0003";;"IId / IV";;"DRH";;;;"balottage en plein air";"divers choses visqueuses";"MA-2009";"03/2010";"01/2011";;;;0;22;0;0;25;0;0;21;0;0;25;;;2;1;;5 "2009_M0001";;"IId / IV";;"GTR_DEF et GNS_DEF";"110-119";;;"Fileyage à poissons tubes";"poissons plats";"PPP2010";"12/2009";"10/2010";0;1;1;1;2;1;1;1;1;1;2;;;;;;1;1;;5 "2009_M0002";;"IId";;"GTR_DEF et GNS_DEF";"9888-99";;;"Fileyage à sirènes ";"nymphes";"PPP2010";"12/2009";"10/2010";1;1;1;2;3;4;4;4;4;3;3;;;;;;1;1;;10

1 0

r1632 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.forge.codelutin.com Nov. 22, 2012

Nov. 22, 2012

Author: bleny Date: 2012-11-22 22:10:18 +0100 (Thu, 22 Nov 2012) New Revision: 1632 Url: http://forge.codelutin.com/repositories/revision/wao/1632 Log: fixes #1680 import des contacts, on verifie que tous les observateurs font bien parti de la societe indiquee dans le plan Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2012-11-22 20:53:53 UTC (rev 1631) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2012-11-22 21:10:18 UTC (rev 1632) @@ -248,6 +248,14 @@ message = "L'utilisateur référant ne doit pas se trouver aussi parmi les observateurs secondaires"; } + for (WaoUser observer : contact.getAllObservers()) { + boolean observerWorksForCompanyInSampleRow = observer.getCompany().equals(contact.getSampleRow().getCompany()); + if ( ! observerWorksForCompanyInSampleRow) { + success = false; + message = "L'observateur " + observer.getLogin() + " n'est pas membre de la société " + contact.getSampleRow().getCompany().getName(); + } + } + if (contact.getObsProgram() == ObsProgram.OBSDEB) { if (contact.getLandingDate() != null) {

1 0

r1631 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services
by bleny＠users.forge.codelutin.com Nov. 22, 2012

Nov. 22, 2012

Author: bleny Date: 2012-11-22 21:53:53 +0100 (Thu, 22 Nov 2012) New Revision: 1631 Url: http://forge.codelutin.com/repositories/revision/wao/1631 Log: refs #1680 dans les contacts on indique la societe associ?\195?\169e ?\195?\160 la ligne du plan plutot que la societe de l'observateur Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2012-11-22 20:31:12 UTC (rev 1630) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2012-11-22 20:53:53 UTC (rev 1631) @@ -219,7 +219,7 @@ return new ContactReaderPropertyConduit() { @Override public String getValue(Contact contact) { - return contact.getMainObserver().getCompany().getName(); + return contact.getSampleRow().getCompany().getName(); } }; }

1 0

r1630 - trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components
by bleny＠users.forge.codelutin.com Nov. 22, 2012

Nov. 22, 2012

Author: bleny Date: 2012-11-22 21:31:12 +0100 (Thu, 22 Nov 2012) New Revision: 1630 Url: http://forge.codelutin.com/repositories/revision/wao/1630 Log: fixes #1608 Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java 2012-11-22 19:48:26 UTC (rev 1629) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FilterComponent.java 2012-11-22 20:31:12 UTC (rev 1630) @@ -34,6 +34,7 @@ import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.ioc.annotations.Inject; +import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; import org.slf4j.Logger; @@ -173,6 +174,9 @@ period = ((SamplingFilter) getFilter()).getPeriod(); } else if (getFilter() instanceof ContactFilter) { period = ((ContactFilter) getFilter()).getPeriod(); + if (period != null) { + period.setThruDate(DateUtil.setMaxTimeOfDay(period.getThruDate())); + } } // if user entered a non-chronological time interval, invert it

1 0