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

[Suiviobsmer-commits] r613 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org July 11, 2010

July 11, 2010

Author: fdesbois Date: 2010-07-11 19:17:21 +0000 (Sun, 11 Jul 2010) New Revision: 613 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 2010-07-11 19:17:16 UTC (rev 612) +++ trunk/pom.xml 2010-07-11 19:17:21 UTC (rev 613) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -299,9 +299,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5?root=suiviobsm…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-07-11 19:17:16 UTC (rev 612) +++ trunk/wao-business/pom.xml 2010-07-11 19:17:21 UTC (rev 613) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-business</developerConnection> + <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://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm>  Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-07-11 19:17:16 UTC (rev 612) +++ trunk/wao-ui/pom.xml 2010-07-11 19:17:21 UTC (rev 613) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-ui</developerConnection> + <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://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r612 - tags
by fdesbois＠users.labs.libre-entreprise.org July 11, 2010

July 11, 2010

Author: fdesbois Date: 2010-07-11 19:17:16 +0000 (Sun, 11 Jul 2010) New Revision: 612 Log: [maven-release-plugin] copy for tag wao-1.5 Added: tags/wao-1.5/

1 0

[Suiviobsmer-commits] r611 - in trunk: . wao-business wao-ui
by fdesbois＠users.labs.libre-entreprise.org July 11, 2010

July 11, 2010

Author: fdesbois Date: 2010-07-11 19:17:12 +0000 (Sun, 11 Jul 2010) New Revision: 611 Log: [maven-release-plugin] prepare release wao-1.5 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-11 19:10:28 UTC (rev 610) +++ trunk/pom.xml 2010-07-11 19:17:12 UTC (rev 611) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> <modules> <module>wao-ui</module> @@ -299,9 +299,9 @@  <scm> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5?root=suiviobsm…</url> </scm> <build> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-07-11 19:10:28 UTC (rev 610) +++ trunk/wao-business/pom.xml 2010-07-11 19:17:12 UTC (rev 611) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -204,9 +204,9 @@ </build> <scm> - <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://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-business</developerConnection> </scm>  Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-07-11 19:10:28 UTC (rev 610) +++ trunk/wao-ui/pom.xml 2010-07-11 19:17:12 UTC (rev 611) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -227,9 +227,9 @@ </repositories> <scm> - <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://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-1.5/?root=suiviobs…</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-1.5/wao-ui</developerConnection> </scm> </project>

1 0

[Suiviobsmer-commits] r610 - in trunk: . src/site/rst/admin src/site/rst/user wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/io/kml wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-business/src/test/java/fr/ifremer/wao/bean wao-business/src/test/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/components wao-ui/src/main/java/fr/ifremer/wao/ui/data wao-ui/src/main/ja
by fdesbois＠users.labs.libre-entreprise.org July 11, 2010

July 11, 2010

Author: fdesbois Date: 2010-07-11 19:10:28 +0000 (Sun, 11 Jul 2010) New Revision: 610 Log: Update headers + use topia 2.4 Modified: trunk/pom.xml trunk/src/site/rst/admin/seeContacts.rst trunk/src/site/rst/user/seeContacts.rst trunk/wao-business/src/main/java/fr/ifremer/wao/WaoServiceFactory.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartSeriesImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderJak.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderXpp3.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictSchemaData.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlIOFactory.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlReader.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.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/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/PieChart.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml trunk/wao-ui/src/main/webapp/css/cartography.css trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/framedCloud.css trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/google.css trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/ie6-style.css trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/style.css trunk/wao-ui/src/main/webapp/js/cartography.js Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/pom.xml 2010-07-11 19:10:28 UTC (rev 610) @@ -288,7 +288,7 @@ <i18n.version>1.2.2</i18n.version> <nuitonutils.version>1.3.1</nuitonutils.version> <nuitonweb.version>0.1</nuitonweb.version> - <topia.version>2.4-SNAPSHOT</topia.version> + <topia.version>2.4</topia.version> <eugene.version>2.1</eugene.version> <tapestry.version>5.1.0.5</tapestry.version> Modified: trunk/src/site/rst/admin/seeContacts.rst =================================================================== --- trunk/src/site/rst/admin/seeContacts.rst 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/src/site/rst/admin/seeContacts.rst 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +.. - +.. * #%L +.. * Wao +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Visualiser les contacts ----------------------- Modified: trunk/src/site/rst/user/seeContacts.rst =================================================================== --- trunk/src/site/rst/user/seeContacts.rst 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/src/site/rst/user/seeContacts.rst 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +.. - +.. * #%L +.. * Wao +.. * %% +.. * Copyright (C) 2009 - 2010 Ifremer +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU 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 General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Visualiser les contacts ----------------------- Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoServiceFactory.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoServiceFactory.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoServiceFactory.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao; import fr.ifremer.wao.service.ServiceBoat; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactPieChartConstant.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.bean; /** Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartDataImpl.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.bean; import org.apache.commons.lang.StringUtils; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartSeriesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartSeriesImpl.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/PieChartSeriesImpl.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.bean; import org.nuiton.util.StringUtil; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderJak.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderJak.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderJak.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.io.kml; import de.micromata.opengis.kml.v_2_2_0.Coordinate; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderXpp3.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderXpp3.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictKmlReaderXpp3.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.io.kml; import fr.ifremer.wao.io.BoatDistrictData; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictSchemaData.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictSchemaData.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/BoatDistrictSchemaData.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.io.kml; import fr.ifremer.wao.io.BoatDistrictData; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/ContactKmlWriterJak.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.io.kml; import de.micromata.opengis.kml.v_2_2_0.Document; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlIOFactory.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlIOFactory.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlIOFactory.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.io.kml; import fr.ifremer.wao.io.BoatDistrictData; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlReader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlReader.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlReader.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.io.kml; import fr.ifremer.wao.io.BoatDistrictData; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/kml/KmlWriter.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.io.kml; import fr.ifremer.wao.entity.GeoPoint; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceCartographyImpl.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.service; import fr.ifremer.wao.WaoContext; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceChartEmpty.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.service; import fr.ifremer.wao.bean.PieChartData; 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 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +### +# #%L +# Wao :: Business +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### wao.error.boat.canCreateContact= wao.error.boat.getNbBoarding= wao.error.boatInfos.getNbBoardingForCompany= 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 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +### +# #%L +# Wao :: Business +# %% +# Copyright (C) 2009 - 2010 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### wao.error.boat.canCreateContact=Impossible de cr\u00E9er un nouveau contact pour la soci\u00E9t\u00E9 %1$s et le navire %2$s (%3$d) wao.error.boat.getNbBoarding=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s pour la soci\u00E9t\u00E9 %2$s Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/bean/PieChartDataImplTest.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.bean; import org.junit.Assert; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceCartographyImplTest.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.service; import fr.ifremer.wao.AbstractServiceTest; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Footer.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.components; import fr.ifremer.wao.WaoProperty; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/KmlStreamResponse.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.data; import fr.ifremer.wao.ui.pages.KmlLoader; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.pages; import fr.ifremer.wao.WaoException; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/KmlLoader.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.pages; import fr.ifremer.wao.service.ServiceCartography; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/PieChart.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/PieChart.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/PieChart.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.pages; import fr.ifremer.wao.bean.PieChartData; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategy.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.services; import fr.ifremer.wao.entity.Company; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/KmlLoaderStrategyContacts.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.services; import fr.ifremer.wao.entity.Company; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartImpl.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.services; import fr.ifremer.wao.WaoProperty; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceChartServlet.java 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package fr.ifremer.wao.ui.services; import fr.ifremer.wao.WaoProperty; Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Footer.tml 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ + <!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 id="so-footer"> Modified: trunk/wao-ui/src/main/webapp/css/cartography.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/cartography.css 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/webapp/css/cartography.css 2010-07-11 19:10:28 UTC (rev 610) @@ -1,4 +1,25 @@ /* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +/* Document : cartography Created on : 6 juil. 2010, 10:33:06 Author : fdesbois <fdesbois at codelutin.com> Modified: trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/webapp/js/OpenLayers/OpenLayers.js 2010-07-11 19:10:28 UTC (rev 610) @@ -1,4 +1,25 @@ /* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +/* OpenLayers.js -- OpenLayers Map Viewer Library Modified: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/framedCloud.css =================================================================== --- trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/framedCloud.css 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/framedCloud.css 2010-07-11 19:10:28 UTC (rev 610) @@ -0,0 +1,21 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ Modified: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/google.css =================================================================== --- trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/google.css 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/google.css 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ .olLayerGoogleCopyright { right: 3px; bottom: 2px; Modified: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/ie6-style.css =================================================================== --- trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/ie6-style.css 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/ie6-style.css 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ .olControlZoomPanel div { background-image: url(img/zoom-panel-NOALPHA.png); } Modified: trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/style.css =================================================================== --- trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/style.css 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/webapp/js/OpenLayers/theme/default/style.css 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ div.olMap { z-index: 0; padding: 0px!important; Modified: trunk/wao-ui/src/main/webapp/js/cartography.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/cartography.js 2010-07-10 08:56:30 UTC (rev 609) +++ trunk/wao-ui/src/main/webapp/js/cartography.js 2010-07-11 19:10:28 UTC (rev 610) @@ -1,3 +1,24 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2010 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ var lon = 5; var lat = 40; var zoom = 5;

1 0

[Suiviobsmer-commits] r609 - trunk/wao-business/src/main/java/fr/ifremer/wao
by fdesbois＠users.labs.libre-entreprise.org July 10, 2010

July 10, 2010

Author: fdesbois Date: 2010-07-10 08:56:30 +0000 (Sat, 10 Jul 2010) New Revision: 609 Log: fix javadoc Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-07-10 08:23:19 UTC (rev 608) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-07-10 08:56:30 UTC (rev 609) @@ -238,8 +238,8 @@ I18n.setInitializer(new DefaultI18nInitializer("wao-business")); I18n.init(Locale.FRANCE); - // Set context in PollenProperty enum to use easily method - // getValue() on PollenProperty + // Set context in WaoProperty enum to use easily method + // getValue() on WaoProperty WaoProperty.setContext(this); // Set context in utils static class for entities

1 0

[Suiviobsmer-commits] r608 - trunk/src/announcement
by fdesbois＠users.labs.libre-entreprise.org July 10, 2010

July 10, 2010

Author: fdesbois Date: 2010-07-10 08:23:19 +0000 (Sat, 10 Jul 2010) New Revision: 608 Log: Update email Modified: trunk/src/announcement/release-email-1.5.txt Modified: trunk/src/announcement/release-email-1.5.txt =================================================================== --- trunk/src/announcement/release-email-1.5.txt 2010-07-10 08:22:56 UTC (rev 607) +++ trunk/src/announcement/release-email-1.5.txt 2010-07-10 08:23:19 UTC (rev 608) @@ -7,7 +7,7 @@ son emplacement est à préciser dans le fichier de configuration : chart.server.path= -Résolution d'anomalies : +Nouveautés : - Filtres sur commentaires contacts. [fdesbois-Evo #2362] - Cartographie des contacts. [fdesbois-Evo #2352]

1 0

[Suiviobsmer-commits] r607 - trunk/src/announcement
by fdesbois＠users.labs.libre-entreprise.org July 10, 2010

July 10, 2010

Author: fdesbois Date: 2010-07-10 08:22:56 +0000 (Sat, 10 Jul 2010) New Revision: 607 Log: Add announcement email Added: trunk/src/announcement/release-email-1.5.txt Added: trunk/src/announcement/release-email-1.5.txt =================================================================== --- trunk/src/announcement/release-email-1.5.txt (rev 0) +++ trunk/src/announcement/release-email-1.5.txt 2010-07-10 08:22:56 UTC (rev 607) @@ -0,0 +1,38 @@ + +La nouvelle version 1.5 de l'applicatif Wao est disponible ! Cette version +introduit une nouvelle page comprenant une carte de la répartition des contacts +par quartier des navires. + +L'application Eastwood Charts est utilisée pour charger les graphiques de la carte, +son emplacement est à préciser dans le fichier de configuration : +chart.server.path= + +Résolution d'anomalies : + +- Filtres sur commentaires contacts. [fdesbois-Evo #2362] +- Cartographie des contacts. [fdesbois-Evo #2352] +- Mail automatique suite à un embarquement réalisé. [fdesbois-Evo #2361] + +Mise à jour librairie : + +- OpenLayers 2.9.1 [http://openlayers.org/] +- Apache Xerces 2.8.1 [http://xerces.apache.org/] +- JAXB 2.2 [http://java.sun.com/developer/technicalArticles/WebServices/jaxb/] +- JavaApiforKml 2.2.0 [http://code.google.com/p/javaapiforkml/] +- H2 1.2.132 -> 1.2.137 [http://www.h2database.com/html/main.html] +- ToPIA 2.3.4 -> 2.3.5 [http://maven-site.nuiton.org/topia/topia-persistence] +- EUGene 2.0.2 -> 2.1 [http://maven-site.nuiton.org/eugene] +- mavenpom4labs 2.2.1 -> 2.2.2.1 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] + +Documentation : + +http://suiviobsmer.labs.libre-entreprise.org/wao/ + +Téléchargement : + +https://labs.libre-entreprise.org/frs/?group_id=154 + +Cordialement, + +L'équipe Wao +

1 0

[Suiviobsmer-commits] r606 - in trunk: . wao-business/src/main/xmi
by fdesbois＠users.labs.libre-entreprise.org July 9, 2010

July 9, 2010

Author: fdesbois Date: 2010-07-09 13:35:25 +0000 (Fri, 09 Jul 2010) New Revision: 606 Log: Use last topia snapshot Modified: trunk/pom.xml trunk/wao-business/src/main/xmi/wao.zargo Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-09 11:52:39 UTC (rev 605) +++ trunk/pom.xml 2010-07-09 13:35:25 UTC (rev 606) @@ -288,7 +288,7 @@ <i18n.version>1.2.2</i18n.version> <nuitonutils.version>1.3.1</nuitonutils.version> <nuitonweb.version>0.1</nuitonweb.version> - <topia.version>2.3.5-SNAPSHOT</topia.version> + <topia.version>2.4-SNAPSHOT</topia.version> <eugene.version>2.1</eugene.version> <tapestry.version>5.1.0.5</tapestry.version> Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ)

1 0

[Suiviobsmer-commits] r605 - in trunk: src/site/resources/schemas src/site/rst wao-business/src/main/xmi
by fdesbois＠users.labs.libre-entreprise.org July 9, 2010

July 9, 2010

Author: fdesbois Date: 2010-07-09 11:52:39 +0000 (Fri, 09 Jul 2010) New Revision: 605 Log: Evo #2352 : Cartography for contacts : Add documentation Modified: trunk/src/site/resources/schemas/CU_WAO.png trunk/src/site/resources/schemas/Modele_WAO.png trunk/src/site/rst/model.rst trunk/src/site/rst/usecases.rst trunk/wao-business/src/main/xmi/wao.zargo Modified: trunk/src/site/resources/schemas/CU_WAO.png =================================================================== (Binary files differ) Modified: trunk/src/site/resources/schemas/Modele_WAO.png =================================================================== (Binary files differ) Modified: trunk/src/site/rst/model.rst =================================================================== --- trunk/src/site/rst/model.rst 2010-07-09 11:47:30 UTC (rev 604) +++ trunk/src/site/rst/model.rst 2010-07-09 11:52:39 UTC (rev 605) @@ -113,13 +113,20 @@ + immatriculation : numéro d'immatriculation du navire + name : nom du navire - + districtCode : code quartier du navire + boatLength : longueur du navire en mètres + buildYear : année de construction + active : état d'activation du navire + [lien] shipOwner : armateur du navire + [lien] activityCalendar : calendriers d'activité du navire + + [lien] boatDistrict : quartier du navire +- **BoatDistrict** : Quartier d'un navire + + + code : code du quartier + + name : nom du quartier + + longitude : longitude de la position géographique du quartier + + latitude : latitude de la position géographique du quartier + - **ElligibleBoat** : Eligibilité d'un navire pour une ligne du plan + globalActive : état d'activation global d'une ligne (effectué par un admin) @@ -292,3 +299,7 @@ - [Contact] Création champs emailSent (boolean) mis à TRUE si le contact possède une date d'enregistrement des données (dataInputDate) et mis à FALSE sinon. +- [BoatDistrict] Création nouvelle table, enregistrement depuis les codes + quartiers existants dans Boat. +- [Boat] Création lien avec table BoatDistrict (foreign key), suppression champs + boatDistrictCode. Modified: trunk/src/site/rst/usecases.rst =================================================================== --- trunk/src/site/rst/usecases.rst 2010-07-09 11:47:30 UTC (rev 604) +++ trunk/src/site/rst/usecases.rst 2010-07-09 11:52:39 UTC (rev 605) @@ -97,6 +97,9 @@ société. (Depuis 1.0) +- 3.6- **Consulter la cartographie des contacts** : Permet de visualiser la + cartographie des contacts (répartition par quartier des navires). + - 4- **Voir syntheses et indicateurs** ( administrateur__ / utilisateur__ ) : Graphiques et indicateurs permettant d'aggréger les données existantes dans l'application. Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ)

1 0

[Suiviobsmer-commits] r604 - trunk/src/site/resources/admin
by jcouteau＠users.labs.libre-entreprise.org July 9, 2010

July 9, 2010

Author: jcouteau Date: 2010-07-09 11:47:30 +0000 (Fri, 09 Jul 2010) New Revision: 604 Log: Update imports screenshots Modified: trunk/src/site/resources/admin/imports.png Modified: trunk/src/site/resources/admin/imports.png =================================================================== (Binary files differ)

1 0