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

[Suiviobsmer-commits] r1103 - in trunk/wao-business/src: main/java/fr/ifremer/wao/service main/resources/i18n main/xmi test/java/fr/ifremer/wao
by bleny＠users.labs.libre-entreprise.org 28 Mar '11

28 Mar '11

Author: bleny Date: 2011-03-28 13:04:38 +0000 (Mon, 28 Mar 2011) New Revision: 1103 Log: add main fonctionnal test for ObsDeb Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-25 14:35:21 UTC (rev 1102) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-28 13:04:38 UTC (rev 1103) @@ -40,6 +40,7 @@ import fr.ifremer.wao.bean.FacadeRowImpl; import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.SamplingFilterImpl; import fr.ifremer.wao.bean.SamplingFilterValues; import fr.ifremer.wao.bean.SamplingFilterValuesImpl; import fr.ifremer.wao.bean.SamplingStrategy; @@ -1365,4 +1366,11 @@ return result; } + + @Override + protected SamplingFilter executeNewSamplingFilter(TopiaContext transaction, ConnectedUser connectedUser) { + SamplingFilter samplingFilter = new SamplingFilterImpl(); + samplingFilter.setObsProgram(connectedUser.getProfile().getObsProgram()); + return samplingFilter; + } } Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-03-25 14:35:21 UTC (rev 1102) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-03-28 13:04:38 UTC (rev 1103) @@ -206,6 +206,7 @@ wao.error.serviceSampling.getSampleRowsByFilter= wao.error.serviceSampling.getSampleRowsOrderedByFishingZone= wao.error.serviceSampling.importSamplingPlanCsv= +wao.error.serviceSampling.newSamplingFilter= wao.error.serviceSynthesis.getAllIndicatorLogs= wao.error.serviceSynthesis.getBoardingBoats= wao.error.serviceSynthesis.getComplianceBoardingIndicator= Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-03-25 14:35:21 UTC (rev 1102) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-03-28 13:04:38 UTC (rev 1103) @@ -206,6 +206,7 @@ wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00E0 la ligne %1$d [CODE \= %2$s] +wao.error.serviceSampling.newSamplingFilter= wao.error.serviceSynthesis.getAllIndicatorLogs= wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es du graphique concernant les embarquements sur les navires wao.error.serviceSynthesis.getComplianceBoardingIndicator= Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2011-03-25 14:35:21 UTC (rev 1102) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2011-03-28 13:04:38 UTC (rev 1103) @@ -61,10 +61,6 @@ private WaoContextImpl context; - public TestManager() { - - } - public void start() throws WaoException { if (log.isDebugEnabled()) { log.debug("## TEST START");

1 0

[Suiviobsmer-commits] r1102 - in trunk: . wao-business wao-ui
by tchemit＠users.labs.libre-entreprise.org 25 Mar '11

25 Mar '11

Author: tchemit Date: 2011-03-25 14:35:21 +0000 (Fri, 25 Mar 2011) New Revision: 1102 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 2011-03-25 14:35:19 UTC (rev 1101) +++ trunk/pom.xml 2011-03-25 14:35:21 UTC (rev 1102) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.1</version> + <version>3.0-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -329,12 +329,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.1 + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.1 + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.1?root=suiviob… + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-03-25 14:35:19 UTC (rev 1101) +++ trunk/wao-business/pom.xml 2011-03-25 14:35:21 UTC (rev 1102) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.1</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -235,8 +235,10 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.1/?root=suivio… + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… </url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-03-25 14:35:19 UTC (rev 1101) +++ trunk/wao-ui/pom.xml 2011-03-25 14:35:21 UTC (rev 1102) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.1</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -310,8 +310,10 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.1/?root=suivio… + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… </url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r1101 - in tags: . wao-2.1.1
by tchemit＠users.labs.libre-entreprise.org 25 Mar '11

25 Mar '11

Author: tchemit Date: 2011-03-25 14:35:19 +0000 (Fri, 25 Mar 2011) New Revision: 1101 Log: [maven-release-plugin] copy for tag wao-2.1.1 Added: tags/wao-2.1.1/ Property changes on: tags/wao-2.1.1 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.idea target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

[Suiviobsmer-commits] r1100 - in trunk: . wao-business wao-ui
by tchemit＠users.labs.libre-entreprise.org 25 Mar '11

25 Mar '11

Author: tchemit Date: 2011-03-25 14:07:15 +0000 (Fri, 25 Mar 2011) New Revision: 1100 Log: [maven-release-plugin] prepare release wao-2.1.1 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-25 14:01:01 UTC (rev 1099) +++ trunk/pom.xml 2011-03-25 14:07:15 UTC (rev 1100) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> <modules> <module>wao-ui</module> @@ -329,12 +329,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.1 </connection> <developerConnection> - scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.1.1 </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.1?root=suiviob… </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-03-25 14:01:01 UTC (rev 1099) +++ trunk/wao-business/pom.xml 2011-03-25 14:07:15 UTC (rev 1100) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -235,7 +235,7 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.1/?root=suivio… </url> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-03-25 14:01:01 UTC (rev 1099) +++ trunk/wao-ui/pom.xml 2011-03-25 14:07:15 UTC (rev 1100) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -310,7 +310,7 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.1.1/?root=suivio… </url> </scm>

1 0

[Suiviobsmer-commits] r1099 - in trunk: wao-business wao-ui/src/main/java/fr/ifremer/wao/ui/base
by bleny＠users.labs.libre-entreprise.org 25 Mar '11

25 Mar '11

Author: bleny Date: 2011-03-25 14:01:01 +0000 (Fri, 25 Mar 2011) New Revision: 1099 Log: remove use of commons logging, update dependencies uses in child pom Modified: trunk/wao-business/pom.xml trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-03-25 13:48:53 UTC (rev 1098) +++ trunk/wao-business/pom.xml 2011-03-25 14:01:01 UTC (rev 1099) @@ -38,6 +38,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency>  <dependency> @@ -88,6 +92,7 @@ <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.nuiton.topia</groupId> Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java 2011-03-25 13:48:53 UTC (rev 1098) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java 2011-03-25 14:01:01 UTC (rev 1099) @@ -27,8 +27,8 @@ import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterValues; import fr.ifremer.wao.service.ServiceSampling; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author sletellier <letellier at codelutin.com> @@ -38,7 +38,7 @@ /** * Logger. */ - private static final Log log = LogFactory.getLog(FilterManager.class); + private static final Logger log = LoggerFactory.getLogger(FilterManager.class); protected ConnectedUser user;

1 0

[Suiviobsmer-commits] r1098 - in trunk: wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/io/csv2 wao-business/src/main/java/fr/ifremer/wao/io/csv2/models wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations wao-business/src/test/java/fr/ifremer/wao/entity wao-business/src/test/java/fr/ifremer/wao/io/csv2 wao-ui/src/main/java/fr/ifremer/wao/ui/base wao-ui/src/main/java/fr/ifremer/wao/ui/components wao-ui/s
by bleny＠users.labs.libre-entreprise.org 25 Mar '11

25 Mar '11

Author: bleny Date: 2011-03-25 13:48:53 +0000 (Fri, 25 Mar 2011) New Revision: 1098 Log: update file headers Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Common.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Export.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ExportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ExportableColumn.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportableExportableColumn.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ModelBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueGetter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueGetterSetter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueParserFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/TerrestrialDivisionImportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UserParserFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UsersParserFormatter.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowLogTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ExportTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanFilterManager.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/TopiaEntitySelector.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SampleRowDataSource.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/SampleRowModelFactory.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/TopiaEntitySelector.tml trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml trunk/wao-ui/src/main/webapp/js/contactForm.js Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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; import fr.ifremer.wao.entity.Company; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionImpl.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionImpl.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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; public class TerrestrialDivisionImpl extends TerrestrialDivisionAbstract { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Common.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Common.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Common.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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; import org.apache.commons.beanutils.BeanUtilsBean; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Export.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Export.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Export.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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; import org.apache.commons.io.IOUtils; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ExportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ExportModel.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ExportModel.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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; import java.util.Collection; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ExportableColumn.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ExportableColumn.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ExportableColumn.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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; public interface ExportableColumn<E, T> { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportableExportableColumn.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportableExportableColumn.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportableExportableColumn.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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; public interface ImportableExportableColumn<E, T> extends ImportableColumn<E, T>, ExportableColumn<E, T> { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ModelBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ModelBuilder.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ModelBuilder.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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; import java.util.Collection; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueFormatter.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueFormatter.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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; public interface ValueFormatter<T> { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueGetter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueGetter.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueGetter.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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; public interface ValueGetter<E, T> { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueGetterSetter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueGetterSetter.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueGetterSetter.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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; public interface ValueGetterSetter<E, T> extends ValueGetter<E, T>, ValueSetter<E, T> { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueParserFormatter.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueParserFormatter.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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; public interface ValueParserFormatter<T> extends ValueParser<T>, ValueFormatter<T> { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.WaoUtils; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/TerrestrialDivisionImportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/TerrestrialDivisionImportModel.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/TerrestrialDivisionImportModel.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.entity.TerrestrialDivision; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UserParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UserParserFormatter.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UserParserFormatter.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UsersParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UsersParserFormatter.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UsersParserFormatter.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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/entity/SampleRowLogTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowLogTest.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowLogTest.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.bean.ObsProgram; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ExportTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ExportTest.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ExportTest.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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; import fr.ifremer.wao.bean.ObsProgram; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/FilterManager.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.ui.base; import fr.ifremer.wao.bean.ConnectedUser; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanFilterManager.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanFilterManager.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/SamplingPlanFilterManager.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.ui.base; import fr.ifremer.wao.bean.ConnectedUser; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.ui.components; import fr.ifremer.wao.bean.SamplingFilter; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.ui.components; import org.apache.tapestry5.OptionGroupModel; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/TopiaEntitySelector.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/TopiaEntitySelector.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/TopiaEntitySelector.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.ui.components; import fr.ifremer.wao.WaoDAOHelper; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SampleRowDataSource.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SampleRowDataSource.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SampleRowDataSource.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.ui.data; import fr.ifremer.wao.WaoException; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.ui.pages; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/SampleRowModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/SampleRowModelFactory.java 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/SampleRowModelFactory.java 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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.ui.services; import fr.ifremer.wao.WaoUtils; Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> <div t:type="zone" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-sampling-filters"> Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SimpleSelector.tml 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/TopiaEntitySelector.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/TopiaEntitySelector.tml 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/TopiaEntitySelector.tml 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> Modified: trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ + <t:layout t:pageTitle="${message:wao.ui.page.SamplingPlan.title}" t:contentId="wao-obsdebsamplingplan" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> Modified: trunk/wao-ui/src/main/webapp/js/contactForm.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/contactForm.js 2011-03-25 13:25:15 UTC (rev 1097) +++ trunk/wao-ui/src/main/webapp/js/contactForm.js 2011-03-25 13:48:53 UTC (rev 1098) @@ -1,3 +1,26 @@ +/* + * #%L + * Wao :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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% + */ ContactSendEmail = Class.create({ initialize: function(message, contactState) { this.contactState = contactState;

1 0

[Suiviobsmer-commits] r1097 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org 25 Mar '11

25 Mar '11

Author: bleny Date: 2011-03-25 13:25:15 +0000 (Fri, 25 Mar 2011) New Revision: 1097 Log: prepare poms for release Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-25 13:09:15 UTC (rev 1096) +++ trunk/pom.xml 2011-03-25 13:25:15 UTC (rev 1097) @@ -332,7 +332,7 @@ scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </connection> <developerConnection> - scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn+ssh://${username}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer </url> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-03-25 13:09:15 UTC (rev 1096) +++ trunk/wao-business/pom.xml 2011-03-25 13:25:15 UTC (rev 1097) @@ -232,12 +232,6 @@ <url> http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… </url> - <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business - </connection> - <developerConnection> - scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business - </developerConnection> </scm> </project> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-03-25 13:09:15 UTC (rev 1096) +++ trunk/wao-ui/pom.xml 2011-03-25 13:25:15 UTC (rev 1097) @@ -312,12 +312,6 @@ <url> http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… </url> - <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui - </connection> - <developerConnection> - scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui - </developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r1096 - trunk
by bleny＠users.labs.libre-entreprise.org 25 Mar '11

25 Mar '11

Author: bleny Date: 2011-03-25 13:09:15 +0000 (Fri, 25 Mar 2011) New Revision: 1096 Log: changelog Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-03-25 13:05:05 UTC (rev 1095) +++ trunk/changelog.txt 2011-03-25 13:09:15 UTC (rev 1096) @@ -3,6 +3,19 @@ Historique des versions +2.1.1 +----- + +Evolution ++++++++++ + +- [bleny] #2615 : Utiliser l'identifiant technique unique pour l'unicité d'un contact dans l'import/export CSV + +Anomalies ++++++++++ + +- [bleny] #2638 : Impossible d'ajouter un contact commençant le dernier jour d'un mois + 2.1 ---

1 0

[Suiviobsmer-commits] r1095 - in trunk: src/announcement wao-business/src/main/java/fr/ifremer/wao
by bleny＠users.labs.libre-entreprise.org 25 Mar '11

25 Mar '11

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); }

1 0

[Suiviobsmer-commits] r1094 - in trunk: . src/site/rst/import wao-business wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/xmi wao-ui
by bleny＠users.labs.libre-entreprise.org 24 Mar '11

24 Mar '11

Author: bleny Date: 2011-03-24 18:03:24 +0000 (Thu, 24 Mar 2011) New Revision: 1094 Log: downgrading version to create intermediate version ; split migration Modified: trunk/pom.xml trunk/src/site/rst/import/contacts.rst trunk/wao-business/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-24 17:52:31 UTC (rev 1093) +++ trunk/pom.xml 2011-03-24 18:03:24 UTC (rev 1094) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.1-SNAPSHOT</version> <modules> <module>wao-ui</module> Modified: trunk/src/site/rst/import/contacts.rst =================================================================== --- trunk/src/site/rst/import/contacts.rst 2011-03-24 17:52:31 UTC (rev 1093) +++ trunk/src/site/rst/import/contacts.rst 2011-03-24 18:03:24 UTC (rev 1094) @@ -54,12 +54,14 @@ - PLAN_CODE : la ligne du plan associée au contact (ignoré à l'import) Pour ObsMer : + - CONTACT_QUALITE_DONNEE - CONTACT_OBSERVATION_MAMMIFERE - CONTACT_CAPTURE_ACCIDENTELLE Pour ObsVente : -- CONTACT_LIEU_TYPE : Port ou Criée + +- CONTACT_LIEU_TYPE : "Port" ou "Criée" - CONTACT_LIEU_CODE : Code du lieu - CONTACT_ECHANTILLONNAGE_COMPLET: Échantillonnage comple - CONTACT_LIEU_DESCRIPTION : Description du lieu, ignoré à l'import Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-03-24 17:52:31 UTC (rev 1093) +++ trunk/wao-business/pom.xml 2011-03-24 18:03:24 UTC (rev 1094) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> 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 17:52:31 UTC (rev 1093) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-03-24 18:03:24 UTC (rev 1094) @@ -793,7 +793,7 @@ } @Override - protected void addCreationDateToContacts_3_0(List<String> queries) { + protected void addCreationDateToContacts_2_1_1(List<String> queries) { queries.add("ALTER TABLE Contact ADD creationDate TIMESTAMP WITHOUT TIME ZONE"); queries.add("UPDATE Contact SET creationDate=topiaCreateDate"); } 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 17:52:31 UTC (rev 1093) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2011-03-24 18:03:24 UTC (rev 1094) @@ -131,14 +131,14 @@ protected abstract void correctFishingZoneReferential_2_1(List<String> queries); + protected abstract void addCreationDateToContacts_2_1_1(List<String> queries); + protected abstract void addTerrestrialDivisions_3_0(List<String> queries); protected abstract void addObsDebToSampleRows_3_0(List<String> queries); protected abstract void addAdminRolesToAdmin_3_0(TopiaContextImplementor tx, List<String> queries) throws TopiaException; - protected abstract void addCreationDateToContacts_3_0(List<String> queries); - protected static final Version[] VERSIONS = new Version[] { VersionUtil.valueOf("1.0"), VersionUtil.valueOf("1.1"), @@ -149,6 +149,7 @@ VersionUtil.valueOf("1.6"), VersionUtil.valueOf("2.0"), VersionUtil.valueOf("2.1"), + VersionUtil.valueOf("2.1.1"), VersionUtil.valueOf("3.0") }; @@ -472,14 +473,24 @@ } + public void migrateTo_2_1_1(TopiaContextImplementor tx, + boolean showSql, + boolean showProgression) throws TopiaException { + + List<String> queries = new LinkedList<String>(); + + addCreationDateToContacts_2_1_1(queries); + + String[] strings = queries.toArray(new String[queries.size()]); + executeSQL(tx, showSql, showProgression, strings); + } + public void migrateTo_3_0(TopiaContextImplementor tx, boolean showSql, boolean showProgression) throws TopiaException { List<String> queries = new LinkedList<String>(); - addCreationDateToContacts_3_0(queries); - addAdminRolesToAdmin_3_0(tx, queries); addTerrestrialDivisions_3_0(queries); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-03-24 17:52:31 UTC (rev 1093) +++ trunk/wao-ui/pom.xml 2011-03-24 18:03:24 UTC (rev 1094) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>

1 0