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

[Suiviobsmer-commits] r463 - in trunk/wao-ui: . src/main/java/fr/ifremer/wao/ui/pages src/main/webapp src/main/webapp/WEB-INF
by fdesbois＠users.labs.libre-entreprise.org 20 Apr '10

20 Apr '10

Author: fdesbois Date: 2010-04-20 00:37:48 +0000 (Tue, 20 Apr 2010) New Revision: 463 Log: - #2246 : Resolve issue on activity Calendar : use boats page context for selected immatriculation in return link. - Add i18n tapestry-bundle goal to retrieve messages from business module. Modified: trunk/wao-ui/pom.xml trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java trunk/wao-ui/src/main/webapp/BoatActivityCalendar.tml trunk/wao-ui/src/main/webapp/WEB-INF/ Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-04-19 23:41:59 UTC (rev 462) +++ trunk/wao-ui/pom.xml 2010-04-20 00:37:48 UTC (rev 463) @@ -107,81 +107,93 @@    - <build> + <build>    - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <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> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>tapestry-bundle</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <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> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.5</version> - <executions> - <execution> - <id>default-client</id> + - </execution> - </executions> - <configuration> - <includes> - <include>**/*Test.java</include> - </includes> - </configuration> - </plugin> + goals><goal>test</goal></goals + </execution> + </executions> + <configuration> + <includes> + <include>**/*Test.java</include> + </includes> + </configuration> + </plugin>--> - </plugins> - </build> + </plugins> + </build> - <repositories> + <repositories>  - <repository> - <id>m2-release-repository.orientimport.kenai.com</id> - <name>Orient Import Oy Maven Release Repository</name> - <url>http://kenai.com/svn/t5-easy-fckeditor~maven-release-repository</url> - <layout>default</layout> - </repository> + <repository> + <id>m2-release-repository.orientimport.kenai.com</id> + <name>Orient Import Oy Maven Release Repository</name> + <url>http://kenai.com/svn/t5-easy-fckeditor~maven-release-repository</url> + <layout>default</layout> + </repository> - <repository> - <id>tapestry</id> - <name>Tapestry Formos</name> - <url>http://tapestry.formos.com/maven-repository</url> - </repository> + <repository> + <id>tapestry</id> + <name>Tapestry Formos</name> + <url>http://tapestry.formos.com/maven-repository</url> + </repository> - </repositories> + </repositories> <scm> <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs…</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> - </scm> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> + </scm> </project> Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java 2010-04-19 23:41:59 UTC (rev 462) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java 2010-04-20 00:37:48 UTC (rev 463) @@ -194,11 +194,15 @@ /*************************** RETURN LINK **********************************/ - @InjectPage - private Boats boatsPage; + public Object[] getBoatsPageContext() { + return new Object[] {null, getBoat().getImmatriculation()}; + } - Object onActionFromReturnToBoats() { - boatsPage.setBoatSelectedImmatriculation(getBoat().getImmatriculation()); - return boatsPage; - } +// @InjectPage +// private Boats boatsPage; +// +// Object onActionFromReturnToBoats() { +// boatsPage.setBoatSelectedImmatriculation(getBoat().getImmatriculation()); +// return boatsPage; +// } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-04-19 23:41:59 UTC (rev 462) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-04-20 00:37:48 UTC (rev 463) @@ -132,7 +132,7 @@ private String sampleRowContextId; /** Selected boat immatriculation for showing boatInfos */ - @Persist("flash") + @Persist(PersistenceConstants.FLASH) private Integer boatSelectedImmatriculation; public Integer getBoatSelectedImmatriculation() { @@ -147,11 +147,17 @@ private FeedBack filterFeedback; void setupRender() throws WaoException { + + if (boatSelectedImmatriculation != null && getBoatSelected() == null) { + layout.addFatal("L'immatriculation " + boatSelectedImmatriculation + + " ne correspond à aucun navire affichable. " + + "Veuillez à enlever cette immatriculation de l'url puis" + + " rechargez la page."); + boatSelectedImmatriculation = null; + } + sampleRow = null; getSampleRow(); - // Profession select reset -// professionSelectModel = null; -// getProfessionSelectModel(); // Manage sampleRow from context if (isSampleRowExists()) { @@ -167,11 +173,13 @@ initSelectFilters(false, false, false); companyBoatInfos = null; - //boatSelectedImmatriculation = null; } void onActivate(EventContext ec) { sampleRowContextId = ec.get(String.class, 0); + if (ec.getCount() > 1) { + boatSelectedImmatriculation = ec.get(Integer.class, 1); + } // boatSelectedImmatriculation = ec.get(Integer.class, 1); } @@ -854,7 +862,8 @@ private BoatActivityCalendar calendarPage; public boolean hasActivityCalendar() throws WaoException { - return getBoatSelected().sizeActivityCalendar() != 0; + return getBoatSelected() != null && + getBoatSelected().sizeActivityCalendar() != 0; } Object onActionFromShowLastActivityCalendar() throws WaoException { Modified: trunk/wao-ui/src/main/webapp/BoatActivityCalendar.tml =================================================================== --- trunk/wao-ui/src/main/webapp/BoatActivityCalendar.tml 2010-04-19 23:41:59 UTC (rev 462) +++ trunk/wao-ui/src/main/webapp/BoatActivityCalendar.tml 2010-04-20 00:37:48 UTC (rev 463) @@ -34,7 +34,7 @@ <t:if t:test="activityCalendar"> <h1>Calendrier d'activité ${activityCalendar.year}</h1> <p class="acenter"> - <a t:type="actionlink" t:id="returnToBoats" class="return" title="Retour sur ${activityCalendar.boat.name}"> + <a t:type="pagelink" t:id="returnToBoats" t:page="boats" t:context="boatsPageContext" class="return" title="Retour sur ${activityCalendar.boat.name}"> <img src="${asset:context:}/img/boat.png" alt="Navire"/>  Revenir sur les informations du navire  <img src="${asset:context:}/img/boat.png" alt="Navire"/> Property changes on: trunk/wao-ui/src/main/webapp/WEB-INF ___________________________________________________________________ Added: svn:ignore + app_fr.properties app_en.properties

1 0

[Suiviobsmer-commits] r462 - in trunk: src/site src/site/rst src/site/rst/admin src/site/rst/coordinator src/site/rst/import src/site/rst/user wao-business/src/main/filters wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/io wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity wao-business/
by tchemit＠users.labs.libre-entreprise.org 19 Apr '10

19 Apr '10

Author: tchemit Date: 2010-04-19 23:41:59 +0000 (Mon, 19 Apr 2010) New Revision: 462 Log: fix file headers (remove redundant svn key words) Modified: trunk/src/site/rst/admin/boats.rst trunk/src/site/rst/admin/contacts.rst trunk/src/site/rst/admin/echantillonage.rst trunk/src/site/rst/admin/firstlaunch.rst trunk/src/site/rst/admin/news.rst trunk/src/site/rst/admin/syntheses.rst trunk/src/site/rst/admin/users.rst trunk/src/site/rst/business-rules.rst trunk/src/site/rst/coordinator.rst trunk/src/site/rst/coordinator/boats.rst trunk/src/site/rst/coordinator/contacts.rst trunk/src/site/rst/coordinator/echantillonage.rst trunk/src/site/rst/coordinator/syntheses.rst trunk/src/site/rst/import/boats.rst trunk/src/site/rst/import/contacts.rst trunk/src/site/rst/import/samplingPlan.rst trunk/src/site/rst/index.rst trunk/src/site/rst/installation.rst trunk/src/site/rst/model.rst trunk/src/site/rst/observer.rst trunk/src/site/rst/usecases.rst trunk/src/site/rst/user.rst trunk/src/site/rst/user/account.rst trunk/src/site/rst/user/authentication.rst trunk/src/site/rst/user/boats.rst trunk/src/site/rst/user/contacts.rst trunk/src/site/rst/user/createAContact.rst trunk/src/site/rst/user/echantillonage.rst trunk/src/site/rst/user/news.rst trunk/src/site/rst/user/syntheses.rst trunk/src/site/site_fr.xml trunk/wao-business/src/main/filters/Wao.properties trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/CompanyBoatInfosImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactAverageReactivityImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStateStatisticsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ImportResultsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserFilterImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityCalendarImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityMonthImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityProfessionImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/CompanyImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactProperty.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/EntityProperty.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneProperty.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthProperty.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowProperty.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ExportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/SamplingExport.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml trunk/wao-business/src/site/rst/index.rst trunk/wao-business/src/site/site_fr.xml trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatInfosImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/GenericSelectModel.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/WaoPage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BooleanImage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Chart.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FeedBack.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AbstractMappedGridDataSource.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BoatDataSource.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BusinessUtils.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ChartUtils.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ContactDataSource.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SynthesisId.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoPropertyChangeListener.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/Confirm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/PopupPageLink.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/ZoneUpdater.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ExceptionReport.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfile.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/BoatActivityCalendar.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfile.properties trunk/wao-ui/src/main/resources/log4j.properties trunk/wao-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties trunk/wao-ui/src/main/webapp/WEB-INF/app.properties trunk/wao-ui/src/main/webapp/WEB-INF/web.xml trunk/wao-ui/src/main/webapp/css/administration.css trunk/wao-ui/src/main/webapp/css/boats.css trunk/wao-ui/src/main/webapp/css/common.css trunk/wao-ui/src/main/webapp/css/contacts.css trunk/wao-ui/src/main/webapp/css/main.css trunk/wao-ui/src/main/webapp/css/news.css trunk/wao-ui/src/main/webapp/css/sampling.css trunk/wao-ui/src/main/webapp/css/synthesis.css trunk/wao-ui/src/main/webapp/css/userProfile.css trunk/wao-ui/src/main/webapp/js/FCKConf.js trunk/wao-ui/src/main/webapp/js/ZoneUpdater.js trunk/wao-ui/src/main/webapp/js/dialog.js trunk/wao-ui/src/main/webapp/js/wao.js trunk/wao-ui/src/site/rst/index.rst trunk/wao-ui/src/site/site_fr.xml trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/DemoModule.java trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.java trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java Modified: trunk/src/site/rst/admin/boats.rst =================================================================== --- trunk/src/site/rst/admin/boats.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/admin/boats.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/admin/contacts.rst =================================================================== --- trunk/src/site/rst/admin/contacts.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/admin/contacts.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/admin/echantillonage.rst =================================================================== --- trunk/src/site/rst/admin/echantillonage.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/admin/echantillonage.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/admin/firstlaunch.rst =================================================================== --- trunk/src/site/rst/admin/firstlaunch.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/admin/firstlaunch.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/admin/news.rst =================================================================== --- trunk/src/site/rst/admin/news.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/admin/news.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/admin/syntheses.rst =================================================================== --- trunk/src/site/rst/admin/syntheses.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/admin/syntheses.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/admin/users.rst =================================================================== --- trunk/src/site/rst/admin/users.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/admin/users.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/business-rules.rst =================================================================== --- trunk/src/site/rst/business-rules.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/business-rules.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/coordinator/boats.rst =================================================================== --- trunk/src/site/rst/coordinator/boats.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/coordinator/boats.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/coordinator/contacts.rst =================================================================== --- trunk/src/site/rst/coordinator/contacts.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/coordinator/contacts.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/coordinator/echantillonage.rst =================================================================== --- trunk/src/site/rst/coordinator/echantillonage.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/coordinator/echantillonage.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/coordinator/syntheses.rst =================================================================== --- trunk/src/site/rst/coordinator/syntheses.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/coordinator/syntheses.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/coordinator.rst =================================================================== --- trunk/src/site/rst/coordinator.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/coordinator.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/import/boats.rst =================================================================== --- trunk/src/site/rst/import/boats.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/import/boats.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/import/contacts.rst =================================================================== --- trunk/src/site/rst/import/contacts.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/import/contacts.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/import/samplingPlan.rst =================================================================== --- trunk/src/site/rst/import/samplingPlan.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/import/samplingPlan.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/index.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/installation.rst =================================================================== --- trunk/src/site/rst/installation.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/installation.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/model.rst =================================================================== --- trunk/src/site/rst/model.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/model.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -8,10 +8,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/observer.rst =================================================================== --- trunk/src/site/rst/observer.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/observer.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/usecases.rst =================================================================== --- trunk/src/site/rst/usecases.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/usecases.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -8,10 +8,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/user/account.rst =================================================================== --- trunk/src/site/rst/user/account.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/user/account.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/user/authentication.rst =================================================================== --- trunk/src/site/rst/user/authentication.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/user/authentication.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/user/boats.rst =================================================================== --- trunk/src/site/rst/user/boats.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/user/boats.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/user/contacts.rst =================================================================== --- trunk/src/site/rst/user/contacts.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/user/contacts.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/user/createAContact.rst =================================================================== --- trunk/src/site/rst/user/createAContact.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/user/createAContact.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/user/echantillonage.rst =================================================================== --- trunk/src/site/rst/user/echantillonage.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/user/echantillonage.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/user/news.rst =================================================================== --- trunk/src/site/rst/user/news.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/user/news.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/user/syntheses.rst =================================================================== --- trunk/src/site/rst/user/syntheses.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/user/syntheses.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/user.rst =================================================================== --- trunk/src/site/rst/user.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/rst/user.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ .. - .. * #%L .. * Wao -.. * .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ +.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/src/site/site_fr.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -3,10 +3,7 @@ #%L Wao - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/filters/Wao.properties 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,8 @@ ### # #%L # Wao :: Business -# -# $Author$ -# $LastChangedDate$ -# $LastChangedRevision$ +# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoBusinessException.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoException.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoProperty.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/CompanyBoatInfosImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/CompanyBoatInfosImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/CompanyBoatInfosImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactAverageReactivityImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactAverageReactivityImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactAverageReactivityImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactState.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStateStatisticsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStateStatisticsImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStateStatisticsImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ImportResultsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ImportResultsImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ImportResultsImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserFilterImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserFilterImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityCalendarImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityCalendarImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityCalendarImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityMonthImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityMonthImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityMonthImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityProfessionImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityProfessionImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ActivityProfessionImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatInfosImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/CompanyImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/CompanyImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/CompanyImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactProperty.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactProperty.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/EntityProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/EntityProperty.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/EntityProperty.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneProperty.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/FishingZoneProperty.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ProfessionImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthProperty.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthProperty.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowProperty.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowProperty.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowProperty.java 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,7 @@ /* * #%L * Wao :: Business - * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ + * * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ExportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ExportHelper.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ExportHelper.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/SamplingExport.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/SamplingExport.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/SamplingExport.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/WaoCsvHeader.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/SuiviObsmerModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/Wao/1.1/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityCalendarImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityMonthImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityProfessionImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ActivityZoneImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/BoatInfosImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/CompanyImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ContactImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ElligibleBoatImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/FishingZoneImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/NewsImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ProfessionImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/SampleRowLogImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/ShipOwnerImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/suiviobsmer/entity/WaoUserImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/0.4/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -4,10 +4,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/site/rst/index.rst =================================================================== --- trunk/wao-business/src/site/rst/index.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/site/rst/index.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ .. * #%L .. * Wao :: Business .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/wao-business/src/site/site_fr.xml =================================================================== --- trunk/wao-business/src/site/site_fr.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/site/site_fr.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -3,10 +3,7 @@ #%L Wao :: Business - $Author$ - $LastChangedDate$ - $LastChangedRevision$ - $Id$ +$Id$ $HeadURL$ %% Copyright (C) 2009 - 2010 Ifremer Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/ErrorDB1_0Test.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatInfosImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatInfosImplTest.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatInfosImplTest.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% @@ -34,8 +31,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * BoatInfosImplTest Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ActivityCalendarImportTest.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceBoatImplTest.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialImplTest.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceReferentialImplTest.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceUserImplTest.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Business * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/GenericSelectModel.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/GenericSelectModel.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/GenericSelectModel.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/WaoPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/WaoPage.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/WaoPage.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BooleanImage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BooleanImage.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/BooleanImage.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Chart.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Chart.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Chart.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FeedBack.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FeedBack.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/FeedBack.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AbstractMappedGridDataSource.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AbstractMappedGridDataSource.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/AbstractMappedGridDataSource.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BoatDataSource.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BoatDataSource.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BoatDataSource.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BusinessUtils.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BusinessUtils.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/BusinessUtils.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ChartUtils.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ChartUtils.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ChartUtils.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ContactDataSource.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ContactDataSource.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ContactDataSource.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/ExportStreamResponse.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SynthesisId.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SynthesisId.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/SynthesisId.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoPropertyChangeListener.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoPropertyChangeListener.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/WaoPropertyChangeListener.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/Confirm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/Confirm.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/Confirm.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/PopupPageLink.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/PopupPageLink.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/PopupPageLink.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/ZoneUpdater.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/ZoneUpdater.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/mixins/ZoneUpdater.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ExceptionReport.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ExceptionReport.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ExceptionReport.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfile.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfile.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfile.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/AppModule.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/Layout.properties 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,8 @@ ### # #%L # Wao :: Web Interface -# -# $Author$ -# $LastChangedDate$ -# $LastChangedRevision$ +# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,8 @@ ### # #%L # Wao :: Web Interface -# -# $Author$ -# $LastChangedDate$ -# $LastChangedRevision$ +# +# # $Id$ # $HeadURL$ # %% @@ -25,23 +23,23 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -fishingZoneCsvFile-label: Fichier CSV des zones de p\u00EAche -companies-label: Liste des soci\u00E9t\u00E9s +fishingZoneCsvFile-label: Fichier CSV des zones de p\u00eache +companies-label: Liste des soci\u00e9t\u00e9s name-label: Nom* address1-label: Adresse -address2-label: Compl\u00E9ment d'adresse +address2-label: Compl\u00e9ment d'adresse postalCode-label: Code postal city-label: Ville -phoneNumber-label: T\u00E9l\u00E9phone +phoneNumber-label: T\u00e9l\u00e9phone email-label: E-mail users-label: Liste des utilisateurs -firstName-label: Pr\u00E9nom* +firstName-label: Pr\u00e9nom* lastName-label: Nom* login-label: Identifiant de connexion (email)* active-label: Actif -generatePassword-label: G\u00E9n\u00E9rer le password -password-label: ou d\u00E9finir manuellement -userRole-label: R\u00F4le +generatePassword-label: G\u00e9n\u00e9rer le password +password-label: ou d\u00e9finir manuellement +userRole-label: R\u00f4le readOnly-label: Lecture seule # UserRole Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/BoatActivityCalendar.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/BoatActivityCalendar.properties 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/BoatActivityCalendar.properties 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,8 @@ ### # #%L # Wao :: Web Interface -# -# $Author$ -# $LastChangedDate$ -# $LastChangedRevision$ +# +# # $Id$ # $HeadURL$ # %% @@ -28,4 +26,4 @@ districtCode-label: Code Quartier name-label: Nom boatLength-label: Taille (m) -buildYear-label: Ann\u00E9e de construction +buildYear-label: Ann\u00e9e de construction Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Boats.properties 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,8 @@ ### # #%L # Wao :: Web Interface -# -# $Author$ -# $LastChangedDate$ -# $LastChangedRevision$ +# +# # $Id$ # $HeadURL$ # %% @@ -26,22 +24,22 @@ # #L% ### boatsCsvFile-label: Fichier CSV des navires -activityCalendarsCsvFile-label: Fichier CSV des calendriers d'activit\u00E9 +activityCalendarsCsvFile-label: Fichier CSV des calendriers d'activit\u00e9 # FILTERS -sampleRow-label: M\u00E9tier -facadeName-label: Fa\u00E7ade +sampleRow-label: M\u00e9tier +facadeName-label: Fa\u00e7ade sectorName-label: Zone -profession-label: M\u00E9tier du plan +profession-label: M\u00e9tier du plan boatName-label: Navire districtCode-label: Quartier name-label: Nom -company-label: Soci\u00E9t\u00E9 +company-label: Soci\u00e9t\u00e9 # BOATS LIST immatriculation-label: Imma. -buildYear-label: Ann\u00E9e +buildYear-label: Ann\u00e9e boatLength-label: Long. # BOAT INFOS @@ -49,17 +47,17 @@ state-label: Etat createdBy-label: Observateur sampleRowCode-label: Code plan -contactFirstName-label: Pr\u00E9nom +contactFirstName-label: Pr\u00e9nom contactLastName-label: Nom -contactPhoneNumber-label: T\u00E9l\u00E9phone +contactPhoneNumber-label: T\u00e9l\u00e9phone contactEmail-label: E-mail contactAddress1-label: Adresse -contactAddress2-label: Compl\u00E9ment d'adresse +contactAddress2-label: Compl\u00e9ment d'adresse contactCity-label: Ville contactPostalCode-label: Code postal -contactPostalCode-validate: Le code postal doit avoir une valeur num\u00E9rique -contactSiret-label: N\u00B0 SIRET +contactPostalCode-validate: Le code postal doit avoir une valeur num\u00e9rique +contactSiret-label: N\u00b0 SIRET shipOwner-label: Armateur fromDate-label: Sollicitations du navire depuis le -dup-label: Capacit\u00E9 d'accueil du navire en personnels sp\u00E9cialis\u00E9s +dup-label: Capacit\u00e9 d'accueil du navire en personnels sp\u00e9cialis\u00e9s comment-label: Commentaire Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,8 @@ ### # #%L # Wao :: Web Interface -# -# $Author$ -# $LastChangedDate$ -# $LastChangedRevision$ +# +# # $Id$ # $HeadURL$ # %% @@ -34,30 +32,30 @@ # Grid labels createdBy-label: Observateur -company-label: Soci\u00E9t\u00E9 -sampleRow-label: M\u00E9tier +company-label: Soci\u00e9t\u00e9 +sampleRow-label: M\u00e9tier boat-label: Navire state-label: Etat -topiaCreateDate-label: Cr\u00E9ation -tideBeginDate-label: D\u00E9but de la mar\u00E9e -tideEndDate-label: Fin de la mar\u00E9e +topiaCreateDate-label: Cr\u00e9ation +tideBeginDate-label: D\u00e9but de la mar\u00e9e +tideEndDate-label: Fin de la mar\u00e9e nbObservants-label: Nb obs. lastState-label: Etat programName-label: Programme boatName-label: Navire -boatImmatriculation-label: N\u00B0 +boatImmatriculation-label: N\u00b0 boatDistrictCode-label: CQ mammals-label: Observations et captures accidentelles -dataInputDate-label: Saisie des donn\u00E9es dans Allegro +dataInputDate-label: Saisie des donn\u00e9es dans Allegro comment-label: Com. program-label: Programme -professionCode-label: Code m\u00E9tier -professionLibelle-label: Libell\u00E9 m\u00E9tier -professionSpecies-label: Esp\u00E8ces cibles -fishingZoneFacade-label: Fa\u00E7ade +professionCode-label: Code m\u00e9tier +professionLibelle-label: Libell\u00e9 m\u00e9tier +professionSpecies-label: Esp\u00e8ces cibles +fishingZoneFacade-label: Fa\u00e7ade fishingZoneSector-label: Zone fishingZoneDivision-label: Division validation-label: Validations # Form labels -contactsForm-errors-banner: Le contact n'a pas \u00E9t\u00E9 sauvegard\u00E9 \u00E0 cause des erreurs suivantes : +contactsForm-errors-banner: Le contact n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts1.properties 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,8 @@ ### # #%L # Wao :: Web Interface -# -# $Author$ -# $LastChangedDate$ -# $LastChangedRevision$ +# +# # $Id$ # $HeadURL$ # %% @@ -28,22 +26,22 @@ # ContactForm labels state-label: Etat boat-label: Navire -tide-label: Mar\u00E9e +tide-label: Mar\u00e9e # Grid labels createdBy-label: Observateur -company-label: Soci\u00E9t\u00E9 -facade-label: Fa\u00E7ade -sector-label: R\u00E9gion -creationDate-label: Cr\u00E9ation -beginTideDate-label: D\u00E9but de la mar\u00E9e -endTideDate-label: Fin de la mar\u00E9e +company-label: Soci\u00e9t\u00e9 +facade-label: Fa\u00e7ade +sector-label: R\u00e9gion +creationDate-label: Cr\u00e9ation +beginTideDate-label: D\u00e9but de la mar\u00e9e +endTideDate-label: Fin de la mar\u00e9e nbObservants-label: Nb obs. lastState-label: Etat programName-label: Programme boatName-label: Navire -boatImmatriculation-label: N\u00B0 +boatImmatriculation-label: N\u00b0 boatDistrictCode-label: CQ -mammals-label: Mammif\u00E8res +mammals-label: Mammif\u00e8res editDate-label: Modification comment-label: Commentaires Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Index.properties 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,8 @@ ### # #%L # Wao :: Web Interface -# -# $Author$ -# $LastChangedDate$ -# $LastChangedRevision$ +# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SampleRowForm.properties 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,8 @@ ### # #%L # Wao :: Web Interface -# -# $Author$ -# $LastChangedDate$ -# $LastChangedRevision$ +# +# # $Id$ # $HeadURL$ # %% @@ -26,29 +24,29 @@ # #L% ### # FOR PROFESSION PART -professionSelect-label: Code m\u00E9tier +professionSelect-label: Code m\u00e9tier codeDCF5-label: Code DCF Niv. 5* meshSize-label: Maillage (mm) size-label: Taille (mm) other-label: Autre information -libelle-label: Libell\u00E9 -species-label: Esp\u00E8ces cibles +libelle-label: Libell\u00e9 +species-label: Esp\u00e8ces cibles # FOR FISHING-ZONE PART -fishingZoneSelect-label: Code zone de p\u00EAche +fishingZoneSelect-label: Code zone de p\u00eache fishingZonesInfos-label: Autre information # FOR PROGRAM/PERIOD PART program-label: Programme -programPeriodBegin-label: P\u00E9riode +programPeriodBegin-label: P\u00e9riode # OTHER code-label: Code de la ligne -company-label: Soci\u00E9t\u00E9 -boats-label: Navires \u00E9ligibles +company-label: Soci\u00e9t\u00e9 +boats-label: Navires \u00e9ligibles nbObservants-label: Nombre d'observateurs -averageTideTime-label: Dur\u00E9e moyenne d'une mar\u00E9e +averageTideTime-label: Dur\u00e9e moyenne d'une mar\u00e9e comment-label: Commentaire sur la ligne # FORM -errors-banner: La ligne n'a pas \u00E9t\u00E9 sauvegard\u00E9 \u00E0 cause des erreurs suivantes : +errors-banner: La ligne n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/SamplingPlan.properties 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,8 @@ ### # #%L # Wao :: Web Interface -# -# $Author$ -# $LastChangedDate$ -# $LastChangedRevision$ +# +# # $Id$ # $HeadURL$ # %% @@ -25,12 +23,12 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -samplingPlanCsvFile-label: Fichier CSV du plan d'\u00E9chantillonnage -periodBegin-label: P\u00E9riode du +samplingPlanCsvFile-label: Fichier CSV du plan d'\u00e9chantillonnage +periodBegin-label: P\u00e9riode du periodEnd-label: Jusqu'au -company-label: Soci\u00E9t\u00E9 +company-label: Soci\u00e9t\u00e9 programName-label: Programme -codeDCF5-label: M\u00E9tier code DCF5 -facadeName-label: Fa\u00E7ade +codeDCF5-label: M\u00e9tier code DCF5 +facadeName-label: Fa\u00e7ade sectorName-label: Zone sampleRow-label: Code ligne Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,8 @@ ### # #%L # Wao :: Web Interface -# -# $Author$ -# $LastChangedDate$ -# $LastChangedRevision$ +# +# # $Id$ # $HeadURL$ # %% @@ -25,19 +23,19 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -periodBegin-label: D\u00E9but +periodBegin-label: D\u00e9but periodEnd-label: Fin boatName-label: Nom -boatImmatriculation-label: N\u00B0 +boatImmatriculation-label: N\u00b0 boatDistrictCode-label: Quartier -facadeName-label: Fa\u00E7ade +facadeName-label: Fa\u00e7ade sectorName-label: Zone sampleRow-label: Code ligne -company-label: Soci\u00E9t\u00E9 +company-label: Soci\u00e9t\u00e9 programName-label: Programme -estimatedTides-label: Voir l'effort d'observations estim\u00E9 +estimatedTides-label: Voir l'effort d'observations estim\u00e9 -companyForBoarding-label: Soci\u00E9t\u00E9 +companyForBoarding-label: Soci\u00e9t\u00e9 periodBeginForContactStates-label: du periodEndForContactStates-label: au @@ -46,9 +44,9 @@ periodEndForAllegroReactivity-label: au # Validation messages -filtersForm-periodBegin-required-message: La date de d\u00E9but est obligatoire +filtersForm-periodBegin-required-message: La date de d\u00e9but est obligatoire filtersForm-periodEnd-required-message: La date de fin est obligatoire -filterPeriodForContactStates-periodBeginForContactStates-required-message: La date de d\u00E9but est obligatoire +filterPeriodForContactStates-periodBeginForContactStates-required-message: La date de d\u00e9but est obligatoire filterPeriodForContactStates-periodEndForContactStates-required-message: La date de fin est obligatoire -#filterPeriodForAllegroReactivity-periodBeginForAllegroReactivity-required-message: La date de d\u00E9but est obligatoire +#filterPeriodForAllegroReactivity-periodBeginForAllegroReactivity-required-message: La date de d\u00e9but est obligatoire #filterPeriodForAllegroReactivity-periodEndForAllegroReactivity-required-message: La date de fin est obligatoire Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfile.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfile.properties 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/UserProfile.properties 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,8 @@ ### # #%L # Wao :: Web Interface -# -# $Author$ -# $LastChangedDate$ -# $LastChangedRevision$ +# +# # $Id$ # $HeadURL$ # %% @@ -25,11 +23,11 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -firstName-label: Pr\u00E9nom +firstName-label: Pr\u00e9nom lastName-label: Nom login-label: Id. connexion (email) -name-label: Pr\u00E9nom et nom -phoneNumber-label: T\u00E9l\u00E9phone +name-label: Pr\u00e9nom et nom +phoneNumber-label: T\u00e9l\u00e9phone password-label: Nouveau mot de passe -password2-label: V\u00E9rification mot de passe +password2-label: V\u00e9rification mot de passe active-label: Actif Modified: trunk/wao-ui/src/main/resources/log4j.properties =================================================================== --- trunk/wao-ui/src/main/resources/log4j.properties 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/resources/log4j.properties 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,8 @@ ### # #%L # Wao :: Web Interface -# -# $Author$ -# $LastChangedDate$ -# $LastChangedRevision$ +# +# # $Id$ # $HeadURL$ # %% Modified: trunk/wao-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties =================================================================== --- trunk/wao-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,8 @@ ### # #%L # Wao :: Web Interface -# -# $Author$ -# $LastChangedDate$ -# $LastChangedRevision$ +# +# # $Id$ # $HeadURL$ # %% @@ -26,12 +24,12 @@ # #L% ### required=Le champs %s est requis. -minimum-string-length=Le champs %2$s doit contenir plus de %1$d caract\u00E8res. -maximum-string-length=Le champs %2$s est limit\u00E9 \u00E0 %1$d caract\u00E8res. -min-integer=Le champs %2$s doit avoir une valeur sup\u00E9rieure \u00E0 %1$d. -max-integer=Le champs %2$s doit avoir une valeur inf\u00E9rieure \u00E0 %1$d. -regexp=Le champs %2$s ne correspond pas \u00E0 l'expression '%1$s'. +minimum-string-length=Le champs %2$s doit contenir plus de %1$d caract\u00e8res. +maximum-string-length=Le champs %2$s est limit\u00e9 \u00e0 %1$d caract\u00e8res. +min-integer=Le champs %2$s doit avoir une valeur sup\u00e9rieure \u00e0 %1$d. +max-integer=Le champs %2$s doit avoir une valeur inf\u00e9rieure \u00e0 %1$d. +regexp=Le champs %2$s ne correspond pas \u00e0 l'expression '%1$s'. invalid-email='%s' n'est pas une adresse email valide. integer-format-exception=Vous devez fournir un nombre entier pour %s. -number-format-exception=Vous devez fournir une valeur num\u00E9rique pour %s. +number-format-exception=Vous devez fournir une valeur num\u00e9rique pour %s. Modified: trunk/wao-ui/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/webapp/WEB-INF/app.properties 2010-04-19 23:41:59 UTC (rev 462) @@ -1,10 +1,8 @@ ### # #%L # Wao :: Web Interface -# -# $Author$ -# $LastChangedDate$ -# $LastChangedRevision$ +# +# # $Id$ # $HeadURL$ # %% @@ -29,9 +27,9 @@ #ContactState enum ContactState.BOAT_UNAVAILABLE: Non abouti -ContactState.BOAT_DEFINITIVE_REFUSED: Refus d\u00E9finitif +ContactState.BOAT_DEFINITIVE_REFUSED: Refus d\u00e9finitif ContactState.BOAT_REFUSED: Refus -ContactState.BOARDING_DONE: Embarquement r\u00E9alis\u00E9 -ContactState.BOARDING_EXPECTED: Embarquement programm\u00E9 +ContactState.BOARDING_DONE: Embarquement r\u00e9alis\u00e9 +ContactState.BOARDING_EXPECTED: Embarquement programm\u00e9 ContactState.CONTACT_START: Contact pris Modified: trunk/wao-ui/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/wao-ui/src/main/webapp/WEB-INF/web.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/webapp/WEB-INF/web.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -3,9 +3,6 @@ #%L Wao :: Web Interface - $Author$ - $LastChangedDate$ - $LastChangedRevision$ $Id$ $HeadURL$ %% Modified: trunk/wao-ui/src/main/webapp/css/administration.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/administration.css 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/webapp/css/administration.css 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/webapp/css/boats.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/boats.css 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/webapp/css/boats.css 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/webapp/css/common.css 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/webapp/css/contacts.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/contacts.css 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/webapp/css/contacts.css 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/webapp/css/main.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/main.css 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/webapp/css/main.css 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/webapp/css/news.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/news.css 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/webapp/css/news.css 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/webapp/css/sampling.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/sampling.css 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/webapp/css/sampling.css 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/webapp/css/synthesis.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/synthesis.css 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/webapp/css/synthesis.css 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/webapp/css/userProfile.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/userProfile.css 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/webapp/css/userProfile.css 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/webapp/js/FCKConf.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/FCKConf.js 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/webapp/js/FCKConf.js 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/webapp/js/ZoneUpdater.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/ZoneUpdater.js 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/webapp/js/ZoneUpdater.js 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/webapp/js/dialog.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/dialog.js 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/webapp/js/dialog.js 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/main/webapp/js/wao.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/wao.js 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/main/webapp/js/wao.js 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/site/rst/index.rst =================================================================== --- trunk/wao-ui/src/site/rst/index.rst 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/site/rst/index.rst 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ .. * #%L .. * Wao :: Web Interface .. * -.. * $Author$ -.. * $LastChangedDate$ -.. * $LastChangedRevision$ .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/wao-ui/src/site/site_fr.xml =================================================================== --- trunk/wao-ui/src/site/site_fr.xml 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/site/site_fr.xml 2010-04-19 23:41:59 UTC (rev 462) @@ -3,9 +3,6 @@ #%L Wao :: Web Interface - $Author$ - $LastChangedDate$ - $LastChangedRevision$ $Id$ $HeadURL$ %% Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/AbstractApplicationTest.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/DemoModule.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/DemoModule.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/DemoModule.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/demo/pages/LayoutDemo.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %% Modified: trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java =================================================================== --- trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java 2010-04-19 23:19:47 UTC (rev 461) +++ trunk/wao-ui/src/test/java/test/fr/ifremer/wao/ui/pages/ConnectionTest.java 2010-04-19 23:41:59 UTC (rev 462) @@ -2,9 +2,6 @@ * #%L * Wao :: Web Interface * - * $Author$ - * $LastChangedDate$ - * $LastChangedRevision$ * $Id$ * $HeadURL$ * %%

1 0

[Suiviobsmer-commits] r461 - trunk/wao-business/src/main/java/fr/ifremer/wao
by fdesbois＠users.labs.libre-entreprise.org 19 Apr '10

19 Apr '10

Author: fdesbois Date: 2010-04-19 23:19:47 +0000 (Mon, 19 Apr 2010) New Revision: 461 Log: Update calcul on realTidesValue, seems to have some erroneous data. Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-04-19 22:29:26 UTC (rev 460) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-04-19 23:19:47 UTC (rev 461) @@ -85,11 +85,11 @@ @Override protected void createSampleMonthEstimatedTidesColumn_1_2b(List<String> queries) { queries.add("ALTER TABLE SampleMonth ADD estimatedTidesValue INTEGER;"); + // Calculate estimatedTidesValue for all existing contacts // estimatedTidesValue = nbContacts with state BOARDING_DONE // sampleRows must match + tideBeginDate must match with periodDate - queries.add("UPDATE SampleMonth S SET " + - "estimatedTidesValue = (" + + String subquery = " SELECT COUNT(*) FROM Contact C" + " WHERE C.sampleRow = S.sampleRow" + " AND C.state = " + ContactState.BOARDING_DONE.ordinal() + @@ -98,8 +98,13 @@ " AND date_part('year', C.tideBeginDate) = " + "date_part('year', S.periodDate)" + " AND (C.validationProgram != FALSE OR " + - " C.validationProgram IS NULL)" + - "), " + + " C.validationProgram IS NULL)"; + + queries.add("UPDATE SampleMonth S SET " + + "estimatedTidesValue = (" + subquery + "), " + + // Recalcul realTides (may have erroneous data) + "realTidesValue = (" + subquery + + " AND C.validationCompany = TRUE" + "), " + "topiaVersion = S.topiaVersion + 1;"); }

1 0

[Suiviobsmer-commits] r460 - trunk
by fdesbois＠users.labs.libre-entreprise.org 19 Apr '10

19 Apr '10

Author: fdesbois Date: 2010-04-19 22:29:26 +0000 (Mon, 19 Apr 2010) New Revision: 460 Log: Update changelog Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-04-19 22:24:09 UTC (rev 459) +++ trunk/changelog.txt 2010-04-19 22:29:26 UTC (rev 460) @@ -9,6 +9,8 @@ Evolutions ++++++++++ +- [fdesbois] Evo #2100 : Pouvoir voir le réaliser sans que les lignes conatct + soient validée par la société. - [fdesbois] Evo #2244 : Ajout infos CNIL dans le pied de page. - [fdesbois] Evo #2060 : Dans la partie contact des informations privées du navire, ajouter les champs Adresse (code postal + ville + adresse) et N° SIRET.

1 0

[Suiviobsmer-commits] r459 - in trunk: wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by fdesbois＠users.labs.libre-entreprise.org 19 Apr '10

19 Apr '10

Author: fdesbois Date: 2010-04-19 22:24:09 +0000 (Mon, 19 Apr 2010) New Revision: 459 Log: Evo #2100 : View modification to display estimatedTides (in samplingFilter) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties trunk/wao-ui/src/main/webapp/SamplingPlan.tml trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/FacadeRowImpl.java 2010-04-19 22:24:09 UTC (rev 459) @@ -69,7 +69,7 @@ } // Prepare data by month : calculate tides (real/expected) and remove // unused months for period - row.prepareDataByMonth(period); + row.prepareDataByMonth(period, estimatedTides); // Add the row to the list rows.add(row); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-04-19 22:24:09 UTC (rev 459) @@ -120,7 +120,7 @@ } @Override - public void prepareDataByMonth(PeriodDates period) { + public void prepareDataByMonth(PeriodDates period, boolean estimated) { // Do not call this method outside a TopiaContext, will not work // because of lazy initialization over sampleMonth. Also this // calcul need to be done when data for sampleRows is loading. @@ -133,7 +133,8 @@ SampleMonth curr = it.next(); if (period == null || period.between(curr.getPeriodDate())) { totalTidesExpected += curr.getExpectedTidesValue(); - totalTidesReal += curr.getRealTidesValue(); + totalTidesReal += estimated ? curr.getEstimatedTidesValue() : + curr.getRealTidesValue(); String date = monthFormat.format(curr.getPeriodDate()); sampleMonthMap.put(date, curr); } else { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-19 22:24:09 UTC (rev 459) @@ -277,6 +277,7 @@ SamplingFilter filter, Company company) throws TopiaException { FacadeRow result = new FacadeRowImpl(); + result.setEstimatedTides(filter.getEstimatedTides()); result.setPeriod(filter.getPeriod()); SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-04-19 22:24:09 UTC (rev 459) @@ -131,9 +131,11 @@ SampleMonthDAO dao = WaoDAOHelper.getSampleMonthDAO(transaction); String periodDate = "M." + SampleMonth.PERIOD_DATE; + String realTidesProperty = filter.getEstimatedTides() ? + SampleMonth.ESTIMATED_TIDES_VALUE : SampleMonth.REAL_TIDES_VALUE; TopiaQuery query = dao.createQuery("M"). setSelect(periodDate). - addSelect("SUM(M." + SampleMonth.REAL_TIDES_VALUE + ")"). + addSelect("SUM(M." + realTidesProperty + ")"). addSelect("SUM(M." + SampleMonth.EXPECTED_TIDES_VALUE + ")"). add(periodDate + " BETWEEN :fromDate AND :thruDate"). addParam("fromDate", period.getFromDate()). Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java 2010-04-19 22:24:09 UTC (rev 459) @@ -391,7 +391,9 @@ Integer result = null; SampleMonth sampleMonth = row.getSampleMonth(month); if (sampleMonth != null) { - result = sampleMonth.getRealTidesValue(); + result = getFilter().getEstimatedTides() ? + sampleMonth.getEstimatedTidesValue() : + sampleMonth.getRealTidesValue(); } return result; } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2010-04-19 22:24:09 UTC (rev 459) @@ -202,7 +202,9 @@ List<SortedMap<Date, Integer>> res = serviceSynthesis.getDataSampling(getFilter()); Map<String, Map<?, Integer>> data = new HashMap<String, Map<?, Integer>>(); data.put("Planifié", res.get(0)); - data.put("Réalisé", res.get(1)); + String realText = + getFilter().getEstimatedTides() ? "Estimé" : "Réalisé"; + data.put(realText, res.get(1)); String title = BusinessUtils.getDataSamplingTitle(getFilter()); return ChartUtils.createCategoryChart(title, "Nb marées", "Mois", getDataSamplingChartType(), data); } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Synthesis.properties 2010-04-19 22:24:09 UTC (rev 459) @@ -35,6 +35,7 @@ sampleRow-label: Code ligne company-label: Soci\u00E9t\u00E9 programName-label: Programme +estimatedTides-label: Voir l'effort d'observations estim\u00E9 companyForBoarding-label: Soci\u00E9t\u00E9 Modified: trunk/wao-ui/src/main/webapp/SamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-ui/src/main/webapp/SamplingPlan.tml 2010-04-19 22:24:09 UTC (rev 459) @@ -60,8 +60,8 @@ <img src="${asset:context:img/true-22px.png}" alt="Effort d'observations réalisé pour contacts validés" title="Afficher l'effort d'observations réalisé pour les contacts validés seulement" /> <p:else> - <img src="${asset:context:img/help-22px.png}" alt="Effort d'observations réalisé pour contacts terminés" - title="Afficher l'effort d'observations réalisé pour les contacts validés + celui estimé pour les contacts non validés" /> + <img src="${asset:context:img/help-22px.png}" alt="Effort d'observations estimé pour contacts terminés" + title="Afficher l'effort d'observations estimé pour les contacts validés ou non par la société" /> </p:else> </t:if> </a> Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-04-19 21:56:02 UTC (rev 458) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2010-04-19 22:24:09 UTC (rev 459) @@ -113,9 +113,14 @@ title="Rafraîchir les métiers en fonction de la zone sélectionnée"/>  <t:label t:for="sampleRow" />: <input t:type="select" t:id="sampleRow" t:model="sampleRowSelectModel" value="sampleRowId" /> +  </div> + <div class="filterRow"> + <input t:type="checkbox" t:id="estimatedTides" value="filter.estimatedTides" /> + <t:label t:for="estimatedTides" title="L'effort d'observations estimé équivaut au nombre de contacts validés ou non par la société. Les contacts refusés par le programme ne sont pas pris en compte" /> + </div> <div class="t-beaneditor-row aright"> <input t:type="submit" class="ico search-32px" t:id="search" value="Search" title="Création du graphique en fonction des filtres saisies"/>  <input t:type="submit" class="ico undo" t:id="reset" value="Reset" title="Remettre les filtres par défaut" />

1 0

[Suiviobsmer-commits] r458 - trunk/wao-business/src/main/java/fr/ifremer/wao
by fdesbois＠users.labs.libre-entreprise.org 19 Apr '10

19 Apr '10

Author: fdesbois Date: 2010-04-19 21:56:02 +0000 (Mon, 19 Apr 2010) New Revision: 458 Log: Evo #2100 : Correct migration query for validationProgram constraint Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-04-19 21:44:50 UTC (rev 457) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-04-19 21:56:02 UTC (rev 458) @@ -97,7 +97,8 @@ "date_part('month', S.periodDate)" + " AND date_part('year', C.tideBeginDate) = " + "date_part('year', S.periodDate)" + - " AND C.validationProgram != FALSE" + + " AND (C.validationProgram != FALSE OR " + + " C.validationProgram IS NULL)" + "), " + "topiaVersion = S.topiaVersion + 1;"); }

1 0

[Suiviobsmer-commits] r457 - trunk/wao-business/src/main/java/fr/ifremer/wao/bean
by fdesbois＠users.labs.libre-entreprise.org 19 Apr '10

19 Apr '10

Author: fdesbois Date: 2010-04-19 21:44:50 +0000 (Mon, 19 Apr 2010) New Revision: 457 Log: Evo #2059 : Code DCF5 filter is less restrictive (using LIKE and %) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2010-04-19 21:28:10 UTC (rev 456) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterImpl.java 2010-04-19 21:44:50 UTC (rev 457) @@ -134,7 +134,7 @@ TopiaQuery.getProperty(sampleRow, SampleRow.PROFESSION, Profession.CODE_DCF5); - query.add(codeDCF5Prop, getCodeDCF5()); + query.add(codeDCF5Prop, Op.LIKE, "%" + getCodeDCF5() + "%"); } // Program filter

1 0

[Suiviobsmer-commits] r456 - in trunk/wao-business/src: main/java/fr/ifremer/wao main/java/fr/ifremer/wao/bean main/java/fr/ifremer/wao/service test/java/fr/ifremer/wao/service
by fdesbois＠users.labs.libre-entreprise.org 19 Apr '10

19 Apr '10

Author: fdesbois Date: 2010-04-19 21:28:10 +0000 (Mon, 19 Apr 2010) New Revision: 456 Log: Evo #2100 : Add specific case to manage estimated tides when programValidation becomes FALSE or not Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-04-19 19:59:47 UTC (rev 455) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-04-19 21:28:10 UTC (rev 456) @@ -97,6 +97,7 @@ "date_part('month', S.periodDate)" + " AND date_part('year', C.tideBeginDate) = " + "date_part('year', S.periodDate)" + + " AND C.validationProgram != FALSE" + "), " + "topiaVersion = S.topiaVersion + 1;"); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-04-19 19:59:47 UTC (rev 455) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-04-19 21:28:10 UTC (rev 456) @@ -272,6 +272,26 @@ return contactValidate; } + public boolean isRefused() { + Boolean oldValidationProgram = oldContact != null ? + oldContact.getValidationProgram() : null; + Boolean newValidationProgram = newContact != null ? + newContact.getValidationProgram() : null; + + return BooleanUtils.isNotFalse(oldValidationProgram) && + BooleanUtils.isFalse(newValidationProgram); + } + + public boolean isNoMoreRefused() { + Boolean oldValidationProgram = oldContact != null ? + oldContact.getValidationProgram() : null; + Boolean newValidationProgram = newContact != null ? + newContact.getValidationProgram() : null; + + return BooleanUtils.isFalse(oldValidationProgram) && + BooleanUtils.isNotFalse(newValidationProgram); + } + /** * Return true if contact state is {@link ContactState#BOARDING_DONE} * depends on {@code context}. To check oldContact state, use Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-19 19:59:47 UTC (rev 455) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-19 21:28:10 UTC (rev 456) @@ -57,6 +57,7 @@ import fr.ifremer.wao.entity.*; import fr.ifremer.wao.io.*; import fr.ifremer.wao.io.WaoCsvHeader.*; +import org.apache.commons.lang.BooleanUtils; import org.nuiton.util.beans.BinderBuilder; import org.nuiton.util.beans.BinderProvider; @@ -588,6 +589,15 @@ * <li>UPDATE : both {@code oldContact} and {@code contact} are defined</li> * <li>DELETE : {@code oldContact} is defined and {@code contact} = null</li> * </ul> + * <p> + * <strong>Estimated Tides value</strong> = nbContacts with BOARDING_DONE + * state and not refused by program (validationProgram != FALSE) + * </p> + * <p> + * <strong>Real Tides value</strong> = nbContacts accepted by company + * (validationCompany = TRUE) and not refused by program + * (validationProgram != FALSE) + * </p> * * @param transaction used to update the SampleMonth * @param oldContact old state of the contact @@ -631,7 +641,11 @@ // decrement real tides oldMonth.addRealTideTime(-1); } - if (status.isOldContactDone()) { + // Decrement estimated only if old state is BOARDING_DONE + // and old validationProgram is NOT FALSE + // the estimated value has already been decremented during refused + if (status.isOldContactDone() && + BooleanUtils.isNotFalse(oldContact.getValidationProgram())) { // decrement estimated tides oldMonth.addEstimatedTideTime(-1); } @@ -646,10 +660,20 @@ if (status.isNewContactValidate()) { // increment real tides sampleMonth.addRealTideTime(1); + // validationProgram becomes not FALSE, estimatedTides must be + // incremented + if (status.isNoMoreRefused()) { + sampleMonth.addEstimatedTideTime(1); + } // never decrement if tideBeginDate has changed } else if (status.isOldContactValidate() && !tideBeginDateChanged) { // decrement real tides sampleMonth.addRealTideTime(-1); + // validationProgram becomes FALSE, estimatedTides must be + // decremented + if (status.isRefused()) { + sampleMonth.addEstimatedTideTime(-1); + } } } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-04-19 19:59:47 UTC (rev 455) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-04-19 21:28:10 UTC (rev 456) @@ -410,6 +410,86 @@ } } + @Test + public void testDecrementSampleMonthContactRefused() + throws TopiaException, NullSampleMonthException { + logger.info("testDecrementSampleMonthContactRefused"); + + /** PREPARE DATA **/ + prepareData(false, false); + + // contactReference as the same tideBeginDate and sampleRow as contact + Date tideBeginDate = new Date(contact.getTideBeginDate().getTime()); + when(contactReference.getTideBeginDate()).thenReturn(tideBeginDate); + when(contactReference.getSampleRow()).thenReturn(sampleRow); + + // Initialize correct old status in contactReference + when(contactReference.getValidationCompany()).thenReturn(Boolean.TRUE); + when(contactReference.getContactState()). + thenReturn(ContactState.BOARDING_DONE); + when(contactReference.getValidationProgram()).thenReturn(null); + + + // Initialize data in sampleMonth + TopiaContext transaction = manager.getContext().beginTransaction(); + try { + SampleMonthDAO dao = WaoDAOHelper.getSampleMonthDAO(transaction); + + sampleMonth.addEstimatedTideTime(1); + sampleMonth.addRealTideTime(1); + + dao.update(sampleMonth); + + transaction.commitTransaction(); + } finally { + transaction.closeContext(); + } + + // both estimated and real as value = 1 + checkTidesValue(1, false); + checkTidesValue(1, true); + + /** EXEC METHOD **/ + logger.info("test 1 : validationProgram null -> FALSE, estimated -1" + + " and real -1"); + transaction = manager.getContext().beginTransaction(); + try { + when(contact.getValidationCompany()).thenReturn(Boolean.TRUE); + when(contact.getContactState()). + thenReturn(ContactState.BOARDING_DONE); + when(contact.getValidationProgram()).thenReturn(Boolean.FALSE); + + service.updateSampleMonthTidesValue(transaction, contactReference, + contact, true); + + transaction.commitTransaction(); + } finally { + transaction.closeContext(); + } + + checkTidesValue(0, false); + checkTidesValue(0, true); + + logger.info("test 2 : validationProgram FALSE -> null, estimated +1" + + " and real +1"); + transaction = manager.getContext().beginTransaction(); + try { + when(contactReference.getValidationProgram()). + thenReturn(Boolean.FALSE); + when(contact.getValidationProgram()).thenReturn(null); + + service.updateSampleMonthTidesValue(transaction, contactReference, + contact, true); + + transaction.commitTransaction(); + } finally { + transaction.closeContext(); + } + + checkTidesValue(1, false); + checkTidesValue(1, true); + } + protected void checkTidesValue(int expected, boolean real) throws TopiaException { TopiaContext transaction = manager.getContext().beginTransaction();

1 0

[Suiviobsmer-commits] r455 - in trunk: wao-business/src/main/java/fr/ifremer/wao wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/xmi wao-business/src/test/java/fr/ifremer/wao/entity wao-business/src/test/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/pages
by fdesbois＠users.labs.libre-entreprise.org 19 Apr '10

19 Apr '10

Author: fdesbois Date: 2010-04-19 19:59:47 +0000 (Mon, 19 Apr 2010) New Revision: 455 Log: Evo #2100 : - Migration done (new column + calcul for estimated values) - ContactStatus class to manage property change on Contact (contactState, tideBeginDate, validations) - Remove deprecated methods in SampleRow (calcul is done in ServiceContact) Added: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-04-19 13:15:21 UTC (rev 454) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-04-19 19:59:47 UTC (rev 455) @@ -85,8 +85,20 @@ @Override protected void createSampleMonthEstimatedTidesColumn_1_2b(List<String> queries) { queries.add("ALTER TABLE SampleMonth ADD estimatedTidesValue INTEGER;"); - // TODO : calculate estimatedTidesValue for all existing contacts + // Calculate estimatedTidesValue for all existing contacts // estimatedTidesValue = nbContacts with state BOARDING_DONE + // sampleRows must match + tideBeginDate must match with periodDate + queries.add("UPDATE SampleMonth S SET " + + "estimatedTidesValue = (" + + " SELECT COUNT(*) FROM Contact C" + + " WHERE C.sampleRow = S.sampleRow" + + " AND C.state = " + ContactState.BOARDING_DONE.ordinal() + + " AND date_part('month', C.tideBeginDate) = " + + "date_part('month', S.periodDate)" + + " AND date_part('year', C.tideBeginDate) = " + + "date_part('year', S.periodDate)" + + "), " + + "topiaVersion = S.topiaVersion + 1;"); } } Added: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-04-19 19:59:47 UTC (rev 455) @@ -0,0 +1,321 @@ + +package fr.ifremer.wao.bean; + +import fr.ifremer.wao.WaoDAOHelper; +import fr.ifremer.wao.entity.Contact; +import fr.ifremer.wao.entity.SampleMonth; +import fr.ifremer.wao.entity.SampleMonthDAO; +import fr.ifremer.wao.entity.SampleRow; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import org.apache.commons.lang.BooleanUtils; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaQuery; +import org.nuiton.util.PeriodDates; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * This class is used to know status changed between an old contact and a new + * one (new change to apply). There is three different cases for constructor + * parameters : + * <ul> + * <li>CREATE : olContact is null and newContact is defined</li> + * <li>UPDATE : both oldContact and newContact are defined</li> + * <li>DELETE : oldContact is defined and newContact is null</li> + * </ul> + * Three fields of contact are considered to be changed for sampleMonth calcul + * on tides value : + * <ul> + * <li> + * STATE : check the change on {@link ContactState#BOARDING_DONE} state. + * Use {@link #isContactDoneChanged() } method to check the change. + * This change is important to manage estimated tides value on sampleMonth + * referenced by the contact retrieve with {@link #getSampleMonth(TopiaContext)} + * </li> + * <li> + * VALIDATION : check the change on validationCompany and validationProgram. + * Use {@link #isContactValidateChanged() } method to check the change. + * This change is important to manage real tides value on sampleMonth + * referenced by the contact retrieve with {@link #getSampleMonth(TopiaContext)} + * </li> + * <li> + * TIDE BEGIN DATE : check the change on tideBeginDate month. + * Use {@link #isTideBeginDateMonthChanged() } method to check the change. + * This change is important to manage both estimated and real tides value on + * the old sampleMonth referenced by the old contact retrieve with + * {@link #getOldSampleMonth(TopiaContext)} + * </ul> + * + * + * Created: 19 avr. 2010 + * + * @author fdesbois + */ +public class ContactStatus { + + private static final Logger logger = + LoggerFactory.getLogger(ContactStatus.class); + + protected Contact oldContact; + + protected Contact newContact; + + protected SampleRow sampleRow; + + protected SampleMonth oldSampleMonth; + + protected SampleMonth sampleMonth; + + public ContactStatus(Contact old, Contact contact) { + this.oldContact = old; + this.newContact = contact; + this.sampleRow = contact != null ? + newContact.getSampleRow() : oldContact.getSampleRow(); + } + + public boolean isOldContactValidate() { + return isContactValidate(Context.OLD); + } + + public boolean isNewContactValidate() { + return isContactValidate(Context.NEW); + } + + /** + * Return true if oldContact validate is not the same as newContact + * validate. + * + * @return true if contact validate has changed. + * @see #isContactValidate(Context) + */ + public boolean isContactValidateChanged() { + return isOldContactValidate() != isNewContactValidate(); + } + + public boolean isOldContactDone() { + return isContactDone(Context.OLD); + } + + public boolean isNewContactDone() { + return isContactDone(Context.NEW); + } + + /** + * Return true if oldContact state is not the same as newContact state. + * Check only for {@link ContactState#BOARDING_DONE} changed. + * + * @return true if contact state has changed. + * @see #isContactDone(Context) + */ + public boolean isContactDoneChanged() { + return isOldContactDone() != isNewContactDone(); + } + + /** + * Return true if tideBeginDate has changed its month between oldContact + * and newContact. The both oldContact and newContact dates must be not + * null. + * + * @return true if tideBeginDate status changed + */ + public boolean isTideBeginDateMonthChanged() { + if (oldContact == null || newContact == null) { + return false; + } + DateFormat dateFormat = new SimpleDateFormat("MM/yyyy"); + Date oldTideBeginDate = oldContact.getTideBeginDate(); + Date newTideBeginDate = newContact.getTideBeginDate(); + // Only if old not null and new not null + if (oldTideBeginDate != null && newTideBeginDate != null) { + String oldTideBeginStr = dateFormat.format(oldTideBeginDate); + String newTideBeginStr = dateFormat.format(newTideBeginDate); + return !oldTideBeginStr.equals(newTideBeginStr); + } + return false; + } + + public SampleRow getSampleRow() { + return sampleRow; + } + + /** + * Retrive the old SampleMonth referenced by the tideBeginDate of the + * old contact. + * + * @param transaction to retrieve the sampleMonth from database + * @return the sampleMonth found or throw NullSampleMonthException + * @throws TopiaException + * @throws NullSampleMonthException + */ + public SampleMonth getOldSampleMonth(TopiaContext transaction) + throws TopiaException, NullSampleMonthException { + if (oldSampleMonth == null) { + oldSampleMonth = getExistingSampleMonth(transaction, Context.OLD); + } + return oldSampleMonth; + } + + /** + * Retrive the SampleMonth referenced by the tideBeginDate of the + * new contact. + * + * @param transaction to retrieve the sampleMonth from database + * @return the sampleMonth found or throw NullSampleMonthException + * @throws TopiaException + * @throws NullSampleMonthException + */ + public SampleMonth getSampleMonth(TopiaContext transaction) + throws TopiaException, NullSampleMonthException { + if (sampleMonth == null) { + sampleMonth = getExistingSampleMonth(transaction, Context.NEW); + } + return sampleMonth; + } + + /** + * This exception is used to indicate that a problem is occured during + * retrieving sampleMonth corresponding to a contact. + * Used in {@link fr.ifremer.wao.service.ServiceContact} + */ + public static final class NullSampleMonthException extends Exception { + + private static final long serialVersionUID = 1L; + + public NullSampleMonthException(String message) { + super(message); + } + } + + protected enum Context { + OLD, NEW; + } + + /** + * Retrieve existing sampleMonth corresponding to the contact. The + * sampleMonth must match with contact sampleRow, also the tideBeginDate + * (day) of the contact must match the sampleMonth periodDate (month). + * + * @param transaction used to find the sampleMonth + * @param context OLD or NEW + * @return the sampleMonth found if exists, or NullSampleMonthException + * will be thrown + * @throws TopiaException + * @throws NullSampleMonthException if month was not found + */ + protected SampleMonth getExistingSampleMonth(TopiaContext transaction, + Context context) throws TopiaException, NullSampleMonthException { + + // Reference date for query + Date tideBeginDate = null; + + switch(context) { + case OLD: tideBeginDate = oldContact.getTideBeginDate(); break; + // newContact may be null in CREATE case, so we use the previous + // one + case NEW: tideBeginDate = newContact != null ? + newContact.getTideBeginDate() : oldContact.getTideBeginDate(); + } + + SampleMonthDAO monthDAO = WaoDAOHelper.getSampleMonthDAO(transaction); + TopiaQuery query = monthDAO.createQuery(); + + PeriodDates period = new PeriodDates(tideBeginDate, tideBeginDate); + period.initDayOfMonthExtremities(); + + // Bind sampleMonth.sampleRow with contact sampleRow + query.add(SampleMonth.SAMPLE_ROW, sampleRow). + add(SampleMonth.PERIOD_DATE + " BETWEEN :fromDate AND :thruDate"). + addParam("fromDate", period.getFromDate()). + addParam("thruDate", period.getThruDate()); + //add(SampleMonth.PERIOD_DATE, period); + SampleMonth result = monthDAO.findByQuery(query); + if (result == null) { + throw new NullSampleMonthException("Aucun mois correspondant pour" + + " la ligne du plan d'échantillonnage " + + sampleRow.getCode() + + " et la date de début de marée du contact " + + tideBeginDate); + } + return result; + } + + /** + * Return true if contact is validate depends on {@code context}. The + * oldContact validation will be tested for an {@link Context#OLD} context + * and the newContact will be tested for a {@link Context#NEW} context. + * The validation is tested as validationCompany must be TRUE and + * validationProgram must be not FALSE (otherwise TRUE or NULL). + * + * @param context to check the good contact + * @return true depends on validationCompany and validationProgram of + * the contact (oldContact or newContact depends on context in argument). + */ + protected boolean isContactValidate(Context context) { + Contact contact = context == Context.OLD ? oldContact : newContact; + + Boolean validationCompany = contact != null ? + contact.getValidationCompany() : null; + Boolean validationProgram = contact != null ? + contact.getValidationProgram() : null; + + if (logger.isTraceEnabled()) { + logger.trace(context + " validation company = " + validationCompany + + " _ validation program = " + validationProgram); + } + + boolean contactValidate = + BooleanUtils.isTrue(validationCompany) && + BooleanUtils.isNotFalse(validationProgram); + return contactValidate; + } + + /** + * Return true if contact state is {@link ContactState#BOARDING_DONE} + * depends on {@code context}. To check oldContact state, use + * {@link Context#OLD} and to check newContact state, use + * {@link Context#NEW}. A null contact will return false. + * + * @param context to check the good contact + * @return true if the contact state is {@link ContactState#BOARDING_DONE} + */ + protected boolean isContactDone(Context context) { + Contact contact = context == Context.OLD ? oldContact : newContact; + ContactState contactState = contact != null ? + contact.getContactState() : null; + + if (logger.isTraceEnabled()) { + logger.trace(context + " contact state = " + contactState); + } + boolean contactDone = ContactState.BOARDING_DONE.equals(contactState); + return contactDone; + } + + @Override + public String toString() { + DateFormat dateFormat = new SimpleDateFormat("MM/yyyy"); + String oldMonth = oldContact != null && + oldContact.getTideBeginDate() != null ? + dateFormat.format(oldContact.getTideBeginDate()) : ""; + + String newMonth = newContact != null && + newContact.getTideBeginDate() != null ? + dateFormat.format(newContact.getTideBeginDate()) : ""; + + StringBuilder builder = + new StringBuilder("\nContactStatus : VALIDATE :: "). + append("oldValidate = ").append(isOldContactValidate()). + append(" _ newValidate = ").append(isNewContactValidate()). + append("\nContactStatus : CONTACT_STATE :: "). + append("oldDone = ").append(isOldContactDone()). + append(" _ newDone = ").append(isNewContactDone()). + append("\nContactStatus : TIDE_BEGIN_DATE :: "). + append("oldMonth = ").append(oldMonth). + append(" _ newMonth = ").append(newMonth). + append(" _ changed = ").append(isTideBeginDateMonthChanged()); + + return builder.toString(); + } +} Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java 2010-04-19 13:15:21 UTC (rev 454) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java 2010-04-19 19:59:47 UTC (rev 455) @@ -59,40 +59,59 @@ * remove time with a negative nbDays. * If nbDays is negative and superior to the current value, * the real tides value will be set to 0. + * * @param nbDays to add or remove (if negative) - * @throws WaoException for saving problem - * @deprecated the realTideTime will be automatically update on contact - * change */ @Override - @Deprecated - public void addRealTideTime(int nbDays) throws WaoException { - TopiaContext transaction = null; - try { - transaction = WaoUtils.beginTransaction(); + public void addRealTideTime(int nbDays) { +// TopiaContext transaction = null; +// try { +// transaction = WaoUtils.beginTransaction(); +// +// SampleMonthDAO dao = WaoDAOHelper.getSampleMonthDAO(transaction); +// SampleMonth month = dao.findByTopiaId(getTopiaId()); +// int result = month.getRealTidesValue() + nbDays; +// if (result < 0) { +// result = 0; +// } +// +// month.setRealTidesValue(result); +// if (log.isDebugEnabled()) { +// log.debug("Change realTideTime from " + +// month.getRealTidesValue() + " to " + result); +// } +// +// transaction.commitTransaction(); +// //transaction.closeContext(); +// } catch (Exception eee) { +// WaoUtils.treateError(transaction, eee, +// I18n.n_("wao.error.sampleMonth.addRealTideTime"), +// formatMonth(), getSampleRow().getCode()); +// } finally { +// WaoUtils.closeTransaction(transaction); +// } + int result = getRealTidesValue() + nbDays; + if (result < 0) { + result = 0; + } + if (log.isDebugEnabled()) { + log.debug("Change realTides : " + getRealTidesValue() + + " -> " + result + " _ date = " + periodDate); + } + setRealTidesValue(result); + } - SampleMonthDAO dao = WaoDAOHelper.getSampleMonthDAO(transaction); - SampleMonth month = dao.findByTopiaId(getTopiaId()); - int result = month.getRealTidesValue() + nbDays; - if (result < 0) { - result = 0; - } - - month.setRealTidesValue(result); - if (log.isDebugEnabled()) { - log.debug("Change realTideTime from " + - month.getRealTidesValue() + " to " + result); - } - - transaction.commitTransaction(); - //transaction.closeContext(); - } catch (Exception eee) { - WaoUtils.treateError(transaction, eee, - I18n.n_("wao.error.sampleMonth.addRealTideTime"), - formatMonth(), getSampleRow().getCode()); - } finally { - WaoUtils.closeTransaction(transaction); + @Override + public void addEstimatedTideTime(int nbDays) { + int result = getEstimatedTidesValue() + nbDays; + if (result < 0) { + result = 0; } + if (log.isDebugEnabled()) { + log.debug("Change estimatedTides : " + getEstimatedTidesValue() + + " -> " + result + " _ date = " + periodDate); + } + setEstimatedTidesValue(result); } @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-04-19 13:15:21 UTC (rev 454) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2010-04-19 19:59:47 UTC (rev 455) @@ -159,18 +159,6 @@ } /** - * Return the first fishingZone of the list linked with the SampleRow. - * @return a FishingZone or null if there is no fishingZone linked with the SampleRow - */ -// @Override -// public FishingZone getFirstFishingZone() { -// if (getFishingZone().size() > 0) { -// return getFishingZone().get(0); -// } -// return null; -// } - - /** * Get the facade of the sampleRow. The row has normally only one facade in the FishingZone list. * * @return the facade name of the row @@ -288,42 +276,6 @@ } @Override - @Deprecated - public boolean addRealTideTime(Contact contact) throws WaoException { - if (contact.getTideEndDate() == null || - contact.getTideBeginDate() == null) { - return false; - } - //int nbDays = contact.getTideNbDays(); //getDifferenceDays(contact); - SampleMonth month = getSampleMonth(contact.getTideBeginDate()); - if (month == null) { - return false; - } - if (log.isTraceEnabled()) { - log.trace("Add 1 tide for " + month.formatMonth() + - " [" + this.getCode() + "]"); - } - month.addRealTideTime(1); - return true; - } - - @Override - @Deprecated - public void removeRealTideTime(Contact contact) throws WaoException { - if (contact.getTideEndDate() == null || - contact.getTideBeginDate() == null) { - return; - } - //int nbDays = contact.getTideNbDays(); //getDifferenceDays(contact); - SampleMonth month = getSampleMonth(contact.getTideBeginDate()); - if (log.isTraceEnabled()) { - log.trace("Remove 1 tide for " + month.formatMonth() + - " [" + this.getCode() + "]"); - } - month.addRealTideTime(-1); - } - - @Override public void setPeriod(PeriodDates period) { period.initDayOfMonthExtremities(); setPeriodBegin(period.getFromDate()); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-19 13:15:21 UTC (rev 454) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-19 19:59:47 UTC (rev 455) @@ -41,7 +41,6 @@ import java.util.Map; import com.csvreader.CsvReader; import com.csvreader.CsvWriter; -import org.apache.commons.lang.BooleanUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.nuiton.topia.TopiaContext; @@ -49,6 +48,8 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.framework.TopiaQuery; import fr.ifremer.wao.*; +import fr.ifremer.wao.bean.ContactStatus; +import fr.ifremer.wao.bean.ContactStatus.NullSampleMonthException; import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ImportResults; @@ -56,8 +57,6 @@ import fr.ifremer.wao.entity.*; import fr.ifremer.wao.io.*; import fr.ifremer.wao.io.WaoCsvHeader.*; -import org.apache.commons.lang.StringUtils; -import org.nuiton.util.PeriodDates; import org.nuiton.util.beans.BinderBuilder; import org.nuiton.util.beans.BinderProvider; @@ -184,6 +183,11 @@ //context.prepareTopiaId(Contact.class, contact); if (delete) { + // Need to decrement estimated value if contactFound has + // BOARDING_DONE state and may be real value (normally not allowed) + updateSampleMonthTidesValue(transaction, contactFound, null, true); + + // Execute delete dao.delete(contactFound); } else { createOrUpdateContact(dao, contact, contactFound, true); @@ -578,11 +582,16 @@ * estimated is update when contact state {@link ContactState#BOARDING_DONE} * is changed. The real is update when contact validationCompany is changed. * The {@code calculateReal} flag determines if the real tides has to be - * calculated or not. + * calculated or not. Three cases : + * <ul> + * <li>CREATE : {@code oldContact} = null and {@code contact} is defined</li> + * <li>UPDATE : both {@code oldContact} and {@code contact} are defined</li> + * <li>DELETE : {@code oldContact} is defined and {@code contact} = null</li> + * </ul> * * @param transaction used to update the SampleMonth * @param oldContact old state of the contact - * @param contact changed + * @param contact changed can be null for delete case * @param calculateReal to calculate real tides value * @throws TopiaException * @throws NullSampleMonthException if SampleMonth can't be found @@ -592,164 +601,75 @@ Contact contact, boolean calculateReal) throws TopiaException, NullSampleMonthException { - SampleMonthDAO monthDAO = WaoDAOHelper.getSampleMonthDAO(transaction); + if (oldContact == null && contact == null) { + throw new IllegalArgumentException("Both contact and oldContact" + + " can't be null to update sampleMonth tides value"); + } + // Instantiate contact status which provide status on oldContact and + // contact changes + ContactStatus status = new ContactStatus(oldContact, contact); + if (log.isDebugEnabled()) { - log.debug("oldState = " + (oldContact != null ? - oldContact.getContactState() : "null") + - " _ newState = " + contact.getContactState()); + log.debug(status.toString()); } - boolean oldContactDone = oldContact != null && - oldContact.getContactState().equals(ContactState.BOARDING_DONE); + // Month of TideBeginDate has changed, must decrement values on + // old sampleMonth + boolean tideBeginDateChanged = false; + if (oldContact != null && contact != null && + status.isTideBeginDateMonthChanged()) { - boolean newContactDone = contact.getContactState(). - equals(ContactState.BOARDING_DONE); + tideBeginDateChanged = status.isTideBeginDateMonthChanged(); - boolean contactStateChanged = oldContact == null || - !contact.getContactState().equals(oldContact.getContactState()); + // Retrieve oldMonth from status + // Must exists otherwise the oldContact couln't have been saved + SampleMonth oldMonth = status.getOldSampleMonth(transaction); - SampleMonth sampleMonth = null; - // Estimated tides calcul - if ((oldContactDone || newContactDone) && contactStateChanged) { - if (log.isDebugEnabled()) { - log.debug("Calculate estimated tides value for date : " + - contact.getTideBeginDate()); + // Apply changes on oldMonth + if (status.isOldContactValidate()) { + // decrement real tides + oldMonth.addRealTideTime(-1); } - - sampleMonth = getExistingSampleMonthForContact(monthDAO, contact); - - if (oldContactDone) { - // dec estimatedTides - int estimated = sampleMonth.getEstimatedTidesValue(); - if (estimated > 0) { - sampleMonth.setEstimatedTidesValue(estimated - 1); - } - if (log.isDebugEnabled()) { - log.debug("Decrement : " + estimated + " -> " + - sampleMonth.getEstimatedTidesValue()); - } - } else if (newContactDone) { - // inc estimatedTides - int estimated = sampleMonth.getEstimatedTidesValue(); - sampleMonth.setEstimatedTidesValue(estimated + 1); - if (log.isDebugEnabled()) { - log.debug("Increment : " + estimated + " -> " + - sampleMonth.getEstimatedTidesValue()); - } + if (status.isOldContactDone()) { + // decrement estimated tides + oldMonth.addEstimatedTideTime(-1); } } - // Real tides calcul (only if needed) - if (calculateReal) { - Boolean oldValidationCompany = oldContact != null ? - oldContact.getValidationCompany() : null; - Boolean newValidationCompany = contact.getValidationCompany(); + // Validation of contact has changed in status, modify realTides + if (calculateReal && + (status.isContactValidateChanged() || tideBeginDateChanged)) { - boolean oldContactValidate = - BooleanUtils.isTrue(oldValidationCompany); - boolean newContactValidate = - BooleanUtils.isTrue(newValidationCompany); + SampleMonth sampleMonth = status.getSampleMonth(transaction); - boolean contactValidationChanged = oldContact == null || - (oldValidationCompany != null && - !oldValidationCompany.equals(newValidationCompany)); - - if (log.isDebugEnabled()) { - log.debug("oldValidation = " + oldContactValidate + - " _ newValidation = " + newContactValidate); + if (status.isNewContactValidate()) { + // increment real tides + sampleMonth.addRealTideTime(1); + // never decrement if tideBeginDate has changed + } else if (status.isOldContactValidate() && !tideBeginDateChanged) { + // decrement real tides + sampleMonth.addRealTideTime(-1); } + } - if ((oldContactValidate || newContactValidate) && - contactValidationChanged) { - if (log.isDebugEnabled()) { - log.debug("Calculate real tides value for date : " + - contact.getTideBeginDate()); - } + // ContactState of contact has changed in status, modify estimatedTides + if (status.isContactDoneChanged() || tideBeginDateChanged) { - // Do not retrieve the sampleMonth if it is already defined from - // previous calcul on estimatedTidesValue - if (sampleMonth == null) { - sampleMonth = getExistingSampleMonthForContact( - monthDAO, contact); - } + SampleMonth sampleMonth = status.getSampleMonth(transaction); - if (oldContactValidate) { - // dec realTides - int real = sampleMonth.getRealTidesValue(); - if (real > 0) { - sampleMonth.setRealTidesValue(real - 1); - } - if (log.isDebugEnabled()) { - log.debug("Decrement : " + real + " -> " + - sampleMonth.getRealTidesValue()); - } - } else if (newContactValidate) { - // inc realTides - int real = sampleMonth.getRealTidesValue(); - sampleMonth.setRealTidesValue(real + 1); - if (log.isDebugEnabled()) { - log.debug("Increment : " + real + " -> " + - sampleMonth.getRealTidesValue()); - } - } + if (status.isNewContactDone()) { + // increment estimated tides + sampleMonth.addEstimatedTideTime(1); + // never decrement if tideBeginDate has changed + } else if (status.isOldContactDone() && !tideBeginDateChanged) { + // decrement estimated tides + sampleMonth.addEstimatedTideTime(-1); } } } /** - * This exception is used to indicate that a problem is occured during - * retrieving sampleMonth corresponding to a contact. - * @see #updateSampleMonthTidesValue(TopiaContext, Contact, Contact, boolean) - */ - public static final class NullSampleMonthException extends Exception { - - private static final long serialVersionUID = 1L; - - public NullSampleMonthException(String message) { - super(message); - } - } - - /** - * Retrieve existing sampleMonth corresponding to the {@code contact}. The - * sampleMonth must match with contact sampleRow, also the tideBeginDate - * (day) of the contact must match the sampleMonth periodDate (month). - * - * @param monthDAO used to find the sampleMonth - * @param contact reference - * @return the sampleMonth found if exists, or NullSampleMonthException - * will be thrown - * @throws TopiaException - * @throws NullSampleMonthException if month was not found - */ - protected SampleMonth getExistingSampleMonthForContact( - SampleMonthDAO monthDAO, Contact contact) - throws TopiaException, NullSampleMonthException { - TopiaQuery query = monthDAO.createQuery(); - - PeriodDates period = new PeriodDates( - contact.getTideBeginDate(), contact.getTideBeginDate()); - period.initDayOfMonthExtremities(); - - // Bind sampleMonth.sampleRow with contact sampleRow - query.add(SampleMonth.SAMPLE_ROW, contact.getSampleRow()). - add(SampleMonth.PERIOD_DATE + " BETWEEN :fromDate AND :thruDate"). - addParam("fromDate", period.getFromDate()). - addParam("thruDate", period.getThruDate()); - //add(SampleMonth.PERIOD_DATE, period); - SampleMonth result = monthDAO.findByQuery(query); - if (result == null) { - throw new NullSampleMonthException("Aucun mois correspondant pour" + - " la ligne du plan d'échantillonnage " + - contact.getSampleRow().getCode() + - " et la date de début de marée du contact " + - contact.getTideBeginDate()); - } - return result; - } - - /** * Update the elligible boat depends on contact creation. The * {@code contact} reference can only be created for a sampleRow and a * boat if both are linked with an elligibleBoat. So this method is Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-04-19 13:15:21 UTC (rev 454) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-04-19 19:59:47 UTC (rev 455) @@ -114,67 +114,67 @@ return resultRow; } - @Test - public void testAddRealTideTime() throws Exception { - log.info("addRealTideTime"); - - /** PREPARE DATA **/ - SampleRow row = prepareData(); - - Contact contact = new ContactImpl(); - Date beginDate = DateUtils.createDate(12, 4, 2009); - Date endDate = DateUtils.createDate(15, 4, 2009); - contact.setTideBeginDate(beginDate); - contact.setTideEndDate(endDate); - - /** EXEC METHOD **/ - row.addRealTideTime(contact); - SampleMonth result = getRowFromContext().getSampleMonth(beginDate); - assertEquals(1, result.getRealTidesValue()); - +// @Test +// public void testAddRealTideTime() throws Exception { +// log.info("addRealTideTime"); +// +// /** PREPARE DATA **/ +// SampleRow row = prepareData(); +// +// Contact contact = new ContactImpl(); +// Date beginDate = DateUtils.createDate(12, 4, 2009); +// Date endDate = DateUtils.createDate(15, 4, 2009); +// contact.setTideBeginDate(beginDate); +// contact.setTideEndDate(endDate); +// +// /** EXEC METHOD **/ +// row.addRealTideTime(contact); +// SampleMonth result = getRowFromContext().getSampleMonth(beginDate); +// assertEquals(1, result.getRealTidesValue()); +// +//// // Reinit result for next test +//// result.addRealTideTime(-1); +//// // Test with a more than one day interval dates from contact +//// endDate = DateUtils.createDate(18, 4, 2009); +//// contact.setTideEndDate(endDate); +//// +//// getRowFromContext().addRealTideTime(contact); +//// result = getRowFromContext().getSampleMonth(beginDate); +//// assertEquals(1, result.getRealTidesValue()); +// } +// +// @Test +// public void testRemoveRealTideTime() throws Exception { +// log.info("addRealTideTime"); +// +// /** PREPARE DATA **/ +// SampleRow row = prepareData(); +// +// Contact contact = new ContactImpl(); +// Date beginDate = DateUtils.createDate(12, 4, 2009); +// Date endDate = DateUtils.createDate(12, 4, 2009); +// contact.setTideBeginDate(beginDate); +// contact.setTideEndDate(endDate); +// +// /** EXEC METHOD **/ +// row.removeRealTideTime(contact); +// SampleMonth result = getRowFromContext().getSampleMonth(beginDate); +// // result stay at 0, can't remove 1 tide from 0 +// assertEquals(0, result.getRealTidesValue()); +// // // Reinit result for next test -// result.addRealTideTime(-1); -// // Test with a more than one day interval dates from contact +// result.addRealTideTime(12); +// +// // Test with a more than one day interval dates from contact : only one tide to remove // endDate = DateUtils.createDate(18, 4, 2009); // contact.setTideEndDate(endDate); // -// getRowFromContext().addRealTideTime(contact); +// getRowFromContext().removeRealTideTime(contact); // result = getRowFromContext().getSampleMonth(beginDate); -// assertEquals(1, result.getRealTidesValue()); - } +// assertEquals(11, result.getRealTidesValue()); +// } @Test - public void testRemoveRealTideTime() throws Exception { - log.info("addRealTideTime"); - - /** PREPARE DATA **/ - SampleRow row = prepareData(); - - Contact contact = new ContactImpl(); - Date beginDate = DateUtils.createDate(12, 4, 2009); - Date endDate = DateUtils.createDate(12, 4, 2009); - contact.setTideBeginDate(beginDate); - contact.setTideEndDate(endDate); - - /** EXEC METHOD **/ - row.removeRealTideTime(contact); - SampleMonth result = getRowFromContext().getSampleMonth(beginDate); - // result stay at 0, can't remove 1 tide from 0 - assertEquals(0, result.getRealTidesValue()); - - // Reinit result for next test - result.addRealTideTime(12); - - // Test with a more than one day interval dates from contact : only one tide to remove - endDate = DateUtils.createDate(18, 4, 2009); - contact.setTideEndDate(endDate); - - getRowFromContext().removeRealTideTime(contact); - result = getRowFromContext().getSampleMonth(beginDate); - assertEquals(11, result.getRealTidesValue()); - } - - @Test public void testIsFinished() throws Exception { log.info("isFinished()"); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-04-19 13:15:21 UTC (rev 454) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2010-04-19 19:59:47 UTC (rev 455) @@ -25,7 +25,7 @@ import fr.ifremer.wao.io.WaoCsvHeader.BOAT; import fr.ifremer.wao.io.WaoCsvHeader.CONTACT; import fr.ifremer.wao.io.WaoCsvHeader.SAMPLING; -import fr.ifremer.wao.service.ServiceContactImpl.NullSampleMonthException; +import fr.ifremer.wao.bean.ContactStatus.NullSampleMonthException; import java.io.IOException; import java.io.InputStream; import java.text.ParseException; @@ -39,6 +39,7 @@ import org.mockito.MockitoAnnotations; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -137,6 +138,9 @@ Date monthDate = DateUtils.createDate(1, 3, 2010); sampleMonth = monthDAO.create(SampleMonth.SAMPLE_ROW, sampleRow, SampleMonth.PERIOD_DATE, monthDate); + monthDate = DateUtils.createDate(1, 4, 2010); + monthDAO.create(SampleMonth.SAMPLE_ROW, sampleRow, + SampleMonth.PERIOD_DATE, monthDate); Date contactDate = DateUtils.createDate(18, 3, 2010); when(contact.getTideBeginDate()).thenReturn(contactDate); @@ -159,44 +163,46 @@ throws TopiaException, NullSampleMonthException { logger.info("testGetExistingSampleMonthForContact"); - /** PREPARE DATA **/ - prepareData(false, false); - - /** EXEC METHOD **/ - logger.info("test 1 : SampleMonth exists for contact"); - TopiaContext transaction = manager.getContext().beginTransaction(); - try { - SampleMonthDAO monthDAO = - WaoDAOHelper.getSampleMonthDAO(transaction); - - // Contact is valid for the sampleMonth - - SampleMonth result = - service.getExistingSampleMonthForContact(monthDAO, contact); - - assertEquals(sampleMonth, result); - - } finally { - transaction.closeContext(); - } - - logger.info("test 2 : contact tideBeginDate doesn't match with any" + - " SampleMonth"); - transaction = manager.getContext().beginTransaction(); - try { - SampleMonthDAO monthDAO = - WaoDAOHelper.getSampleMonthDAO(transaction); - - Date contactDate = DateUtils.createDate(18, 10, 2010); - when(contact.getTideBeginDate()).thenReturn(contactDate); - - service.getExistingSampleMonthForContact(monthDAO, contact); - } catch (Exception eee) { - logger.error("Error : " + eee.getMessage()); - assertEquals(NullSampleMonthException.class, eee.getClass()); - } finally { - transaction.closeContext(); - } +// /** PREPARE DATA **/ +// prepareData(false, false); +// +// /** EXEC METHOD **/ +// logger.info("test 1 : SampleMonth exists for contact"); +// TopiaContext transaction = manager.getContext().beginTransaction(); +// try { +// SampleMonthDAO monthDAO = +// WaoDAOHelper.getSampleMonthDAO(transaction); +// +// // Contact is valid for the sampleMonth +// +// SampleMonth result = +// service.getExistingSampleMonthForContact(monthDAO, +// contact.getSampleRow(), contact.getTideBeginDate()); +// +// assertEquals(sampleMonth, result); +// +// } finally { +// transaction.closeContext(); +// } +// +// logger.info("test 2 : contact tideBeginDate doesn't match with any" + +// " SampleMonth"); +// transaction = manager.getContext().beginTransaction(); +// try { +// SampleMonthDAO monthDAO = +// WaoDAOHelper.getSampleMonthDAO(transaction); +// +// Date contactDate = DateUtils.createDate(18, 10, 2010); +// when(contact.getTideBeginDate()).thenReturn(contactDate); +// +// service.getExistingSampleMonthForContact(monthDAO, +// contact.getSampleRow(), contact.getTideBeginDate()); +// } catch (Exception eee) { +// logger.error("Error : " + eee.getMessage()); +// assertEquals(NullSampleMonthException.class, eee.getClass()); +// } finally { +// transaction.closeContext(); +// } } @Test @@ -206,9 +212,12 @@ /** PREPARE DATA **/ prepareData(false, false); - Date tideBeginDate = contact.getTideBeginDate(); + Date tideBeginDate = new Date(contact.getTideBeginDate().getTime()); when(contactReference.getTideBeginDate()).thenReturn(tideBeginDate); when(contactReference.getSampleRow()).thenReturn(sampleRow); + // WARN : by default mockito doesn't initialize Boolean type with null + when(contactReference.getValidationProgram()).thenReturn(null); + when(contact.getValidationProgram()).thenReturn(null); /** EXEC METHOD **/ logger.info("test 1 : ContactState changed from null to BOARDING_DONE" + @@ -233,12 +242,12 @@ "BOAT_REFUSED -> decrement estimated tides value"); transaction = manager.getContext().beginTransaction(); try { - when(contact.getContactState()). - thenReturn(ContactState.BOAT_REFUSED); - when(contactReference.getContactState()). thenReturn(ContactState.BOARDING_DONE); + when(contact.getContactState()). + thenReturn(ContactState.BOAT_REFUSED); + service.updateSampleMonthTidesValue(transaction, contactReference, contact, false); @@ -250,6 +259,7 @@ logger.info("test 2 : verification sampleMonth estimated tides = 0"); checkTidesValue(0, false); + // Reset contactState to BOARDING_DONE for next test when(contact.getContactState()). thenReturn(ContactState.BOARDING_DONE); @@ -257,10 +267,10 @@ "FALSE -> do nothing"); transaction = manager.getContext().beginTransaction(); try { + when(contactReference.getValidationCompany()).thenReturn(null); + when(contact.getValidationCompany()).thenReturn(Boolean.FALSE); - when(contactReference.getValidationCompany()).thenReturn(null); - service.updateSampleMonthTidesValue(transaction, contactReference, contact, true); @@ -276,11 +286,11 @@ "TRUE -> increment real tides value"); transaction = manager.getContext().beginTransaction(); try { - when(contact.getValidationCompany()).thenReturn(Boolean.TRUE); - when(contactReference.getValidationCompany()). thenReturn(Boolean.FALSE); + when(contact.getValidationCompany()).thenReturn(Boolean.TRUE); + service.updateSampleMonthTidesValue(transaction, contactReference, contact, true); @@ -291,6 +301,113 @@ logger.info("test 4 : verification sampleMonth real tides = 1"); checkTidesValue(1, true); + + // ContactReference after saving contact will normally have this value : + when(contactReference.getValidationCompany()).thenReturn(Boolean.TRUE); + + logger.info("test 5 : CompanyValidation doesn't changed but " + + "ProgramValidation is set to FALSE -> decrement real tides"); + transaction = manager.getContext().beginTransaction(); + try { + when(contact.getValidationProgram()).thenReturn(Boolean.FALSE); + + service.updateSampleMonthTidesValue(transaction, contactReference, + contact, true); + + transaction.commitTransaction(); + } finally { + transaction.closeContext(); + } + + logger.info("test 5 : verification sampleMonth real tides = 0"); + checkTidesValue(0, true); + + logger.info("test 6 : Prepare data for delete case"); + // PREPARE DATA : update estimated to 1 and real to 1 + transaction = manager.getContext().beginTransaction(); + try { + // Will update estimatedTides up to 1 + // contact has already BOARDING_DONE + when(contactReference.getContactState()). + thenReturn(ContactState.BOARDING_EXPECTED); + + // Will update realTides up to 1 + // contact has already validationCompany = TRUE + when(contactReference.getValidationCompany()).thenReturn(null); + when(contact.getValidationProgram()).thenReturn(Boolean.TRUE); + + service.updateSampleMonthTidesValue(transaction, contactReference, + contact, true); + + transaction.commitTransaction(); + } finally { + transaction.closeContext(); + } + + // ContactReference after saving contact will normally have this values + when(contactReference.getValidationProgram()).thenReturn(Boolean.TRUE); + when(contactReference.getValidationCompany()).thenReturn(Boolean.TRUE); + + logger.info("test 6 : Delete contact (new contact is null) -> " + + "decrement realTides, estimatedTides doesn't change"); + transaction = manager.getContext().beginTransaction(); + try { + // ContactReference as a state != BOARDING_DONE, don't decrement + // estimatedTides + service.updateSampleMonthTidesValue(transaction, contactReference, + null, true); + + transaction.commitTransaction(); + } finally { + transaction.closeContext(); + } + + logger.info("test 6 : verification sampleMonth real tides = 0" + + "and estimated tides = 1"); + checkTidesValue(0, true); + checkTidesValue(1, false); + + logger.info("test 7 : SampleMonth will change from 03/2010 to 04/2010" + + " -> decrement estimated tides from oldMonth"); + transaction = manager.getContext().beginTransaction(); + try { + // contactReference BOARDING_DONE, validations true/true + // contact BOARDING_DONE, validations true/true + when(contactReference.getContactState()). + thenReturn(ContactState.BOARDING_DONE); + when(contact.getContactState()). + thenReturn(ContactState.BOARDING_DONE); + when(contact.getTideBeginDate()). + thenReturn(DateUtils.createDate(3, 4, 2010)); + + service.updateSampleMonthTidesValue(transaction, contactReference, + contact, true); + + transaction.commitTransaction(); + } finally { + transaction.closeContext(); + } + + logger.info("test 7 : verification old sampleMonth estimated tides = 0"); + checkTidesValue(0, false); + + logger.info("test 7 : verification new sampleMonth estimated " + + "tides = 1 and real tides = 1"); + transaction = manager.getContext().beginTransaction(); + try { + SampleMonthDAO dao = WaoDAOHelper.getSampleMonthDAO(transaction); + + TopiaQuery query = dao.createQuery(); + query.add(SampleMonth.PERIOD_DATE, DateUtils.createDate(1, 4, 2010)); + + SampleMonth month = dao.findByQuery(query); + + assertEquals(1, month.getEstimatedTidesValue()); + assertEquals(1, month.getRealTidesValue()); + + } finally { + transaction.closeContext(); + } } protected void checkTidesValue(int expected, boolean real) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-04-19 13:15:21 UTC (rev 454) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-04-19 19:59:47 UTC (rev 455) @@ -480,7 +480,7 @@ contactEdited.setValidationProgram(Boolean.TRUE); } else { // For company accepted, addRealTideTime - contactEdited.getSampleRow().addRealTideTime(contactEdited); +// contactEdited.getSampleRow().addRealTideTime(contactEdited); contactEdited.setValidationCompany(Boolean.TRUE); } } @@ -492,7 +492,7 @@ contactEdited = getContacts().get(contactId); if (user.isAdmin()) { // For program refused, removeRealTideTime - contactEdited.getSampleRow().removeRealTideTime(contactEdited); +// contactEdited.getSampleRow().removeRealTideTime(contactEdited); contactEdited.setValidationProgram(Boolean.FALSE); } else { contactEdited.setValidationCompany(Boolean.FALSE); @@ -506,16 +506,16 @@ contactEdited = getContacts().get(contactId); if (user.isAdmin()) { // For program unvalidate from previous refused validation, addRealTideTime - if (BooleanUtils.isFalse(contactEdited.getValidationProgram())) { - contactEdited.getSampleRow().addRealTideTime(contactEdited); - } +// if (BooleanUtils.isFalse(contactEdited.getValidationProgram())) { +// contactEdited.getSampleRow().addRealTideTime(contactEdited); +// } contactEdited.setValidationProgram(null); } else { // For company unvalidate from previous accepted validation, // removeRealTideTime - if (BooleanUtils.isTrue(contactEdited.getValidationCompany())) { - contactEdited.getSampleRow().removeRealTideTime(contactEdited); - } +// if (BooleanUtils.isTrue(contactEdited.getValidationCompany())) { +// contactEdited.getSampleRow().removeRealTideTime(contactEdited); +// } contactEdited.setValidationCompany(null); } }

1 0

[Suiviobsmer-commits] r454 - trunk/src/site/rst/coordinator
by jcouteau＠users.labs.libre-entreprise.org 19 Apr '10

19 Apr '10

Author: jcouteau Date: 2010-04-19 13:15:21 +0000 (Mon, 19 Apr 2010) New Revision: 454 Log: Fix spelling mistake Modified: trunk/src/site/rst/coordinator/echantillonage.rst Modified: trunk/src/site/rst/coordinator/echantillonage.rst =================================================================== --- trunk/src/site/rst/coordinator/echantillonage.rst 2010-04-19 13:14:53 UTC (rev 453) +++ trunk/src/site/rst/coordinator/echantillonage.rst 2010-04-19 13:15:21 UTC (rev 454) @@ -38,7 +38,7 @@ d'embarquement. A partir du plan d'échantillonage, il est possible de visionner les bateaux -susceptibles d'accueillir un observateur en cliqaunt sur l'icone 'bateau' à +susceptibles d'accueillir un observateur en cliquant sur l'icone 'bateau' à droite du plan, pour la ligne concernée. .. image::../user/sampling_plan.png

1 0