Wao-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
March 2014
- 3 participants
- 90 discussions
Build failed in Jenkins: wao-ci » Wao :: Services #39
by admin+ci-codelutin.com@codelutin.com 25 Mar '14
by admin+ci-codelutin.com@codelutin.com 25 Mar '14
25 Mar '14
See <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/39/chang…>
Changes:
[Tony CHEMIT] refs-20 #4483 (add SamplingPlan Builder)
[Tony CHEMIT] fix licenses
fix third-parties
fix dependencies
------------------------------------------
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building Wao :: Services 4.0-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ wao-services ---
[INFO] Deleting <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/target>
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-services ---
[INFO]
[INFO] --- i18n-maven-plugin:3.0:parserJava (parseOthersAndGen) @ wao-services ---
[INFO] start entry basedir:<http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/src/m…,> includes:[**/*.java]
[INFO] 66 file(s) to process (among 66 files)
[INFO] Parsing is done. [treated file(s) : 18/66](total time:213.249ms) ( ~ 3.231ms / file)
[INFO]
[INFO] >>> i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ wao-services >>>
[INFO]
[INFO] --- i18n-maven-plugin:3.0:get (get) @ wao-services ---
[INFO] config - basedir : <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/targe…>
[INFO] config - locales : [fr_FR, en_GB]
[INFO] import getter java.getter in 135566ns
[INFO] Copying wao-services.properties to <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/targe…>
[INFO] Copying wao-services.properties to <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/targe…>
[INFO]
[INFO] <<< i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ wao-services <<<
[INFO]
[INFO] --- i18n-maven-plugin:3.0:gen (parseOthersAndGen) @ wao-services ---
[INFO] config - src basedir : <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/src/m…>
[INFO] config - out basedir : <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/targe…>
[INFO] config - locales : [fr_FR, en_GB]
[INFO] prepare bundle for locale fr_FR
[INFO] merge bundle fr_FR to out
[INFO] copy bundle fr_FR to src
[INFO] prepare bundle for locale en_GB
[INFO] merge bundle en_GB to out
[INFO] copy bundle en_GB to src
[INFO]
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ wao-services ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 4 resources
[INFO]
[INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ wao-services ---
[INFO] Compiling 66 source files to <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/targe…>
[WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/src/m…>:[173,46] findByEntityClassFqn(java.lang.String) in fr.ifremer.wao.entity.GeneratedReferentialMetaTopiaDao has been deprecated
[WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/src/m…>:[180,68] TOPIA_ID in org.nuiton.topia.persistence.TopiaEntity has been deprecated
[WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/src/m…>: Some input files use unchecked or unsafe operations.
[WARNING] <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/src/m…>: Recompile with -Xlint:unchecked for details.
[INFO]
[INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ wao-services ---
[INFO] Executing tasks
main:
[mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/targe…>
[INFO] Executed tasks
[INFO]
[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ wao-services ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 9 resources
[INFO]
[INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ wao-services ---
[INFO] Compiling 8 source files to <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/targe…>
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/src/t…>:[65,63] incompatible types
required: java.util.List<fr.ifremer.wao.entity.SampleRow>
found: fr.ifremer.wao.services.service.ObsMerSamplingPlan
[ERROR] <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/src/t…>:[70,47] incompatible types
required: java.util.List<fr.ifremer.wao.entity.SampleRow>
found: fr.ifremer.wao.services.service.ObsMerSamplingPlan
[ERROR] <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/src/t…>:[75,47] incompatible types
required: java.util.List<fr.ifremer.wao.entity.SampleRow>
found: fr.ifremer.wao.services.service.ObsMerSamplingPlan
[ERROR] <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-services/ws/src/t…>:[81,47] incompatible types
required: java.util.List<fr.ifremer.wao.entity.SampleRow>
found: fr.ifremer.wao.services.service.ObsMerSamplingPlan
[INFO] 4 errors
[INFO] -------------------------------------------------------------
[JENKINS] Archiving disabled
1
4
r1742 - in trunk: . wao-persistence/src/main/java/fr/ifremer/wao wao-web/src/main/java/fr/ifremer/wao/web
by tchemit@users.forge.codelutin.com 25 Mar '14
by tchemit@users.forge.codelutin.com 25 Mar '14
25 Mar '14
Author: tchemit
Date: 2014-03-25 11:57:36 +0100 (Tue, 25 Mar 2014)
New Revision: 1742
Url: http://forge.codelutin.com/projects/wao/repository/revisions/1742
Log:
fix hibernate version
Modified:
trunk/pom.xml
trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-03-25 10:36:04 UTC (rev 1741)
+++ trunk/pom.xml 2014-03-25 10:57:36 UTC (rev 1742)
@@ -106,7 +106,7 @@
<bootstrapPluginVersion>1.7.0</bootstrapPluginVersion>
<shiroVersion>1.2.2</shiroVersion>
<slf4jVersion>1.7.6</slf4jVersion>
- <hibernateVersion>4.3.1.Final</hibernateVersion>
+ <hibernateVersion>4.2.8.Final</hibernateVersion>
<mockitoVersion>1.9.5</mockitoVersion>
<postgresqlDriverVersion>9.3-1101-jdbc41</postgresqlDriverVersion>
<commonsEmailVersion>1.3.2</commonsEmailVersion>
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-03-25 10:36:04 UTC (rev 1741)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-03-25 10:57:36 UTC (rev 1742)
@@ -68,6 +68,7 @@
protected Set<String> orderByArguments;
+ //FIXME Remove this
protected boolean estimatedTides;
public ObsProgram getObsProgram() {
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-03-25 10:36:04 UTC (rev 1741)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-03-25 10:57:36 UTC (rev 1742)
@@ -80,7 +80,7 @@
if (waoSession.getAuthenticatedWaoUser() == null) {
- boolean loginCheat = false;
+ boolean loginCheat = true;
if (loginCheat) {
// login à l'arrache
WaoUser admin = serviceContext.getPersistenceContext().getWaoUserDao().forLoginEquals("admin").findUnique();
1
0
25 Mar '14
Author: bleny
Date: 2014-03-25 11:36:04 +0100 (Tue, 25 Mar 2014)
New Revision: 1741
Url: http://forge.codelutin.com/projects/wao/repository/revisions/1741
Log:
remove references to another project, add licence headers
Modified:
trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoException.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoTechnicalException.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatGroups.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Boats.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStateMotives.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DCF5Codes.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/FishingZones.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Fleets.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/GeoPoint.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsDebCodes.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRows.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ShipOwners.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionTopiaDao.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationTopiaDao.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserTopiaDao.java
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java
trunk/wao-persistence/src/main/resources/wao.properties
trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/ObsMerFixtures.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoPermissions.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoService.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoWebApplicationContext.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalDeletionException.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ImportErrorException.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InitWaoService.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowCodeMustBeUniqueException.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompaniesService.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompanyNameMustBeUniqueException.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/InactiveWaoUserException.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LoginMustBeUniqueException.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NoRoleAttributedException.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialState.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownBoatImmatriculationsException.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownFishingGearDcfCodeException.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownTargetSpeciesDcfCodeException.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommandPasswordStrategy.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WrongCredentialsException.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCode.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/UserCredentialsEmail.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java
trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java
trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java
trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/InitWaoServiceTest.java
trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java
trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/administration/ReferentialServiceTest.java
trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/administration/WaoUsersServiceTest.java
trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java
trunk/wao-services/src/test/resources/log4j.properties
trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoWebApplicationContext.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationListener.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoRealm.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/IndexAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/MonthConverter.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/AbstractImportReferentialAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteWaoUserAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ReferentialManagementAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/WaoUsersAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LogoutAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/CommentSampleRowAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ImportSamplingPlanAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowLogAction.java
trunk/wao-web/src/main/resources/fr/ifremer/wao/entity/SampleRow-conversion.properties
trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/UpdateSampleRowCommand-conversion.properties
trunk/wao-web/src/main/resources/log4j.properties
trunk/wao-web/src/main/resources/struts.properties
trunk/wao-web/src/main/resources/struts.xml
trunk/wao-web/src/main/resources/xwork-conversion.properties
trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp
trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-company.jsp
trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp
trunk/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp
trunk/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp
trunk/wao-web/src/main/webapp/WEB-INF/content/authentication/login.jsp
trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp
trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp
trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-sampling-plan-input.jsp
trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp
trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sample-row-log.jsp
trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp
trunk/wao-web/src/main/webapp/WEB-INF/decorators.xml
trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp
trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp
trunk/wao-web/src/main/webapp/WEB-INF/decorators/version.jsp
trunk/wao-web/src/main/webapp/WEB-INF/web.xml
trunk/wao-web/src/main/webapp/css/wao.css
trunk/wao-web/src/main/webapp/js/moment-js-2.5.1/moment-with-langs.js
trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2-bootstrap.css
trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2.css
trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2.js
trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2.min.js
trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2_locale_fr.js
trunk/wao-web/src/main/webapp/js/wao.js
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfig.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.commons.lang3.StringUtils;
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,13 +1,34 @@
package fr.ifremer.wao;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import org.nuiton.config.ConfigOptionDef;
public enum WaoApplicationConfigOption implements ConfigOptionDef {
INSTANCE_URL(
"wao.instanceUrl",
- "URL à laquelle on peut accéder à l'instance de l'extranet",
- "http://localhost:8080/extranet-enc-ahi", String.class),
+ "URL à laquelle on peut accéder à l'instance de WAO",
+ "http://localhost:8080/wao", String.class),
INSTANCE_DISCLAIMER(
"wao.instanceDisclaimer",
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoException.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoException.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoException.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 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%
+ */
+
public class WaoException extends Exception {
public WaoException() {
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoTechnicalException.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoTechnicalException.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoTechnicalException.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 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%
+ */
+
public class WaoTechnicalException extends RuntimeException {
public WaoTechnicalException() {
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.entity.ObsProgram;
import java.text.DateFormat;
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatGroups.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatGroups.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatGroups.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Function;
public class BoatGroups {
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Boats.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Boats.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Boats.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import org.apache.commons.lang3.StringUtils;
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Function;
public class Companies {
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStateMotives.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStateMotives.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStateMotives.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Function;
public class ContactStateMotives {
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DCF5Codes.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DCF5Codes.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/DCF5Codes.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Function;
public class DCF5Codes {
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/FishingZones.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/FishingZones.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/FishingZones.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Function;
public class FishingZones {
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Fleets.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Fleets.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Fleets.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Function;
public class Fleets {
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/GeoPoint.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/GeoPoint.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/GeoPoint.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 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%
+ */
+
/**
* Représente un point qui correspond à une position géographique.
*
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsDebCodes.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsDebCodes.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsDebCodes.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Function;
public class ObsDebCodes {
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRows.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRows.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRows.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Function;
public class SampleRows {
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ShipOwners.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ShipOwners.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ShipOwners.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Function;
public class ShipOwners {
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionTopiaDao.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionTopiaDao.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialDivisionTopiaDao.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import java.util.Collections;
public class TerrestrialDivisionTopiaDao extends AbstractTerrestrialDivisionTopiaDao<TerrestrialDivision> {
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationTopiaDao.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationTopiaDao.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationTopiaDao.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep;
import java.util.Collections;
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Function;
public class TerrestrialLocations {
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserTopiaDao.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserTopiaDao.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUserTopiaDao.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,19 +1,40 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Optional;
public class WaoUserTopiaDao extends AbstractWaoUserTopiaDao<WaoUser> {
public Optional<WaoUser> tryFindByEmailAndFetchCollections(String email) {
- Optional<WaoUser> extranetUserOptional = forLoginEquals(email).tryFindUnique();
- if (extranetUserOptional.isPresent()) {
- WaoUser waoUser = extranetUserOptional.get();
+ Optional<WaoUser> waoUserOptional = forLoginEquals(email).tryFindUnique();
+ if (waoUserOptional.isPresent()) {
+ WaoUser waoUser = waoUserOptional.get();
// fetch the lazy collections to avoid lazy initialisation exception
waoUser.sizeAllegroWallet();
waoUser.sizeCanReadBoats();
waoUser.sizeUserProfile();
}
- return extranetUserOptional;
+ return waoUserOptional;
}
} //WaoUserTopiaDao
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.entity;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Function;
public class WaoUsers {
Modified: trunk/wao-persistence/src/main/resources/wao.properties
===================================================================
--- trunk/wao-persistence/src/main/resources/wao.properties 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-persistence/src/main/resources/wao.properties 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,25 @@
+###
+# #%L
+# Wao :: Persistence
+# %%
+# Copyright (C) 2009 - 2014 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%
+###
hibernate.connection.driver_class=org.h2.Driver
-hibernate.connection.url=jdbc:h2:file:/tmp/extranet-enc-ahi/h2data
+hibernate.connection.url=jdbc:h2:file:/tmp/wao/h2data
hibernate.connection.username=sa
hibernate.connection.password=
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Preconditions;
import fr.ifremer.wao.entity.Company;
import fr.ifremer.wao.entity.News;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoApplicationConfig;
import fr.ifremer.wao.WaoTechnicalException;
import fr.ifremer.wao.WaoTopiaPersistenceContext;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/ObsMerFixtures.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/ObsMerFixtures.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/ObsMerFixtures.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoTechnicalException;
import fr.ifremer.wao.entity.Company;
import fr.ifremer.wao.entity.CompanyTopiaDao;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoPermissions.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoPermissions.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoPermissions.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.collect.Iterables;
import fr.ifremer.wao.WaoTopiaPersistenceContext;
import fr.ifremer.wao.entity.WaoUser;
@@ -13,7 +34,7 @@
import java.util.Set;
/**
- * Représente tout le système de permissions de l'extranet.
+ * Représente tout le système de permissions de WAO
*/
public class WaoPermissions {
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoService.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoService.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoService.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 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%
+ */
+
/**
* @author bleny
*/
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoApplicationConfig;
import fr.ifremer.wao.WaoTopiaPersistenceContext;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoWebApplicationContext.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoWebApplicationContext.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoWebApplicationContext.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -2,25 +2,22 @@
/*
* #%L
- * Extranet ENC-AHI :: Services
- * $Id: ExtranetEncAhiWebApplicationContext.java 827 2013-12-04 15:30:35Z bleny $
- * $HeadURL: http://svn.forge.codelutin.com/svn/extranet-enc-ahi/trunk/extranet-services… $
+ * Wao :: Services
* %%
- * Copyright (C) 2013 Ministère des Affaires sociales et de la Santé
+ * Copyright (C) 2009 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
+ * 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 Lesser Public License for more details.
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * 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%
*/
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalDeletionException.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalDeletionException.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalDeletionException.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoException;
import org.nuiton.topia.persistence.TopiaEntity;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ImportErrorException.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ImportErrorException.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ImportErrorException.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoException;
import org.nuiton.csv.ImportRuntimeException;
import org.nuiton.i18n.I18n;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InitWaoService.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InitWaoService.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InitWaoService.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.services.service.administration.ReferentialService;
public class InitWaoService extends WaoServiceSupport {
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowCodeMustBeUniqueException.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowCodeMustBeUniqueException.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowCodeMustBeUniqueException.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoException;
public class SampleRowCodeMustBeUniqueException extends WaoException {
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoApplicationConfig;
import fr.ifremer.wao.WaoTopiaPersistenceContext;
import fr.ifremer.wao.entity.BoatGroupTopiaDao;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompaniesService.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompaniesService.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompaniesService.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.collect.Iterables;
import fr.ifremer.wao.entity.Company;
import fr.ifremer.wao.entity.CompanyImpl;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompanyNameMustBeUniqueException.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompanyNameMustBeUniqueException.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompanyNameMustBeUniqueException.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoException;
public class CompanyNameMustBeUniqueException extends WaoException {
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/InactiveWaoUserException.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/InactiveWaoUserException.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/InactiveWaoUserException.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoException;
import fr.ifremer.wao.entity.WaoUser;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LoginMustBeUniqueException.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LoginMustBeUniqueException.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LoginMustBeUniqueException.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoException;
public class LoginMustBeUniqueException extends WaoException {
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.collect.Lists;
import fr.ifremer.wao.entity.Company;
import fr.ifremer.wao.entity.News;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NoRoleAttributedException.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NoRoleAttributedException.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NoRoleAttributedException.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoException;
import fr.ifremer.wao.entity.WaoUser;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialState.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialState.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialState.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import java.util.Date;
/**
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownBoatImmatriculationsException.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownBoatImmatriculationsException.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownBoatImmatriculationsException.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoException;
import java.util.Set;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownFishingGearDcfCodeException.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownFishingGearDcfCodeException.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownFishingGearDcfCodeException.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoException;
public class UnknownFishingGearDcfCodeException extends WaoException {
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownTargetSpeciesDcfCodeException.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownTargetSpeciesDcfCodeException.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownTargetSpeciesDcfCodeException.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoException;
public class UnknownTargetSpeciesDcfCodeException extends WaoException {
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.collect.ImmutableMap;
import fr.ifremer.wao.entity.Company;
import fr.ifremer.wao.entity.ObsProgram;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommandPasswordStrategy.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommandPasswordStrategy.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommandPasswordStrategy.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import org.nuiton.i18n.I18n;
public enum UpdateWaoUserCommandPasswordStrategy {
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WrongCredentialsException.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WrongCredentialsException.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WrongCredentialsException.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoException;
public class WrongCredentialsException extends WaoException {
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -35,13 +35,10 @@
import fr.ifremer.wao.entity.SampleMonthImpl;
import fr.ifremer.wao.entity.SampleRow;
import fr.ifremer.wao.entity.SampleRowImpl;
-import fr.ifremer.wao.entity.SamplingStrategy;
import fr.ifremer.wao.entity.TerrestrialLocation;
import fr.ifremer.wao.services.service.administration.ReferentialService;
import fr.ifremer.wao.services.service.csv.operations.CompanyParserFormatter;
import fr.ifremer.wao.services.service.csv.operations.DCF5CodesParserFormatter;
-import fr.ifremer.wao.services.service.csv.operations.DistrictNamesFormatter;
-import fr.ifremer.wao.services.service.csv.operations.DistrictsParserFormatter;
import fr.ifremer.wao.services.service.csv.operations.FishingZonesParserFormatter;
import fr.ifremer.wao.services.service.csv.operations.SampleRowCodeParserFormatter;
import org.nuiton.csv.Common;
@@ -222,12 +219,14 @@
}
if (obsProgram == ObsProgram.OBSVENTE) {
- modelBuilder.newColumnForImportExport("PLAN_STRATEGIE", "samplingStrategy", new Common.ToStringParserFormatter<>(SamplingStrategy.values()));
- modelBuilder.newColumnForImportExport("PLAN_LIEU_CODE", SampleRow.PROPERTY_TERRESTRIAL_LOCATIONS, new DistrictsParserFormatter(terrestrialDistricts));
- modelBuilder.newColumnForExport("PLAN_LIEU_NOM", SampleRow.PROPERTY_TERRESTRIAL_LOCATIONS, new DistrictNamesFormatter());
- modelBuilder.newIgnoredColumn("PLAN_LIEU_NOM");
- modelBuilder.newColumnForImportExport("PLAN_LIEU_COMMENT", SampleRow.PROPERTY_TERRESTRIAL_LOCATION_INFOS);
- modelBuilder.newColumnForImportExport("PLAN_NOMBRE_OBSERVATIONS", SampleRow.PROPERTY_AVERAGE_OBSERVATIONS_COUNT, Common.PRIMITIVE_INTEGER);
+ throw new UnsupportedOperationException();
+ // FIXME brendan 24/03/14 on ne peut plus utiliser ToStringParserFormatter
+// modelBuilder.newColumnForImportExport("PLAN_STRATEGIE", "samplingStrategy", new Common.ToStringParserFormatter<>(SamplingStrategy.values()));
+// modelBuilder.newColumnForImportExport("PLAN_LIEU_CODE", SampleRow.PROPERTY_TERRESTRIAL_LOCATIONS, new DistrictsParserFormatter(terrestrialDistricts));
+// modelBuilder.newColumnForExport("PLAN_LIEU_NOM", SampleRow.PROPERTY_TERRESTRIAL_LOCATIONS, new DistrictNamesFormatter());
+// modelBuilder.newIgnoredColumn("PLAN_LIEU_NOM");
+// modelBuilder.newColumnForImportExport("PLAN_LIEU_COMMENT", SampleRow.PROPERTY_TERRESTRIAL_LOCATION_INFOS);
+// modelBuilder.newColumnForImportExport("PLAN_NOMBRE_OBSERVATIONS", SampleRow.PROPERTY_AVERAGE_OBSERVATIONS_COUNT, Common.PRIMITIVE_INTEGER);
}
if (log.isDebugEnabled()) {
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCode.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCode.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCode.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.csv;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.entity.TerrestrialLocation;
/**
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.mail;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.github.mustachejava.DefaultMustacheFactory;
import com.github.mustachejava.Mustache;
import com.github.mustachejava.MustacheFactory;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/UserCredentialsEmail.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/UserCredentialsEmail.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/UserCredentialsEmail.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.mail;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.entity.WaoUser;
import org.nuiton.i18n.I18n;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.mail;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
import fr.ifremer.wao.entity.WaoUser;
Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java
===================================================================
--- trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoApplicationConfig;
import fr.ifremer.wao.WaoTechnicalException;
import fr.ifremer.wao.WaoTopiaApplicationContext;
Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java
===================================================================
--- trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Preconditions;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/InitWaoServiceTest.java
===================================================================
--- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/InitWaoServiceTest.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/InitWaoServiceTest.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.services.AbstractWaoServiceTest;
import org.junit.Before;
import org.junit.Test;
Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java
===================================================================
--- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.collect.ImmutableSet;
import fr.ifremer.wao.SampleRowsFilter;
import fr.ifremer.wao.entity.SampleRow;
Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/administration/ReferentialServiceTest.java
===================================================================
--- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/administration/ReferentialServiceTest.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/administration/ReferentialServiceTest.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.entity.Boat;
import fr.ifremer.wao.entity.DCF5Code;
import fr.ifremer.wao.services.AbstractWaoServiceTest;
Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/administration/WaoUsersServiceTest.java
===================================================================
--- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/administration/WaoUsersServiceTest.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/administration/WaoUsersServiceTest.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.administration;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.services.AbstractWaoServiceTest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java
===================================================================
--- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service.mail;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.entity.WaoUserImpl;
import fr.ifremer.wao.services.AbstractWaoServiceTest;
import org.junit.Assert;
Modified: trunk/wao-services/src/test/resources/log4j.properties
===================================================================
--- trunk/wao-services/src/test/resources/log4j.properties 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-services/src/test/resources/log4j.properties 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+###
+# #%L
+# Wao :: Services
+# %%
+# Copyright (C) 2009 - 2014 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%
+###
log4j.rootCategory=WARN, console
log4j.appender.console=org.apache.log4j.ConsoleAppender
@@ -9,7 +29,6 @@
### persistence level
# log4j.logger.org.nuiton.topia=TRACE
-# log4j.logger.fr.gouv.social.encahi.extranet.persistence=TRACE
### services level
# log4j.logger.fr.ifremer.wao.services=TRACE
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoWebApplicationContext.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoWebApplicationContext.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoWebApplicationContext.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -2,25 +2,22 @@
/*
* #%L
- * Extranet ENC-AHI :: Web
- * $Id: DefaultWaoWebApplicationContext.java 827 2013-12-04 15:30:35Z bleny $
- * $HeadURL: http://svn.forge.codelutin.com/svn/extranet-enc-ahi/trunk/extranet-web/src/… $
+ * Wao :: Web
* %%
- * Copyright (C) 2013 Ministère des Affaires sociales et de la Santé
+ * Copyright (C) 2009 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
+ * 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 Lesser Public License for more details.
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * 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%
*/
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.WaoApplicationConfig;
import org.nuiton.i18n.I18n;
import org.nuiton.web.struts2.BaseAction;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.opensymphony.xwork2.util.LocalizedTextUtil;
import fr.ifremer.wao.WaoApplicationConfig;
import fr.ifremer.wao.WaoTopiaApplicationContext;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationListener.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationListener.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationListener.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.opensymphony.xwork2.ActionInvocation;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.entity.ObsProgram;
import fr.ifremer.wao.services.AuthenticatedWaoUser;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoRealm.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoRealm.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoRealm.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import fr.ifremer.wao.WaoTechnicalException;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.collect.Lists;
import fr.ifremer.wao.services.AuthenticatedWaoUser;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -2,25 +2,22 @@
/*
* #%L
- * Extranet ENC-AHI :: Web
- * $Id: ExtranetEncAhiStrutsObjectFactory.java 827 2013-12-04 15:30:35Z bleny $
- * $HeadURL: http://svn.forge.codelutin.com/svn/extranet-enc-ahi/trunk/extranet-web/src/… $
+ * Wao :: Web
* %%
- * Copyright (C) 2013 Ministère des Affaires sociales et de la Santé
+ * Copyright (C) 2009 - 2014 Ifremer
* %%
* This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
+ * 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 Lesser Public License for more details.
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * 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%
*/
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.web.WaoJspActionSupport;
import org.apache.struts2.convention.annotation.Result;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.collect.ImmutableSet;
import fr.ifremer.wao.WaoTechnicalException;
import fr.ifremer.wao.services.service.ImportErrorException;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/IndexAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/IndexAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/IndexAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.entity.ObsProgram;
import fr.ifremer.wao.web.WaoJspActionSupport;
import org.apache.struts2.convention.annotation.Result;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/MonthConverter.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/MonthConverter.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/MonthConverter.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.opensymphony.xwork2.conversion.TypeConversionException;
import fr.ifremer.wao.WaoUtils;
import org.apache.commons.lang3.StringUtils;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/AbstractImportReferentialAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/AbstractImportReferentialAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/AbstractImportReferentialAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.administration;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.web.action.AbstractImportCsvAction;
import org.apache.struts2.convention.annotation.Result;
import org.apache.struts2.convention.annotation.Results;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.administration;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.opensymphony.xwork2.Preparable;
import fr.ifremer.wao.entity.Company;
import fr.ifremer.wao.services.service.administration.CompaniesService;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.administration;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.services.service.administration.CompaniesService;
import fr.ifremer.wao.services.service.IllegalDeletionException;
import fr.ifremer.wao.web.WaoJspActionSupport;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteWaoUserAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteWaoUserAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteWaoUserAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.administration;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.services.service.IllegalDeletionException;
import fr.ifremer.wao.services.service.administration.WaoUsersService;
import fr.ifremer.wao.web.WaoJspActionSupport;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.administration;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.opensymphony.xwork2.Preparable;
import fr.ifremer.wao.entity.Company;
import fr.ifremer.wao.services.service.administration.CompaniesService;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.administration;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.administration;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.services.service.ImportErrorException;
import org.nuiton.i18n.I18n;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.administration;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.services.service.ImportErrorException;
import org.nuiton.i18n.I18n;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.administration;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.services.service.ImportErrorException;
import org.nuiton.i18n.I18n;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.administration;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.services.service.ImportErrorException;
import org.nuiton.i18n.I18n;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.administration;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.services.service.ImportErrorException;
import org.nuiton.i18n.I18n;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.administration;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.services.service.ImportErrorException;
import org.nuiton.i18n.I18n;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.administration;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.services.service.ImportErrorException;
import org.nuiton.i18n.I18n;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ReferentialManagementAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ReferentialManagementAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ReferentialManagementAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.administration;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Preconditions;
import com.opensymphony.xwork2.Preparable;
import fr.ifremer.wao.services.service.administration.ReferentialService;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/WaoUsersAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/WaoUsersAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/WaoUsersAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.administration;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.authentication;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.collect.Iterables;
import fr.ifremer.wao.entity.ObsProgram;
import fr.ifremer.wao.entity.UserProfile;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LogoutAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LogoutAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LogoutAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.authentication;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.web.WaoJspActionSupport;
import org.apache.struts2.convention.annotation.Result;
import org.apache.struts2.convention.annotation.Results;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.json;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.web.WaoActionSupport;
public class WaoJsonActionSupport extends WaoActionSupport {
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/CommentSampleRowAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/CommentSampleRowAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/CommentSampleRowAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.obsmer;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Preconditions;
import fr.ifremer.wao.services.service.ObsMerSamplingPlanService;
import fr.ifremer.wao.web.WaoJspActionSupport;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.obsmer;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.services.service.administration.NewsService;
import fr.ifremer.wao.web.WaoJspActionSupport;
import org.apache.struts2.convention.annotation.Result;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.obsmer;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.opensymphony.xwork2.Preparable;
import fr.ifremer.wao.entity.News;
import fr.ifremer.wao.services.service.administration.NewsService;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.obsmer;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.obsmer;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.opensymphony.xwork2.Preparable;
import fr.ifremer.wao.SampleRowsFilter;
import fr.ifremer.wao.services.service.ObsMerSamplingPlanService;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ImportSamplingPlanAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ImportSamplingPlanAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ImportSamplingPlanAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.obsmer;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.services.service.ImportErrorException;
import fr.ifremer.wao.services.service.ObsMerSamplingPlanService;
import fr.ifremer.wao.web.action.AbstractImportCsvAction;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.obsmer;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.entity.News;
import fr.ifremer.wao.services.service.administration.NewsService;
import fr.ifremer.wao.web.WaoJspActionSupport;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowLogAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowLogAction.java 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowLogAction.java 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.web.action.obsmer;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.entity.SampleRow;
import fr.ifremer.wao.services.service.ObsMerSamplingPlanService;
import fr.ifremer.wao.web.WaoJspActionSupport;
Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/entity/SampleRow-conversion.properties
===================================================================
--- trunk/wao-web/src/main/resources/fr/ifremer/wao/entity/SampleRow-conversion.properties 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/resources/fr/ifremer/wao/entity/SampleRow-conversion.properties 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,2 +1,22 @@
+###
+# #%L
+# Wao :: Web
+# %%
+# Copyright (C) 2009 - 2014 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%
+###
periodBegin=fr.ifremer.wao.web.action.MonthConverter
periodEnd=fr.ifremer.wao.web.action.MonthConverter
Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/UpdateSampleRowCommand-conversion.properties
===================================================================
--- trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/UpdateSampleRowCommand-conversion.properties 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/UpdateSampleRowCommand-conversion.properties 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1 +1,21 @@
+###
+# #%L
+# Wao :: Web
+# %%
+# Copyright (C) 2009 - 2014 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%
+###
expectedObservationsByMonths=org.nuiton.web.struts2.converters.JsonConverter
Modified: trunk/wao-web/src/main/resources/log4j.properties
===================================================================
--- trunk/wao-web/src/main/resources/log4j.properties 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/resources/log4j.properties 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+###
+# #%L
+# Wao :: Web
+# %%
+# Copyright (C) 2009 - 2014 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%
+###
log4j.rootCategory=WARN, console
log4j.appender.console=org.apache.log4j.ConsoleAppender
Modified: trunk/wao-web/src/main/resources/struts.properties
===================================================================
--- trunk/wao-web/src/main/resources/struts.properties 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/resources/struts.properties 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,27 +1,23 @@
###
# #%L
-# Extranet ENC-AHI :: Web
-# $Id: struts.properties 841 2013-12-09 14:03:56Z bleny $
-# $HeadURL: http://svn.forge.codelutin.com/svn/extranet-enc-ahi/trunk/extranet-web/src/… $
+# Wao :: Web
# %%
-# Copyright (C) 2013 Ministère des Affaires sociales et de la Santé
+# Copyright (C) 2009 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# 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 Lesser Public License for more details.
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Lesser Public
-# License along with this program. If not, see
-# <http://www.gnu.org/licenses/lgpl-3.0.html>.
+# 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%
###
-
struts.ui.theme=bootstrap
struts.ognl.allowStaticMethodAccess=true
Modified: trunk/wao-web/src/main/resources/struts.xml
===================================================================
--- trunk/wao-web/src/main/resources/struts.xml 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/resources/struts.xml 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,24 +1,21 @@
<!--
#%L
- MagaLiE :: UI
- $Id: struts.xml 865 2013-12-13 10:09:03Z sbavencoff $
- $HeadURL: http://svn.forge.codelutin.com/svn/extranet-enc-ahi/trunk/extranet-web/src/… $
+ Wao :: Web
%%
- Copyright (C) 2013 CodeLutin
+ Copyright (C) 2009 - 2014 Ifremer
%%
This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
+ 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 Lesser Public License for more details.
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Lesser Public
- License along with this program. If not, see
- <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ 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%
-->
<!DOCTYPE struts PUBLIC
Modified: trunk/wao-web/src/main/resources/xwork-conversion.properties
===================================================================
--- trunk/wao-web/src/main/resources/xwork-conversion.properties 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/resources/xwork-conversion.properties 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,26 +1,22 @@
###
# #%L
-# Extranet ENC-AHI :: Web
-# $Id: xwork-conversion.properties 973 2014-01-15 14:05:09Z bleny $
-# $HeadURL: http://svn.forge.codelutin.com/svn/extranet-enc-ahi/trunk/extranet-web/src/… $
+# Wao :: Web
# %%
-# Copyright (C) 2013 Ministère des Affaires sociales et de la Santé
+# Copyright (C) 2009 - 2014 Ifremer
# %%
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# 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 Lesser Public License for more details.
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Lesser Public
-# License along with this program. If not, see
-# <http://www.gnu.org/licenses/lgpl-3.0.html>.
+# 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%
###
-
java.lang.Double=org.nuiton.web.struts2.converters.HundredthLocalNumberConverter
java.lang.Integer=org.nuiton.web.struts2.converters.HundredthLocalNumberConverter
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+<%--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@taglib uri="/struts-tags" prefix="s" %>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-company.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-company.jsp 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-company.jsp 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+<%--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@taglib uri="/struts-tags" prefix="s" %>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+<%--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@taglib uri="/struts-tags" prefix="s" %>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+<%--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@taglib uri="/struts-tags" prefix="s" %>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/wao-users.jsp 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+<%--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@taglib uri="/struts-tags" prefix="s" %>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/authentication/login.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/authentication/login.jsp 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/authentication/login.jsp 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+<%--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@taglib prefix="s" uri="/struts-tags" %>
<%@taglib prefix="sj" uri="/struts-jquery-tags" %>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-news-input.jsp 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+<%--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@taglib uri="/struts-tags" prefix="s" %>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+<%--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@taglib uri="/struts-tags" prefix="s" %>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-sampling-plan-input.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-sampling-plan-input.jsp 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/import-sampling-plan-input.jsp 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+<%--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@taglib uri="/struts-tags" prefix="s" %>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+<%--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@taglib uri="/struts-tags" prefix="s" %>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sample-row-log.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sample-row-log.jsp 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sample-row-log.jsp 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+<%--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@taglib uri="/struts-tags" prefix="s" %>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+<%--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@taglib uri="/struts-tags" prefix="s" %>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+<%--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="sb" uri="/struts-bootstrap-tags" %>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+<%--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="sb" uri="/struts-bootstrap-tags" %>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/version.jsp
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/decorators/version.jsp 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/version.jsp 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,2 +1,22 @@
+<%--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ --%>
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
${project.version}
\ No newline at end of file
Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators.xml
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/decorators.xml 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/decorators.xml 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+<!--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ -->
<decorators defaultdir="/WEB-INF/decorators">
<excludes>
<pattern>/css/*</pattern>
Modified: trunk/wao-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/wao-web/src/main/webapp/WEB-INF/web.xml 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/WEB-INF/web.xml 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,4 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ #%L
+ Wao :: Web
+ %%
+ Copyright (C) 2009 - 2014 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%
+ -->
+
<web-app version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: trunk/wao-web/src/main/webapp/css/wao.css
===================================================================
--- trunk/wao-web/src/main/webapp/css/wao.css 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/css/wao.css 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 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%
+ */
/**
* Le style du layout
*/
Modified: trunk/wao-web/src/main/webapp/js/moment-js-2.5.1/moment-with-langs.js
===================================================================
--- trunk/wao-web/src/main/webapp/js/moment-js-2.5.1/moment-with-langs.js 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/js/moment-js-2.5.1/moment-with-langs.js 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 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%
+ */
//! moment.js
//! version : 2.5.1
//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
Modified: trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2-bootstrap.css
===================================================================
--- trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2-bootstrap.css 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2-bootstrap.css 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 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%
+ */
.form-control .select2-choice {
border: 0;
border-radius: 2px;
Modified: trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2.css
===================================================================
--- trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2.css 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2.css 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,4 +1,24 @@
/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 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%
+ */
+/*
Version: 3.4.5 Timestamp: Mon Nov 4 08:22:42 PST 2013
*/
.select2-container {
Modified: trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2.js
===================================================================
--- trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2.js 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2.js 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,4 +1,24 @@
/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 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%
+ */
+/*
Copyright 2012 Igor Vaynberg
Version: 3.4.5 Timestamp: Mon Nov 4 08:22:42 PST 2013
Modified: trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2.min.js
===================================================================
--- trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2.min.js 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2.min.js 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,4 +1,24 @@
/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 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%
+ */
+/*
Copyright 2012 Igor Vaynberg
Version: 3.4.5 Timestamp: Mon Nov 4 08:22:42 PST 2013
Modified: trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2_locale_fr.js
===================================================================
--- trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2_locale_fr.js 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/js/select2-3.4.5/select2_locale_fr.js 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 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%
+ */
/**
* Select2 French translation
*/
Modified: trunk/wao-web/src/main/webapp/js/wao.js
===================================================================
--- trunk/wao-web/src/main/webapp/js/wao.js 2014-03-25 10:17:24 UTC (rev 1740)
+++ trunk/wao-web/src/main/webapp/js/wao.js 2014-03-25 10:36:04 UTC (rev 1741)
@@ -1,3 +1,23 @@
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 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%
+ */
$(document).ready(function () {
$('select').select2();
1
0
Author: tchemit
Date: 2014-03-25 11:17:24 +0100 (Tue, 25 Mar 2014)
New Revision: 1740
Url: http://forge.codelutin.com/projects/wao/repository/revisions/1740
Log:
fix dependencies
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-03-25 09:54:38 UTC (rev 1739)
+++ trunk/pom.xml 2014-03-25 10:17:24 UTC (rev 1740)
@@ -103,7 +103,7 @@
<h2Version>1.3.175</h2Version>
<struts2Version>2.3.16.1</struts2Version>
<jqueryPluginVersion>3.7.0</jqueryPluginVersion>
- <bootstrapPluginVersion>1.6.1</bootstrapPluginVersion>
+ <bootstrapPluginVersion>1.7.0</bootstrapPluginVersion>
<shiroVersion>1.2.2</shiroVersion>
<slf4jVersion>1.7.6</slf4jVersion>
<hibernateVersion>4.3.1.Final</hibernateVersion>
1
0
r1739 - in trunk/wao-services/src: main/java/fr/ifremer/wao/services/service test/java/fr/ifremer/wao/services/service
by tchemit@users.forge.codelutin.com 25 Mar '14
by tchemit@users.forge.codelutin.com 25 Mar '14
25 Mar '14
Author: tchemit
Date: 2014-03-25 10:54:38 +0100 (Tue, 25 Mar 2014)
New Revision: 1739
Url: http://forge.codelutin.com/projects/wao/repository/revisions/1739
Log:
refs-20 #4483 (fix tests)
Modified:
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java
trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-03-25 09:31:50 UTC (rev 1738)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-03-25 09:54:38 UTC (rev 1739)
@@ -110,6 +110,8 @@
this.highTotalReal = new MutableInt();
this.observationTimesInDaysTotalPlanned = new MutableDouble();
this.observationTimesInDaysTotalActual = new MutableLong();
+ this.totalExpectedForMonths = new TreeMap<>();
+ this.totalRealForMonths = new TreeMap<>();
PeriodDates periodDates = new PeriodDates(sampleRowsFilter.getPeriodFrom(),
sampleRowsFilter.getPeriodTo());
@@ -165,8 +167,8 @@
MutableInt totalExpected = totalExpectedForMonths.get(month);
MutableInt totalReal = totalRealForMonths.get(month);
ObsMerSamplingPlan.ObsMerSamplingPlanStatistics planStatistics =
- new ObsMerSamplingPlan.ObsMerSamplingPlanStatistics(totalExpected.toInteger(),
- totalReal.toInteger());
+ new ObsMerSamplingPlan.ObsMerSamplingPlanStatistics(totalExpected == null ? null : totalExpected.toInteger(),
+ totalReal == null ? null : totalReal.toInteger());
statisticsMap.put(month, planStatistics);
}
Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java
===================================================================
--- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-03-25 09:31:50 UTC (rev 1738)
+++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-03-25 09:54:38 UTC (rev 1739)
@@ -62,23 +62,23 @@
serviceContext.setDate(DateUtil.createDate(15, 5, 2010));
SampleRowsFilter filter = service.newSampleRowsFilter(fixtures.admin());
- List<SampleRow> samplingPlan = service.getSamplingPlan(filter);
+ List<SampleRow> samplingPlan = service.getSamplingPlan(filter).getRows();
Assert.assertEquals(12, samplingPlan.size());
filter = service.newSampleRowsFilter(fixtures.admin());
filter.setFishingGearDcfIds(ImmutableSet.of(fixtures.ptb().getTopiaId()));
- samplingPlan = service.getSamplingPlan(filter);
+ samplingPlan = service.getSamplingPlan(filter).getRows();
Assert.assertEquals(3, samplingPlan.size());
filter = service.newSampleRowsFilter(fixtures.admin());
filter.setTargetSpeciesDcfIds(ImmutableSet.of(fixtures.def().getTopiaId()));
- samplingPlan = service.getSamplingPlan(filter);
+ samplingPlan = service.getSamplingPlan(filter).getRows();
Assert.assertEquals(4, samplingPlan.size());
filter = service.newSampleRowsFilter(fixtures.admin());
filter.setFishingGearDcfIds(ImmutableSet.of(fixtures.ptb().getTopiaId()));
filter.setTargetSpeciesDcfIds(ImmutableSet.of(fixtures.def().getTopiaId()));
- samplingPlan = service.getSamplingPlan(filter);
+ samplingPlan = service.getSamplingPlan(filter).getRows();
Assert.assertEquals(1, samplingPlan.size());
}
1
0
r1738 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service/mail wao-web/src/main/java/fr/ifremer/wao/web
by tchemit@users.forge.codelutin.com 25 Mar '14
by tchemit@users.forge.codelutin.com 25 Mar '14
25 Mar '14
Author: tchemit
Date: 2014-03-25 10:31:50 +0100 (Tue, 25 Mar 2014)
New Revision: 1738
Url: http://forge.codelutin.com/projects/wao/repository/revisions/1738
Log:
use commons-collections4 instead of commons-collections
Modified:
trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-03-25 09:15:32 UTC (rev 1737)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-03-25 09:31:50 UTC (rev 1738)
@@ -25,7 +25,7 @@
package fr.ifremer.wao.entity;
import com.google.common.base.Preconditions;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java 2014-03-25 09:15:32 UTC (rev 1737)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/WaoMail.java 2014-03-25 09:31:50 UTC (rev 1738)
@@ -3,7 +3,7 @@
import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
import fr.ifremer.wao.entity.WaoUser;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
import java.util.Locale;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-03-25 09:15:32 UTC (rev 1737)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-03-25 09:31:50 UTC (rev 1738)
@@ -15,7 +15,7 @@
import fr.ifremer.wao.services.WaoService;
import fr.ifremer.wao.services.WaoServiceContext;
import fr.ifremer.wao.web.action.authentication.LoginAction;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.nuiton.util.beans.BeanUtil;
1
0
r1737 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer
by tchemit@users.forge.codelutin.com 25 Mar '14
by tchemit@users.forge.codelutin.com 25 Mar '14
25 Mar '14
Author: tchemit
Date: 2014-03-25 10:15:32 +0100 (Tue, 25 Mar 2014)
New Revision: 1737
Url: http://forge.codelutin.com/projects/wao/repository/revisions/1737
Log:
refs-20 #4483 (add SamplingPlan Builder)
Added:
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java
Modified:
trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java
trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java
trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java
Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java
===================================================================
--- trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-03-25 09:06:02 UTC (rev 1736)
+++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-03-25 09:15:32 UTC (rev 1737)
@@ -1,5 +1,26 @@
package fr.ifremer.wao;
+/*
+ * #%L
+ * Wao :: Persistence
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.entity.ObsProgram;
import fr.ifremer.wao.entity.ObservationType;
import fr.ifremer.wao.entity.SamplingStrategy;
@@ -47,6 +68,8 @@
protected Set<String> orderByArguments;
+ protected boolean estimatedTides;
+
public ObsProgram getObsProgram() {
return obsProgram;
}
@@ -199,4 +222,11 @@
this.orderByArguments = orderByArguments;
}
+ public boolean isEstimatedTides() {
+ return estimatedTides;
+ }
+
+ public void setEstimatedTides(boolean estimatedTides) {
+ this.estimatedTides = estimatedTides;
+ }
}
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-03-25 09:06:02 UTC (rev 1736)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-03-25 09:15:32 UTC (rev 1737)
@@ -1,5 +1,362 @@
package fr.ifremer.wao.services.service;
-public class ObsMerSamplingPlan {
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+import fr.ifremer.wao.entity.SampleMonth;
+import fr.ifremer.wao.entity.SampleRow;
+
+import java.io.Serializable;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class ObsMerSamplingPlan implements Iterable<ObsMerSamplingPlan.ObsMerSamplingPlanFacadePart>, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * All facades of the sampling plan.
+ */
+ protected List<ObsMerSamplingPlanFacadePart> facades;
+
+ /**
+ * Statistics over the plan by month.
+ */
+ protected Map<Date, ObsMerSamplingPlanStatistics> statisticsMap;
+
+ /**
+ * Total of observation times in days planned.
+ * FIXME Voir si on doit garder un *D*ouble
+ */
+ protected Double observationTimesInDaysTotalPlanned;
+
+ /**
+ * Total of observation times in days actual.
+ * FIXME Voir si on doit garder un *L*ong
+ */
+ protected Long observationTimesInDaysTotalActual;
+
+ /**
+ * ?
+ * FIXME Voir si on doit garder un *I*integer
+ */
+ protected Integer highTotalExpected;
+
+ /**
+ * ?
+ * FIXME Voir si on doit garder un *I*integer
+ */
+ protected Integer highTotalReal;
+
+ /**
+ * List of month used by sample rows.
+ */
+ protected List<Date> months;
+
+ public ObsMerSamplingPlan(List<Date> months,
+ List<ObsMerSamplingPlanFacadePart> facadeParts,
+ Map<Date, ObsMerSamplingPlanStatistics> statisticsMap,
+ Integer highTotalExpected,
+ Integer highTotalReal,
+ Double observationTimesInDaysTotalPlanned,
+ Long observationTimesInDaysTotalActual) {
+ this.months = months;
+ this.facades = facadeParts;
+ this.statisticsMap = statisticsMap;
+ this.observationTimesInDaysTotalPlanned = observationTimesInDaysTotalPlanned;
+ this.observationTimesInDaysTotalActual = observationTimesInDaysTotalActual;
+ this.highTotalExpected = highTotalExpected;
+ this.highTotalReal = highTotalReal;
+ }
+
+ //FIXME Remove this
+ public List<SampleRow> getRows() {
+ List<SampleRow> result = new ArrayList<>();
+ for (ObsMerSamplingPlanFacadePart facade : facades) {
+ for (ObsMerSamplingPlanSectorPart sectors : facade) {
+ for (ObsMerSamplingPlanSampleRowPart row : sectors) {
+ result.add(row.getSampleRow());
+ }
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public Iterator<ObsMerSamplingPlanFacadePart> iterator() {
+ return facades.iterator();
+ }
+
+ public List<Date> getMonths() {
+ return months;
+ }
+
+ public Double getObservationTimesInDaysTotalPlanned() {
+ return observationTimesInDaysTotalPlanned;
+ }
+
+ public Long getObservationTimesInDaysTotalActual() {
+ return observationTimesInDaysTotalActual;
+ }
+
+ public Integer getTotalExpectedForMonth(Date month) {
+ Integer result = statisticsMap.get(month).getTotalExpected();
+ return result;
+ }
+
+ public Integer getTotalRealForMonth(Date month) {
+ Integer result = statisticsMap.get(month).getTotalReal();
+ return result;
+ }
+
+ public String getRatioForMonth(Date month) {
+ String result = statisticsMap.get(month).getRatioForMonth();
+ return result;
+ }
+
+ public Integer getHighTotalExpected() {
+ return highTotalExpected;
+ }
+
+ public Integer getHighTotalReal() {
+ return highTotalReal;
+ }
+
+ public String getHighTotalRatio() {
+ String ratio = "";
+ if (highTotalExpected > 0) {
+ double percent = ((double) highTotalReal / highTotalExpected);
+ ratio = NumberFormat.getPercentInstance().format(percent);
+ }
+ return ratio;
+ }
+
+ /**
+ * All sectors part for a given facade.
+ * <p/>
+ * Created on 3/24/14.
+ *
+ * @author Tony Chemit <chemit(a)codelutin.com>
+ * @since 4.0
+ */
+ public static class ObsMerSamplingPlanFacadePart implements Iterable<ObsMerSamplingPlanSectorPart>, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ protected String facade;
+
+ /**
+ * All sector parts for this facade.
+ */
+ protected Collection<ObsMerSamplingPlanSectorPart> sectors;
+
+ public ObsMerSamplingPlanFacadePart(String facade,
+ Collection<ObsMerSamplingPlanSectorPart> sectors) {
+ this.facade = facade;
+ this.sectors = sectors;
+ }
+
+ public String getFacade() {
+ return facade;
+ }
+
+ @Override
+ public Iterator<ObsMerSamplingPlanSectorPart> iterator() {
+ return sectors.iterator();
+ }
+
+ }
+
+ /**
+ * Contains sample rows of a same sectors.
+ */
+ public static class ObsMerSamplingPlanSectorPart implements Iterable<ObsMerSamplingPlanSampleRowPart>, Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ protected String sectors;
+
+ protected Collection<ObsMerSamplingPlanSampleRowPart> sampleRows;
+
+ public ObsMerSamplingPlanSectorPart(String sectors,
+ Collection<ObsMerSamplingPlanSampleRowPart> sampleRows) {
+ this.sectors = sectors;
+ this.sampleRows = sampleRows;
+ }
+
+ public String getSectors() {
+ return sectors;
+ }
+
+ @Override
+ public Iterator<ObsMerSamplingPlanSampleRowPart> iterator() {
+ return sampleRows.iterator();
+ }
+ }
+
+ protected static final SimpleDateFormat dateFormat = new SimpleDateFormat("MM/yyyy");
+
+ /**
+ * Created on 3/24/14.
+ *
+ * @author Tony Chemit <chemit(a)codelutin.com>
+ * @since 4.0
+ */
+ public static class ObsMerSamplingPlanSampleRowPart implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Boxed sample row.
+ */
+ protected SampleRow sampleRow;
+
+ /**
+ * Times of observation days planned.
+ * <p/>
+ * FIXME Voir si on doit garder un *D*ouble
+ */
+ protected Double observationTimesInDaysPlanned;
+
+ /**
+ * Actual times of observation in days.
+ * <p/>
+ * FIXME Voir si on doit garder un *D*ouble
+ */
+ protected Long observationTimesInDaysActual;
+
+
+ public ObsMerSamplingPlanSampleRowPart(SampleRow sampleRow,
+ Double observationTimesInDaysPlanned,
+ Long observationTimesInDaysActual) {
+ this.sampleRow = sampleRow;
+ this.observationTimesInDaysPlanned = observationTimesInDaysPlanned;
+ this.observationTimesInDaysActual = observationTimesInDaysActual;
+ }
+
+ public SampleRow getSampleRow() {
+ return sampleRow;
+ }
+
+ public Integer getNbTidesExpected(Date month) {
+ Integer result = null;
+ SampleMonth sampleMonth = sampleRow.getSampleMonth(month);
+ if (sampleMonth != null) {
+ result = sampleMonth.getExpectedTidesValue();
+ }
+ return result;
+ }
+
+ public Integer getNbTidesReal(Date month, boolean estimatedTides) {
+ Integer result = null;
+ SampleMonth sampleMonth = sampleRow.getSampleMonth(month);
+ if (sampleMonth != null) {
+ // result = getFilter().getEstimatedTides() ?
+ result = estimatedTides ?
+ sampleMonth.getEstimatedTidesValue() :
+ sampleMonth.getRealTidesValue();
+ }
+ return result;
+ }
+
+ //FIXME Move this in ui ?
+ public String getTotalPercentage() {
+ String result;
+ if (sampleRow.getTotalTidesExpected() > 0) {
+ double percentage = (double) sampleRow.getTotalTidesReal() / (double) sampleRow.getTotalTidesExpected();
+ result = NumberFormat.getPercentInstance().format(percentage);
+ } else {
+ result = "- %";
+ }
+ return result;
+ }
+
+ public Double getObservationTimesInDaysPlanned() {
+ return observationTimesInDaysPlanned;
+ }
+
+ public Long getObservationTimesInDaysActual() {
+ return observationTimesInDaysActual;
+ }
+
+ public boolean hasNbTidesReal(Date month, boolean estimatedTides) {
+ Date current = new Date();
+ boolean validMonth = month.before(current) || isCurrentMonth(month);
+ return validMonth && getNbTidesReal(month, estimatedTides) != null;
+ }
+
+ public boolean isCurrentMonth(Date month) {
+ String currentStr = dateFormat.format(new Date());
+ String monthStr = dateFormat.format(month);
+ return currentStr.equals(monthStr);
+ }
+ }
+
+ public static class ObsMerSamplingPlanStatistics implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Total of expected tides.
+ * <p/>
+ * FIXME Voir si on doit garder un *I*nteger
+ */
+ protected Integer totalExpected;
+
+ /**
+ * Total of real tides.
+ * <p/>
+ * FIXME Voir si on doit garder un *I*nteger
+ */
+ protected Integer totalReal;
+
+ public ObsMerSamplingPlanStatistics(Integer totalExpected, Integer totalReal) {
+ this.totalExpected = totalExpected;
+ this.totalReal = totalReal;
+ }
+
+ public Integer getTotalExpected() {
+ return totalExpected;
+ }
+
+ public Integer getTotalReal() {
+ return totalReal;
+ }
+
+ //FIXME Move this in ui ?
+ public String getRatioForMonth() {
+ String ratio = "-";
+ if (totalExpected != null && totalExpected > 0 &&
+ totalReal != null && totalReal > 0) {
+ double percent = ((double) totalReal / totalExpected);
+ ratio = NumberFormat.getPercentInstance().format(percent);
+ }
+ return ratio;
+ }
+
+ }
}
Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java (rev 0)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java 2014-03-25 09:15:32 UTC (rev 1737)
@@ -0,0 +1,278 @@
+package fr.ifremer.wao.services.service;
+
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+import fr.ifremer.wao.SampleRowsFilter;
+import fr.ifremer.wao.entity.SampleRow;
+import org.apache.commons.lang3.mutable.MutableDouble;
+import org.apache.commons.lang3.mutable.MutableInt;
+import org.apache.commons.lang3.mutable.MutableLong;
+import org.nuiton.util.PeriodDates;
+
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * To build a new {@link ObsMerSamplingPlan} from a {@link SampleRowsFilter}
+ * and some {@link SampleRow}.
+ * <p/>
+ * Created on 3/24/14.
+ *
+ * @author Tony Chemit <chemit(a)codelutin.com>
+ * @since 4.0
+ */
+public class ObsMerSamplingPlanBuilder {
+
+ /**
+ * Incoming filter used.
+ */
+ protected SampleRowsFilter sampleRowsFilter;
+
+ /**
+ * List of month computed from the filter.
+ */
+ protected List<Date> months;
+
+ /**
+ * Dictionnary of facades indexed by their facade name.
+ */
+ protected LinkedHashMap<String, FacadeContext> facadeMap;
+
+ /**
+ * To compute the high total expected.
+ *
+ * @see ObsMerSamplingPlan#highTotalExpected
+ */
+ protected MutableInt highTotalExpected;
+
+ /**
+ * To compute the high total real.
+ *
+ * @see ObsMerSamplingPlan#highTotalReal
+ */
+ protected MutableInt highTotalReal;
+
+ /**
+ * To compute the total of planned observation times in days.
+ *
+ * @see ObsMerSamplingPlan#observationTimesInDaysTotalPlanned
+ */
+ protected MutableDouble observationTimesInDaysTotalPlanned;
+
+ /**
+ * To compute the total of actual observation times in days.
+ *
+ * @see ObsMerSamplingPlan#observationTimesInDaysTotalActual
+ */
+ protected MutableLong observationTimesInDaysTotalActual;
+
+ /**
+ * To compute by month the total of expected tides.
+ *
+ * @see ObsMerSamplingPlan.ObsMerSamplingPlanStatistics#totalExpected
+ */
+ protected Map<Date, MutableInt> totalExpectedForMonths;
+
+ /**
+ * To compute by month the total of real tides.
+ *
+ * @see ObsMerSamplingPlan.ObsMerSamplingPlanStatistics#totalReal
+ */
+ protected Map<Date, MutableInt> totalRealForMonths;
+
+ public ObsMerSamplingPlanBuilder(SampleRowsFilter sampleRowsFilter) {
+ this.sampleRowsFilter = sampleRowsFilter;
+ this.facadeMap = new LinkedHashMap<>();
+ this.highTotalExpected = new MutableInt();
+ this.highTotalReal = new MutableInt();
+ this.observationTimesInDaysTotalPlanned = new MutableDouble();
+ this.observationTimesInDaysTotalActual = new MutableLong();
+
+ PeriodDates periodDates = new PeriodDates(sampleRowsFilter.getPeriodFrom(),
+ sampleRowsFilter.getPeriodTo());
+ this.months = periodDates.getMonths();
+ }
+
+ public ObsMerSamplingPlanBuilder addSampleRow(SampleRow sampleRow,
+ Double observationTimesInDaysPlanned,
+ Long observationTimesInDaysActual) {
+
+ String facade = sampleRow.getFacade();
+ FacadeContext facadeContext = facadeMap.get(facade);
+
+ if (facadeContext == null) {
+
+ // register a new facade
+ facadeContext = new FacadeContext(facade);
+ facadeMap.put(facade, facadeContext);
+ }
+
+ String sectors = sampleRow.getSectors();
+
+ // get sector context
+ ServiceContext sectorPart = facadeContext.getOrAddSectorContext(sectors);
+
+ // add sample row
+ ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart sampleRowPart =
+ sectorPart.addSampleRow(sampleRow,
+ observationTimesInDaysPlanned,
+ observationTimesInDaysActual);
+
+ // update totals
+ updateTotals(sampleRowPart);
+
+ // Sum total observation times in days
+ observationTimesInDaysTotalPlanned.add(observationTimesInDaysPlanned);
+ observationTimesInDaysTotalActual.add(observationTimesInDaysActual);
+
+ return this;
+ }
+
+ public ObsMerSamplingPlan toPlan() {
+
+ LinkedList<ObsMerSamplingPlan.ObsMerSamplingPlanFacadePart> facadeParts = new LinkedList<>();
+ for (FacadeContext facadeContext : facadeMap.values()) {
+ ObsMerSamplingPlan.ObsMerSamplingPlanFacadePart facadePart = facadeContext.toBean();
+ facadeParts.add(facadePart);
+ }
+
+ TreeMap<Date, ObsMerSamplingPlan.ObsMerSamplingPlanStatistics> statisticsMap = new TreeMap<>();
+ for (Date month : months) {
+
+ MutableInt totalExpected = totalExpectedForMonths.get(month);
+ MutableInt totalReal = totalRealForMonths.get(month);
+ ObsMerSamplingPlan.ObsMerSamplingPlanStatistics planStatistics =
+ new ObsMerSamplingPlan.ObsMerSamplingPlanStatistics(totalExpected.toInteger(),
+ totalReal.toInteger());
+ statisticsMap.put(month, planStatistics);
+ }
+
+ ObsMerSamplingPlan result = new ObsMerSamplingPlan(months,
+ facadeParts,
+ statisticsMap,
+ highTotalExpected.toInteger(),
+ highTotalReal.toInteger(),
+ observationTimesInDaysTotalPlanned.toDouble(),
+ observationTimesInDaysTotalActual.toLong());
+ return result;
+ }
+
+ protected void updateTotals(ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart sampleRowPart) {
+ for (Date month : months) {
+
+ Integer expected = sampleRowPart.getNbTidesExpected(month);
+ Integer real = sampleRowPart.getNbTidesReal(month, sampleRowsFilter.isEstimatedTides());
+
+ if (expected != null) {
+
+ MutableInt totalExpected = totalExpectedForMonths.get(month);
+ if (totalExpected == null) {
+ totalExpected = new MutableInt();
+ totalExpectedForMonths.put(month, totalExpected);
+ }
+ totalExpected.add(expected);
+ highTotalExpected.add(totalExpected);
+ }
+
+ if (real != null) {
+ MutableInt totalReal = totalRealForMonths.get(month);
+ if (totalReal == null) {
+ totalReal = new MutableInt();
+ totalRealForMonths.put(month, totalReal);
+ }
+ totalReal.add(real);
+ highTotalReal.add(totalReal);
+ }
+ }
+ }
+
+ protected static class FacadeContext {
+
+ protected String facade;
+
+ protected LinkedHashMap<String, ServiceContext> sectorMap;
+
+ protected FacadeContext(String facade) {
+ this.facade = facade;
+ this.sectorMap = new LinkedHashMap<>();
+ }
+
+ protected ServiceContext getOrAddSectorContext(String sectors) {
+ ServiceContext sectorPart = sectorMap.get(sectors);
+ if (sectorPart == null) {
+
+ // register a new sector
+ sectorPart = new ServiceContext(sectors);
+ sectorMap.put(sectors, sectorPart);
+ }
+ return sectorPart;
+ }
+
+ protected ObsMerSamplingPlan.ObsMerSamplingPlanFacadePart toBean() {
+
+ LinkedList<ObsMerSamplingPlan.ObsMerSamplingPlanSectorPart> sectorParts = new LinkedList<>();
+ for (ServiceContext serviceContext : sectorMap.values()) {
+ ObsMerSamplingPlan.ObsMerSamplingPlanSectorPart sectorPart = serviceContext.toBean();
+ sectorParts.add(sectorPart);
+ }
+ ObsMerSamplingPlan.ObsMerSamplingPlanFacadePart result =
+ new ObsMerSamplingPlan.ObsMerSamplingPlanFacadePart(facade, sectorParts);
+ return result;
+ }
+ }
+
+ protected static class ServiceContext {
+
+ protected String sectors;
+
+ protected LinkedList<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart> rows;
+
+ protected ServiceContext(String sectors) {
+ this.sectors = sectors;
+ rows = new LinkedList<>();
+ }
+
+ protected ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart addSampleRow(SampleRow row,
+ Double observationTimesInDaysPlanned,
+ Long observationTimesInDaysActual) {
+
+ ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart rowPart =
+ new ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart(row,
+ observationTimesInDaysPlanned,
+ observationTimesInDaysActual);
+ rows.add(rowPart);
+
+ return rowPart;
+ }
+
+ protected ObsMerSamplingPlan.ObsMerSamplingPlanSectorPart toBean() {
+
+ ObsMerSamplingPlan.ObsMerSamplingPlanSectorPart result =
+ new ObsMerSamplingPlan.ObsMerSamplingPlanSectorPart(sectors, rows);
+ return result;
+ }
+ }
+}
Property changes on: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanBuilder.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java
===================================================================
--- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-03-25 09:06:02 UTC (rev 1736)
+++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-03-25 09:15:32 UTC (rev 1737)
@@ -1,5 +1,26 @@
package fr.ifremer.wao.services.service;
+/*
+ * #%L
+ * Wao :: Services
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
@@ -216,7 +237,7 @@
for (ElligibleBoat elligibleBoat : sampleRow.getElligibleBoat()) {
Boat boat = elligibleBoat.getBoat();
- boolean isNoLongerActive = ! elligibleBoats.contains(boat);
+ boolean isNoLongerActive = !elligibleBoats.contains(boat);
if (isNoLongerActive) {
if (authenticatedWaoUser.isAdmin()) {
elligibleBoat.setGlobalActive(false);
@@ -280,7 +301,7 @@
List<SampleRow> existingSampleRowsForTheSameCode = dao.forCodeEquals(sampleRow.getCode()).findAll();
if (existingSampleRowsForTheSameCode.size() > 1) {
throw new SampleRowCodeMustBeUniqueException();
- } else if (existingSampleRowsForTheSameCode.size() == 1 && ! Iterables.getOnlyElement(existingSampleRowsForTheSameCode).equals(sampleRow)) {
+ } else if (existingSampleRowsForTheSameCode.size() == 1 && !Iterables.getOnlyElement(existingSampleRowsForTheSameCode).equals(sampleRow)) {
throw new SampleRowCodeMustBeUniqueException();
}
@@ -290,7 +311,7 @@
SampleRow sampleRow = updateSampleRowCommand.getSampleRow();
- if ( ! updateSampleRowCommand.isCreation()) {
+ if (!updateSampleRowCommand.isCreation()) {
SampleRowLog sampleRowLog = updateSampleRowCommand.getSampleRowLog();
getSampleRowLogDao().create(sampleRowLog);
}
@@ -337,7 +358,7 @@
}
- public List<SampleRow> getSamplingPlan(SampleRowsFilter sampleRowsFilter) {
+ public List<SampleRow> getSamplingPlanRows(SampleRowsFilter sampleRowsFilter) {
SampleRowTopiaDao dao = getSampleRowDao();
@@ -345,6 +366,26 @@
}
+ public ObsMerSamplingPlan getSamplingPlan(SampleRowsFilter sampleRowsFilter) {
+
+ SampleRowTopiaDao dao = getSampleRowDao();
+
+ List<SampleRow> sampleRows = dao.findAll(sampleRowsFilter);
+ ObsMerSamplingPlanBuilder builder = new ObsMerSamplingPlanBuilder(sampleRowsFilter);
+ for (SampleRow sampleRow : sampleRows) {
+ //TODO Compute see ServiceSamplingImpl#executeGetObservationTimesInDays
+ Double observationTimesInDaysPlanned = 0d;
+ Long observationTimesInDaysActual = 0l;
+ builder.addSampleRow(sampleRow,
+ observationTimesInDaysPlanned,
+ observationTimesInDaysActual);
+ }
+ ObsMerSamplingPlan result = builder.toPlan();
+
+ return result;
+
+ }
+
public SampleRowsFilter newSampleRowsFilter(AuthenticatedWaoUser authenticatedWaoUser) {
SampleRowsFilter newFilter = new SampleRowsFilter();
@@ -484,7 +525,7 @@
ImportModel<SampleRow> samplingPlanImportModel =
new ObsMerObsVenteSamplingPlanImportExportModel(obsProgram,
- activeCompanies, fishingZones, terrestrialDistricts, referentialService);
+ activeCompanies, fishingZones, terrestrialDistricts, referentialService);
return samplingPlanImportModel;
Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java
===================================================================
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-03-25 09:06:02 UTC (rev 1736)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-03-25 09:15:32 UTC (rev 1737)
@@ -1,7 +1,29 @@
package fr.ifremer.wao.web.action.obsmer;
+/*
+ * #%L
+ * Wao :: Web
+ * %%
+ * Copyright (C) 2009 - 2014 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
import fr.ifremer.wao.SampleRowsFilter;
import fr.ifremer.wao.entity.SampleRow;
+import fr.ifremer.wao.services.service.ObsMerSamplingPlan;
import fr.ifremer.wao.services.service.ObsMerSamplingPlanService;
import fr.ifremer.wao.web.WaoJspActionSupport;
@@ -11,7 +33,7 @@
protected ObsMerSamplingPlanService service;
- protected List<SampleRow> samplingPlan;
+ protected ObsMerSamplingPlan samplingPlan;
public void setService(ObsMerSamplingPlanService service) {
this.service = service;
@@ -29,7 +51,7 @@
}
public List<SampleRow> getSamplingPlan() {
- return samplingPlan;
+ return samplingPlan.getRows();
}
public String getSampleRowToHighlightId() {
1
0
25 Mar '14
Author: tchemit
Date: 2014-03-25 10:06:02 +0100 (Tue, 25 Mar 2014)
New Revision: 1736
Url: http://forge.codelutin.com/projects/wao/repository/revisions/1736
Log:
add log configuration for tests
Added:
trunk/wao-persistence/src/test/resources/log4j.properties
Copied: trunk/wao-persistence/src/test/resources/log4j.properties (from rev 1733, trunk/wao-services/src/test/resources/log4j.properties)
===================================================================
--- trunk/wao-persistence/src/test/resources/log4j.properties (rev 0)
+++ trunk/wao-persistence/src/test/resources/log4j.properties 2014-03-25 09:06:02 UTC (rev 1736)
@@ -0,0 +1,34 @@
+###
+# #%L
+# Wao :: Persistence
+# %%
+# Copyright (C) 2009 - 2014 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%
+###
+log4j.rootCategory=WARN, console
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %M %m%n
+
+# global level
+log4j.logger.fr.ifremer.wao=TRACE
+
+### persistence level
+# log4j.logger.org.nuiton.topia=TRACE
+
+### services level
+# log4j.logger.fr.ifremer.wao.services=TRACE
1
0
r1735 - in trunk: . wao-persistence wao-persistence/src wao-persistence/src/license wao-services wao-services/src wao-services/src/license wao-web wao-web/src wao-web/src/license
by tchemit@users.forge.codelutin.com 25 Mar '14
by tchemit@users.forge.codelutin.com 25 Mar '14
25 Mar '14
Author: tchemit
Date: 2014-03-25 10:03:44 +0100 (Tue, 25 Mar 2014)
New Revision: 1735
Url: http://forge.codelutin.com/projects/wao/repository/revisions/1735
Log:
fix licenses
fix third-parties
fix dependencies
Added:
trunk/wao-persistence/src/license/
trunk/wao-persistence/src/license/THIRD-PARTY.properties
trunk/wao-services/src/license/
trunk/wao-services/src/license/THIRD-PARTY.properties
trunk/wao-web/src/license/
trunk/wao-web/src/license/THIRD-PARTY.properties
Modified:
trunk/LICENSE.txt
trunk/pom.xml
trunk/wao-persistence/LICENSE.txt
trunk/wao-persistence/pom.xml
trunk/wao-services/LICENSE.txt
trunk/wao-services/pom.xml
trunk/wao-web/LICENSE.txt
trunk/wao-web/pom.xml
Modified: trunk/LICENSE.txt
===================================================================
--- trunk/LICENSE.txt 2014-03-24 10:06:46 UTC (rev 1734)
+++ trunk/LICENSE.txt 2014-03-25 09:03:44 UTC (rev 1735)
@@ -658,4 +658,4 @@
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
\ No newline at end of file
+<http://www.gnu.org/licenses/>.
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-03-24 10:06:46 UTC (rev 1734)
+++ trunk/pom.xml 2014-03-25 09:03:44 UTC (rev 1735)
@@ -106,7 +106,7 @@
<bootstrapPluginVersion>1.6.1</bootstrapPluginVersion>
<shiroVersion>1.2.2</shiroVersion>
<slf4jVersion>1.7.6</slf4jVersion>
- <hibernateVersion>4.2.8.Final</hibernateVersion>
+ <hibernateVersion>4.3.1.Final</hibernateVersion>
<mockitoVersion>1.9.5</mockitoVersion>
<postgresqlDriverVersion>9.3-1101-jdbc41</postgresqlDriverVersion>
<commonsEmailVersion>1.3.2</commonsEmailVersion>
@@ -237,6 +237,13 @@
<dependency>
<groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernateVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
<version>${hibernateVersion}</version>
<scope>runtime</scope>
Modified: trunk/wao-persistence/LICENSE.txt
===================================================================
--- trunk/wao-persistence/LICENSE.txt 2014-03-24 10:06:46 UTC (rev 1734)
+++ trunk/wao-persistence/LICENSE.txt 2014-03-25 09:03:44 UTC (rev 1735)
@@ -658,4 +658,4 @@
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
\ No newline at end of file
+<http://www.gnu.org/licenses/>.
Modified: trunk/wao-persistence/pom.xml
===================================================================
--- trunk/wao-persistence/pom.xml 2014-03-24 10:06:46 UTC (rev 1734)
+++ trunk/wao-persistence/pom.xml 2014-03-25 09:03:44 UTC (rev 1735)
@@ -22,11 +22,21 @@
<dependency>
<groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-c3p0</artifactId>
</dependency>
<dependency>
<groupId>org.nuiton</groupId>
+ <artifactId>nuiton-utils</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuiton</groupId>
<artifactId>nuiton-config</artifactId>
</dependency>
Added: trunk/wao-persistence/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/wao-persistence/src/license/THIRD-PARTY.properties (rev 0)
+++ trunk/wao-persistence/src/license/THIRD-PARTY.properties 2014-03-25 09:03:44 UTC (rev 1735)
@@ -0,0 +1,31 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - AL 2.0
+# - Apache License 2.0
+# - Apache License, version 2.0
+# - BSD License
+# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+# - Common Development and Distribution License
+# - Common Public License Version 1.0
+# - Eclipse Distribution License (EDL), Version 1.0
+# - Eclipse Public License (EPL), Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License, Version 2 with the Classpath Exception
+# - GNU Lesser General Public License, Version 2.1
+# - Indiana University Extreme! Lab Software License, vesion 1.1.1
+# - Lesser General Public License (LGPL) v 3.0
+# - Lesser General Public License (LPGL)
+# - Lesser General Public License (LPGL) v 2.1
+# - MIT License
+# - MPL 1.1
+# - New BSD License
+# - Public Domain
+# - The Apache Software License, Version 2.0
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Tue Mar 25 09:09:51 CET 2014
+commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
+dom4j--dom4j--1.6.1=BSD License
Property changes on: trunk/wao-persistence/src/license/THIRD-PARTY.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/wao-services/LICENSE.txt
===================================================================
--- trunk/wao-services/LICENSE.txt 2014-03-24 10:06:46 UTC (rev 1734)
+++ trunk/wao-services/LICENSE.txt 2014-03-25 09:03:44 UTC (rev 1735)
@@ -658,4 +658,4 @@
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
\ No newline at end of file
+<http://www.gnu.org/licenses/>.
Modified: trunk/wao-services/pom.xml
===================================================================
--- trunk/wao-services/pom.xml 2014-03-24 10:06:46 UTC (rev 1734)
+++ trunk/wao-services/pom.xml 2014-03-25 09:03:44 UTC (rev 1735)
@@ -20,10 +20,10 @@
<artifactId>nuiton-csv</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.nuiton</groupId>
<artifactId>nuiton-validator</artifactId>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.nuiton.i18n</groupId>
@@ -31,6 +31,11 @@
</dependency>
<dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-utils</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.github.spullara.mustache.java</groupId>
<artifactId>compiler</artifactId>
</dependency>
@@ -81,10 +86,10 @@
<artifactId>commons-io</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.slf4j</groupId>
Added: trunk/wao-services/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/wao-services/src/license/THIRD-PARTY.properties (rev 0)
+++ trunk/wao-services/src/license/THIRD-PARTY.properties 2014-03-25 09:03:44 UTC (rev 1735)
@@ -0,0 +1,37 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - AL 2.0
+# - Affero General Public License (AGPL)
+# - Apache License 2.0
+# - Apache License, version 2.0
+# - BSD License
+# - CDDL
+# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+# - Common Development and Distribution License
+# - Common Public License Version 1.0
+# - Eclipse Distribution License (EDL), Version 1.0
+# - Eclipse Public License (EPL), Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License, Version 2 with the Classpath Exception
+# - GNU Lesser General Public License, Version 2.1
+# - GNU Library or Lesser General Public License
+# - GPLv2+CE
+# - Indiana University Extreme! Lab Software License, vesion 1.1.1
+# - Lesser General Public License (LGPL) v 3.0
+# - Lesser General Public License (LPGL)
+# - Lesser General Public License (LPGL) v 2.1
+# - MIT License
+# - MPL 1.1
+# - New BSD License
+# - Public Domain
+# - The Apache Software License, Version 2.0
+# - The H2 License, Version 1.0
+# - The MIT License
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Tue Mar 25 09:19:02 CET 2014
+commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
+dom4j--dom4j--1.6.1=BSD License
Property changes on: trunk/wao-services/src/license/THIRD-PARTY.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/wao-web/LICENSE.txt
===================================================================
--- trunk/wao-web/LICENSE.txt 2014-03-24 10:06:46 UTC (rev 1734)
+++ trunk/wao-web/LICENSE.txt 2014-03-25 09:03:44 UTC (rev 1735)
@@ -658,4 +658,4 @@
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
\ No newline at end of file
+<http://www.gnu.org/licenses/>.
Modified: trunk/wao-web/pom.xml
===================================================================
--- trunk/wao-web/pom.xml 2014-03-24 10:06:46 UTC (rev 1734)
+++ trunk/wao-web/pom.xml 2014-03-25 09:03:44 UTC (rev 1735)
@@ -129,6 +129,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-json-plugin</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
@@ -138,7 +139,13 @@
<dependency>
<groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
+ <scope>runtime</scope>
</dependency>
<!-- TODO enable guava caching -->
Added: trunk/wao-web/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/wao-web/src/license/THIRD-PARTY.properties (rev 0)
+++ trunk/wao-web/src/license/THIRD-PARTY.properties 2014-03-25 09:03:44 UTC (rev 1735)
@@ -0,0 +1,38 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - AL 2.0
+# - Affero General Public License (AGPL)
+# - Apache License 2.0
+# - Apache License, version 2.0
+# - BSD License
+# - BSD-style license
+# - CDDL
+# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+# - Common Development and Distribution License
+# - Eclipse Distribution License (EDL), Version 1.0
+# - Eclipse Public License (EPL), Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License, Version 2 with the Classpath Exception
+# - GNU Lesser General Public License, Version 2.1
+# - GNU Library or Lesser General Public License
+# - GPLv2+CE
+# - Indiana University Extreme! Lab Software License, vesion 1.1.1
+# - Lesser General Public License (LGPL) v 3.0
+# - Lesser General Public License (LPGL)
+# - Lesser General Public License (LPGL) v 2.1
+# - MIT License
+# - MPL 1.1
+# - Public Domain
+# - The Apache Software License, Version 1.1
+# - The Apache Software License, Version 2.0
+# - The H2 License, Version 1.0
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Tue Mar 25 09:20:32 CET 2014
+commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
+dom4j--dom4j--1.6.1=BSD License
+javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+oro--oro--2.0.8=The Apache Software License, Version 2.0
Property changes on: trunk/wao-web/src/license/THIRD-PARTY.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
1
0
Author: tchemit
Date: 2014-03-24 11:06:46 +0100 (Mon, 24 Mar 2014)
New Revision: 1734
Url: http://forge.codelutin.com/projects/wao/repository/revisions/1734
Log:
update pom
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-03-20 16:53:39 UTC (rev 1733)
+++ trunk/pom.xml 2014-03-24 10:06:46 UTC (rev 1734)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom4redmine</artifactId>
- <version>4.4</version>
+ <version>5.0.4</version>
</parent>
<groupId>fr.ifremer</groupId>
@@ -15,7 +15,7 @@
<name>Wao</name>
<description>Application pour le suivi contractuels d'observations scientifiques de la pêche</description>
- <url>http://maven-site.forge.codelutin.com/wao</url>
+ <url>http://doc.codelutin.com/wao</url>
<inceptionYear>2009</inceptionYear>
<organization>
<name>Ifremer</name>
@@ -29,7 +29,7 @@
<email>fdesbois(a)codelutin.com</email>
<organization>CodeLutin</organization>
<organizationUrl>http://www.codelutin.com</organizationUrl>
- <timezone>+1</timezone>
+ <timezone>Europe/Paris</timezone>
<roles>
<role>Chef de Projet</role>
<role>Analyste</role>
@@ -42,7 +42,7 @@
<email>chemit(a)codelutin.com</email>
<organization>CodeLutin</organization>
<organizationUrl>http://www.codelutin.com</organizationUrl>
- <timezone>+2</timezone>
+ <timezone>Europe/Paris</timezone>
<roles>
<role>developer</role>
</roles>
@@ -53,7 +53,7 @@
<email>bleny(a)codelutin.com</email>
<organization>CodeLutin</organization>
<organizationUrl>http://www.codelutin.com</organizationUrl>
- <timezone>+2</timezone>
+ <timezone>Europe/Paris</timezone>
<roles>
<role>Développeur</role>
</roles>
@@ -64,7 +64,7 @@
<email>letellier(a)codelutin.com</email>
<organization>CodeLutin</organization>
<organizationUrl>http://www.codelutin.com</organizationUrl>
- <timezone>+2</timezone>
+ <timezone>Europe/Paris</timezone>
<roles>
<role>Développeur</role>
</roles>
@@ -86,9 +86,9 @@
</modules>
<scm>
- <connection>scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk</connection>
- <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk</developerConnection>
- <url>http://forge.codelutin.com/repositories/browse/wao/trunk</url>
+ <connection>scm:svn:http://svn.codelutin.com/wao/trunk</connection>
+ <developerConnection>scm:svn:https://svn.codelutin.com/wao/trunk</developerConnection>
+ <url>https://forge.codelutin.com/repositories/browse/wao/trunk</url>
</scm>
<properties>
@@ -96,24 +96,24 @@
<license.licenseName>agpl_v3</license.licenseName>
<!-- redmine configuration -->
- <platform>forge.codelutin.com</platform>
+ <platform>codelutin.com</platform>
<projectId>wao</projectId>
<!-- versions -->
- <h2Version>1.3.174</h2Version>
- <struts2Version>2.3.15.3</struts2Version>
- <jqueryPluginVersion>3.6.1</jqueryPluginVersion>
+ <h2Version>1.3.175</h2Version>
+ <struts2Version>2.3.16.1</struts2Version>
+ <jqueryPluginVersion>3.7.0</jqueryPluginVersion>
<bootstrapPluginVersion>1.6.1</bootstrapPluginVersion>
<shiroVersion>1.2.2</shiroVersion>
- <slf4jVersion>1.7.5</slf4jVersion>
+ <slf4jVersion>1.7.6</slf4jVersion>
<hibernateVersion>4.2.8.Final</hibernateVersion>
<mockitoVersion>1.9.5</mockitoVersion>
- <postgresqlDriverVersion>9.3-1100-jdbc41</postgresqlDriverVersion>
+ <postgresqlDriverVersion>9.3-1101-jdbc41</postgresqlDriverVersion>
<commonsEmailVersion>1.3.2</commonsEmailVersion>
- <nuitonWebVersion>1.15-SNAPSHOT</nuitonWebVersion>
+ <nuitonWebVersion>1.16</nuitonWebVersion>
<nuitonI18nVersion>3.0</nuitonI18nVersion>
- <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion>
+ <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion>
<nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion>
<nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion>
<eugeneVersion>2.7.3</eugeneVersion>
@@ -128,8 +128,7 @@
<i18n.bundleOutputName>wao</i18n.bundleOutputName>
<!-- Using Java 7 -->
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <javaVersion>1.7</javaVersion>
<signatureArtifactId>java17</signatureArtifactId>
<signatureVersion>1.0</signatureVersion>
</properties>
@@ -137,29 +136,21 @@
<repositories>
<repository>
<id>wao-group</id>
- <name>Wao dependencies</name>
<url>http://nexus.nuiton.org/nexus/content/groups/wao-group/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>wao-nexus-repository</id>
- <name>wao-nexus-repository</name>
- <url>http://nexus.nuiton.org/nexus/content/groups/wao</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
+ <id>wao-group</id>
+ <url>http://nexus.nuiton.org/nexus/content/groups/wao-group</url>
</pluginRepository>
</pluginRepositories>
<!--Distribution-->
<distributionManagement>
<site>
- <id>${platform}</id>
+ <id>doc.${platform}</id>
<url>${our.site.repository}/${projectId}</url>
</site>
</distributionManagement>
1
0