Author: fdesbois Date: 2009-12-23 14:45:03 +0000 (Wed, 23 Dec 2009) New Revision: 152 Added: trunk/suiviobsmer-ui/src/main/webapp/favicon.png trunk/suiviobsmer-ui/src/main/webapp/img/logo-wao-48px.png Removed: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/war/ Modified: trunk/README.txt trunk/pom.xml trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/DataLoader.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/QueryBuilder.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerBusinessException.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerException.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobal.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunner.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/TopiaQuery.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/BoatFilterImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/CompanyBoatInfosImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactState.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactContext.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactContextImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactState.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoardingDone.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoardingExpected.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoatDefinitiveRefused.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoatRefused.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoatUnavailable.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyAccepted.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyLocked.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyRefused.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyUnlocked.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateEnum.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateException.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramAccepted.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramLocked.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramRefused.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramUnlocked.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateStart.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateUnfinished.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/CompanyImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ProfessionImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ProgramImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleRowImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/UserImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImport.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceBoatMock.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceContactMock.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceNewsMock.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceReferentialMock.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceSamplingMock.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceUserMock.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobalTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerUtilsTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/bean/states/ContactContextTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/business/SuiviObsmerRunnerTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatInfosImplTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/ProgramImplTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/SampleRowImplTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImportTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImplTest.java trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java trunk/suiviobsmer-ui/pom.xml trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/BusinessUtils.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/GenericSelectModel.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/SuiviObsmerPage.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/BooleanImage.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/FeedBack.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Layout.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/SubmitContext.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/SuiviObsmerPropertyChangeListener.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/Confirm.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Administration.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/BoatActivityCalendar.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Index.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SamplingHistoric.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SamplingPlan.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/UserProfile.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/AppModule.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/SuiviObsmerManager.java Log: - Use WinstoneLauncher from nuiton-utils 1.1.2 - Update license-header Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/README.txt 2009-12-23 14:45:03 UTC (rev 152) @@ -3,6 +3,8 @@ java -jar suiviobsmer-XXX.war +Note : chargement un peu long... + Default admin user ------------------ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/pom.xml 2009-12-23 14:45:03 UTC (rev 152) @@ -238,7 +238,7 @@ <labs.id>154</labs.id> <!-- libraries version --> - <nuitonutils.version>1.1.2-SNAPSHOT</nuitonutils.version> + <nuitonutils.version>1.1.2</nuitonutils.version> <topia.version>2.3.0-beta-2</topia.version> <license.version>2.0.0</license.version> <helper.version>1.1.0</helper.version> Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/DataLoader.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/DataLoader.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/DataLoader.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/QueryBuilder.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/QueryBuilder.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/QueryBuilder.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerBusinessException.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerBusinessException.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerBusinessException.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerContext.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /** * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerException.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerException.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerException.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobal.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobal.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobal.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunner.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunner.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunner.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/TopiaQuery.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/TopiaQuery.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/TopiaQuery.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/BoatFilterImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/BoatFilterImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/BoatFilterImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/CompanyBoatInfosImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/CompanyBoatInfosImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/CompanyBoatInfosImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactState.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactState.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactState.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactContext.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactContext.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactContext.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactContextImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactContextImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactContextImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactState.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactState.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactState.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoardingDone.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoardingDone.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoardingDone.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoardingExpected.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoardingExpected.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoardingExpected.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoatDefinitiveRefused.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoatDefinitiveRefused.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoatDefinitiveRefused.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoatRefused.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoatRefused.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoatRefused.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoatUnavailable.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoatUnavailable.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateBoatUnavailable.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyAccepted.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyAccepted.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyAccepted.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyLocked.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyLocked.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyLocked.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyRefused.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyRefused.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyRefused.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyUnlocked.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyUnlocked.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateCompanyUnlocked.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateEnum.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateEnum.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateEnum.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateException.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateException.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateException.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramAccepted.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramAccepted.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramAccepted.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramLocked.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramLocked.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramLocked.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramRefused.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramRefused.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramRefused.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramUnlocked.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramUnlocked.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateProgramUnlocked.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateStart.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateStart.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateStart.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateUnfinished.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateUnfinished.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/states/ContactStateUnfinished.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.entity; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.entity; import java.io.Serializable; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.entity; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/CompanyImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/CompanyImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/CompanyImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ContactImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.entity; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ProfessionImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ProfessionImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ProfessionImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ProgramImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ProgramImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/ProgramImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleRowImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleRowImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleRowImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/UserImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/UserImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/UserImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImport.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImport.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImport.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.impl; Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceContactImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/impl/ServiceUserImpl.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceBoatMock.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceBoatMock.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceBoatMock.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceContactMock.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceContactMock.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceContactMock.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceNewsMock.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceNewsMock.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceNewsMock.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceReferentialMock.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceReferentialMock.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceReferentialMock.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceSamplingMock.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceSamplingMock.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceSamplingMock.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceUserMock.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceUserMock.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/mock/ServiceUserMock.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobalTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobalTest.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerGlobalTest.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify @@ -102,4 +102,4 @@ } -} \ No newline at end of file +} Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerUtilsTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerUtilsTest.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/SuiviObsmerUtilsTest.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify @@ -136,4 +136,4 @@ log.debug("topiaId for Company : " + company.getTopiaId()); } -} \ No newline at end of file +} Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/bean/states/ContactContextTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/bean/states/ContactContextTest.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/bean/states/ContactContextTest.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.bean.states; Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/business/SuiviObsmerRunnerTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/business/SuiviObsmerRunnerTest.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/business/SuiviObsmerRunnerTest.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatImplTest.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.entity; Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatInfosImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatInfosImplTest.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/BoatInfosImplTest.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.entity; Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/ProgramImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/ProgramImplTest.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/ProgramImplTest.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify @@ -206,4 +206,4 @@ } -} \ No newline at end of file +} Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/SampleRowImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/SampleRowImplTest.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/entity/SampleRowImplTest.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify @@ -190,4 +190,4 @@ assertEquals(5, result.getRealTidesValue()); } -} \ No newline at end of file +} Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImportTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImportTest.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ActivityCalendarImportTest.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Business + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.impl; Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceBoatImplTest.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify @@ -404,4 +404,4 @@ Assert.assertEquals(2009, result.getYear()); } -} \ No newline at end of file +} Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImplTest.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceReferentialImplTest.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify @@ -116,4 +116,4 @@ assertEquals(6, result); } -} \ No newline at end of file +} Modified: trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java =================================================================== --- trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-business/src/test/java/fr/ifremer/suiviobsmer/impl/ServiceSamplingImplTest.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Business + * SuiviObsmer :: Business * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify @@ -466,4 +466,4 @@ transaction.closeContext(); } -} \ No newline at end of file +} Modified: trunk/suiviobsmer-ui/pom.xml =================================================================== --- trunk/suiviobsmer-ui/pom.xml 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/pom.xml 2009-12-23 14:45:03 UTC (rev 152) @@ -86,41 +86,40 @@ <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> - <build> + <build> <!-- call result war : suiviobsmer-xxx.war --> - <finalName>suiviobsmer-${project.version}</finalName> + <finalName>suiviobsmer-${project.version}</finalName> <!-- Add main class into war to make it executable --> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <version>2.1-beta-1</version> - <configuration> - <webResources> - <resource> - <directory>${basedir}/target/classes</directory> - <includes> - <include>**/war/*</include> - </includes> - </resource> - </webResources> - <!-- for putting Main-Class into war --> - <archive> - <manifest> - <mainClass>fr.ifremer.suiviobsmer.ui.war.SuiviObsmerWarLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> - </plugin> - </plugins> - </build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-beta-1</version> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <type>jar</type> + <includes> + <include>**/war/Winstone*</include> + </includes> + </overlay> + <overlay> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> + </plugin> + </plugins> + </build> <scm> <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/suiviobsmer-ui/?root=suiviobsmer</url> Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/BusinessUtils.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/BusinessUtils.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/BusinessUtils.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/GenericSelectModel.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/GenericSelectModel.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/GenericSelectModel.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /** * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/SuiviObsmerPage.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/SuiviObsmerPage.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/base/SuiviObsmerPage.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/BooleanImage.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/BooleanImage.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/BooleanImage.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify @@ -18,63 +18,63 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * ##%* */ - -package fr.ifremer.suiviobsmer.ui.components; - -import org.apache.tapestry5.BindingConstants; -import org.apache.tapestry5.annotations.Log; -import org.apache.tapestry5.annotations.Parameter; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.slf4j.Logger; - -/** - * BooleanImage - * - * Created: 18 nov. 2009 - * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ -public class BooleanImage { - - @Inject - private Logger log; - - @Parameter(required = true) - private Boolean value; - - @Parameter - private boolean empty; - - @Parameter(defaultPrefix = BindingConstants.LITERAL) - private String trueTitle; - - @Parameter(defaultPrefix = BindingConstants.LITERAL) - private String falseTitle; - - @Parameter(defaultPrefix = BindingConstants.LITERAL) - private String emptyTitle; - - public Boolean getValue() { - return value; - } - - public boolean isEmpty() { - return empty; - } - - public String getTrueTitle() { - return trueTitle == null ? "yes" : trueTitle; - } - - public String getFalseTitle() { - return falseTitle == null ? "no" : falseTitle; - } - - public String getEmptyTitle() { - return emptyTitle == null ? "empty" : emptyTitle; - } -} + +package fr.ifremer.suiviobsmer.ui.components; + +import org.apache.tapestry5.BindingConstants; +import org.apache.tapestry5.annotations.Log; +import org.apache.tapestry5.annotations.Parameter; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.slf4j.Logger; + +/** + * BooleanImage + * + * Created: 18 nov. 2009 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class BooleanImage { + + @Inject + private Logger log; + + @Parameter(required = true) + private Boolean value; + + @Parameter + private boolean empty; + + @Parameter(defaultPrefix = BindingConstants.LITERAL) + private String trueTitle; + + @Parameter(defaultPrefix = BindingConstants.LITERAL) + private String falseTitle; + + @Parameter(defaultPrefix = BindingConstants.LITERAL) + private String emptyTitle; + + public Boolean getValue() { + return value; + } + + public boolean isEmpty() { + return empty; + } + + public String getTrueTitle() { + return trueTitle == null ? "yes" : trueTitle; + } + + public String getFalseTitle() { + return falseTitle == null ? "no" : falseTitle; + } + + public String getEmptyTitle() { + return emptyTitle == null ? "empty" : emptyTitle; + } +} Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/FeedBack.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/FeedBack.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/FeedBack.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,5 +1,5 @@ /* *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Layout.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Layout.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/Layout.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/SubmitContext.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/SubmitContext.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/components/SubmitContext.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/SuiviObsmerPropertyChangeListener.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/SuiviObsmerPropertyChangeListener.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/data/SuiviObsmerPropertyChangeListener.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/Confirm.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/Confirm.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/mixins/Confirm.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,7 @@ /** - * *##% Ca$h Web Interface - * Copyright (C) 2009 CodeLutin + * *##% + * SuiviObsmer :: Web Interface + * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -14,7 +15,8 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. ##%* + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* */ package fr.ifremer.suiviobsmer.ui.mixins; Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Administration.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Administration.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Administration.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/BoatActivityCalendar.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/BoatActivityCalendar.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/BoatActivityCalendar.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,3 +1,23 @@ +/* + * *##% + * SuiviObsmer :: Web Interface + * Copyright (C) 2009 Ifremer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * ##%* + */ package fr.ifremer.suiviobsmer.ui.pages; Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Boats.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Index.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Index.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Index.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify @@ -18,74 +18,74 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * ##%* */ - -package fr.ifremer.suiviobsmer.ui.pages; - -import fr.ifremer.suiviobsmer.SuiviObsmerException; -import fr.ifremer.suiviobsmer.dto.News; -import fr.ifremer.suiviobsmer.services.ServiceNews; -import fr.ifremer.suiviobsmer.ui.base.SuiviObsmerPage; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.List; -import org.apache.tapestry5.annotations.IncludeStylesheet; -import org.apache.tapestry5.annotations.Log; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.ioc.annotations.Inject; - -/** - * Index - * - * Created: 9 nov. 2009 - * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ - at IncludeStylesheet("context:css/news.css") -public class Index implements SuiviObsmerPage { - - @Override - public boolean isOnlyForAdmin() { - return false; - } - - @Inject - private ServiceNews serviceNews; - - @Persist - private List<News> newsList; - - @Property - private News news; - - private DateFormat dateFormat; - - @Log - void setupRender() { - newsList = null; - getNewsList(); - } - - public List<News> getNewsList() { - if (newsList == null) { - try { - newsList = serviceNews.getNews(); - } catch (SuiviObsmerException eee) { - // error db, ... - } - } - return newsList; - } - - public DateFormat getDateFormat() { - if (dateFormat == null) { - dateFormat = new SimpleDateFormat("dd/MM/yyyy"); - } - return dateFormat; - } - -} + +package fr.ifremer.suiviobsmer.ui.pages; + +import fr.ifremer.suiviobsmer.SuiviObsmerException; +import fr.ifremer.suiviobsmer.dto.News; +import fr.ifremer.suiviobsmer.services.ServiceNews; +import fr.ifremer.suiviobsmer.ui.base.SuiviObsmerPage; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.List; +import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Log; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.ioc.annotations.Inject; + +/** + * Index + * + * Created: 9 nov. 2009 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ + at IncludeStylesheet("context:css/news.css") +public class Index implements SuiviObsmerPage { + + @Override + public boolean isOnlyForAdmin() { + return false; + } + + @Inject + private ServiceNews serviceNews; + + @Persist + private List<News> newsList; + + @Property + private News news; + + private DateFormat dateFormat; + + @Log + void setupRender() { + newsList = null; + getNewsList(); + } + + public List<News> getNewsList() { + if (newsList == null) { + try { + newsList = serviceNews.getNews(); + } catch (SuiviObsmerException eee) { + // error db, ... + } + } + return newsList; + } + + public DateFormat getDateFormat() { + if (dateFormat == null) { + dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + } + return dateFormat; + } + +} Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SamplingHistoric.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SamplingHistoric.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SamplingHistoric.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify @@ -18,59 +18,59 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * ##%* */ - -package fr.ifremer.suiviobsmer.ui.pages; - -import fr.ifremer.suiviobsmer.SuiviObsmerException; -import fr.ifremer.suiviobsmer.dto.SamplingHistoricRow; -import fr.ifremer.suiviobsmer.services.ServiceSampling; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.List; -import org.apache.tapestry5.annotations.IncludeStylesheet; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.ioc.annotations.Inject; - -/** - * SamplingHistoric - * - * Created: 13 nov. 2009 - * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ - at IncludeStylesheet("context:css/sampling.css") -public class SamplingHistoric { - - @Inject - private ServiceSampling serviceSampling; - - private List<SamplingHistoricRow> historic; - - @Property - private SamplingHistoricRow historicRow; - - private DateFormat dateFormat; - - public List<SamplingHistoricRow> getHistoric() { - if (historic == null) { - try { - historic = serviceSampling.getHistoric(); - } catch (SuiviObsmerException eee) { - // errors - } - } - return historic; - } - - public DateFormat getDateFormat() { - if (dateFormat == null) { - dateFormat = new SimpleDateFormat("dd/MM/yyyy"); - } - return dateFormat; - } - -} + +package fr.ifremer.suiviobsmer.ui.pages; + +import fr.ifremer.suiviobsmer.SuiviObsmerException; +import fr.ifremer.suiviobsmer.dto.SamplingHistoricRow; +import fr.ifremer.suiviobsmer.services.ServiceSampling; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.List; +import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.ioc.annotations.Inject; + +/** + * SamplingHistoric + * + * Created: 13 nov. 2009 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ + at IncludeStylesheet("context:css/sampling.css") +public class SamplingHistoric { + + @Inject + private ServiceSampling serviceSampling; + + private List<SamplingHistoricRow> historic; + + @Property + private SamplingHistoricRow historicRow; + + private DateFormat dateFormat; + + public List<SamplingHistoricRow> getHistoric() { + if (historic == null) { + try { + historic = serviceSampling.getHistoric(); + } catch (SuiviObsmerException eee) { + // errors + } + } + return historic; + } + + public DateFormat getDateFormat() { + if (dateFormat == null) { + dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + } + return dateFormat; + } + +} Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SamplingPlan.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SamplingPlan.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SamplingPlan.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Synthesis.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify @@ -18,29 +18,29 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * ##%* */ - -package fr.ifremer.suiviobsmer.ui.pages; - -import fr.ifremer.suiviobsmer.ui.base.SuiviObsmerPage; -import org.apache.tapestry5.annotations.IncludeStylesheet; - -/** - * Synthesis - * - * Created: 9 nov. 2009 - * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ - at IncludeStylesheet("context:css/synthesis.css") -public class Synthesis implements SuiviObsmerPage { - - @Override - public boolean isOnlyForAdmin() { - return false; - } - -} + +package fr.ifremer.suiviobsmer.ui.pages; + +import fr.ifremer.suiviobsmer.ui.base.SuiviObsmerPage; +import org.apache.tapestry5.annotations.IncludeStylesheet; + +/** + * Synthesis + * + * Created: 9 nov. 2009 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ + at IncludeStylesheet("context:css/synthesis.css") +public class Synthesis implements SuiviObsmerPage { + + @Override + public boolean isOnlyForAdmin() { + return false; + } + +} Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/UserProfile.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/UserProfile.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/UserProfile.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify @@ -18,92 +18,92 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * ##%* */ - -package fr.ifremer.suiviobsmer.ui.pages; - -import fr.ifremer.suiviobsmer.SuiviObsmerException; -import fr.ifremer.suiviobsmer.entity.User; -import fr.ifremer.suiviobsmer.services.ServiceUser; -import fr.ifremer.suiviobsmer.ui.base.SuiviObsmerPage; -import fr.ifremer.suiviobsmer.ui.components.Layout; -import org.apache.commons.lang.StringUtils; -import org.apache.tapestry5.annotations.IncludeStylesheet; -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.annotations.SessionState; -import org.apache.tapestry5.corelib.components.BeanEditForm; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.slf4j.Logger; - -/** - * UserProfile - * - * Created: 10 nov. 2009 - * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ - at IncludeStylesheet("context:css/userProfile.css") -public class UserProfile implements SuiviObsmerPage { - - @Override - public boolean isOnlyForAdmin() { - return false; - } - - @Inject - private Logger log; - - @Inject - private ServiceUser serviceUser; - - @InjectComponent - private Layout layout; - - @SessionState - private User user; - - private User userEditable; - - @InjectComponent - private BeanEditForm userForm; - - @Property - private String password; - - @Property - private String password2; - - public User getUserEditable() { - if (userEditable == null) { - userEditable = user; - } - return userEditable; - } - - void onSuccessFromUserForm() { - - if (password != null && !password.equals(password2)) { - userForm.recordError("Les deux password ne sont pas identiques, vérifiez la saisie !"); - } else { - try { - if (!StringUtils.isEmpty(password)) { - userEditable.setPassword(password); - } - serviceUser.createUpdateUser(userEditable, false); - layout.getFeedBack().addInfo("Modifications enregistrées avec succès !"); - } catch (SuiviObsmerException eee) { - userForm.recordError(eee.getMessage()); - if (log.isErrorEnabled()) { - log.error("Error during user save", eee); - } - } - } - } - - - -} + +package fr.ifremer.suiviobsmer.ui.pages; + +import fr.ifremer.suiviobsmer.SuiviObsmerException; +import fr.ifremer.suiviobsmer.entity.User; +import fr.ifremer.suiviobsmer.services.ServiceUser; +import fr.ifremer.suiviobsmer.ui.base.SuiviObsmerPage; +import fr.ifremer.suiviobsmer.ui.components.Layout; +import org.apache.commons.lang.StringUtils; +import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.corelib.components.BeanEditForm; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.slf4j.Logger; + +/** + * UserProfile + * + * Created: 10 nov. 2009 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ + at IncludeStylesheet("context:css/userProfile.css") +public class UserProfile implements SuiviObsmerPage { + + @Override + public boolean isOnlyForAdmin() { + return false; + } + + @Inject + private Logger log; + + @Inject + private ServiceUser serviceUser; + + @InjectComponent + private Layout layout; + + @SessionState + private User user; + + private User userEditable; + + @InjectComponent + private BeanEditForm userForm; + + @Property + private String password; + + @Property + private String password2; + + public User getUserEditable() { + if (userEditable == null) { + userEditable = user; + } + return userEditable; + } + + void onSuccessFromUserForm() { + + if (password != null && !password.equals(password2)) { + userForm.recordError("Les deux password ne sont pas identiques, vérifiez la saisie !"); + } else { + try { + if (!StringUtils.isEmpty(password)) { + userEditable.setPassword(password); + } + serviceUser.createUpdateUser(userEditable, false); + layout.getFeedBack().addInfo("Modifications enregistrées avec succès !"); + } catch (SuiviObsmerException eee) { + userForm.recordError(eee.getMessage()); + if (log.isErrorEnabled()) { + log.error("Error during user save", eee); + } + } + } + } + + + +} Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/AppModule.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/AppModule.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/AppModule.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,5 +1,5 @@ /* *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/ContactModelFactory.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/SuiviObsmerManager.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/SuiviObsmerManager.java 2009-12-23 11:08:07 UTC (rev 151) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/services/SuiviObsmerManager.java 2009-12-23 14:45:03 UTC (rev 152) @@ -1,6 +1,6 @@ /* * *##% - * SuiviObsmer Web Interface + * SuiviObsmer :: Web Interface * Copyright (C) 2009 Ifremer * * This program is free software: you can redistribute it and/or modify Added: trunk/suiviobsmer-ui/src/main/webapp/favicon.png =================================================================== (Binary files differ) Property changes on: trunk/suiviobsmer-ui/src/main/webapp/favicon.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/suiviobsmer-ui/src/main/webapp/img/logo-wao-48px.png =================================================================== (Binary files differ) Property changes on: trunk/suiviobsmer-ui/src/main/webapp/img/logo-wao-48px.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream