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

[Suiviobsmer-commits] r993 - in trunk: wao-business/src/main/filters wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/data wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org Feb. 7, 2011

Feb. 7, 2011

Author: bleny Date: 2011-02-07 15:48:21 +0000 (Mon, 07 Feb 2011) New Revision: 993 Log: add 'professional' user profile Modified: trunk/wao-business/src/main/filters/Wao.properties trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.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/Boats.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.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/Synthesis.java trunk/wao-ui/src/main/webapp/Boats.tml trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-business/src/main/filters/Wao.properties 2011-02-07 15:48:21 UTC (rev 993) @@ -60,5 +60,5 @@ ###### Since 1.6 # By default make indicators not visible -wao.indicators.show=false +wao.indicators.show=true Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ConnectedUserImpl.java 2011-02-07 15:48:21 UTC (rev 993) @@ -58,6 +58,11 @@ } @Override + public boolean isProfessional() { + return getProfile().isProfessional(); + } + + @Override public boolean isReadOnly() { return getProfile().isReadOnly(); } 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 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java 2011-02-07 15:48:21 UTC (rev 993) @@ -27,6 +27,9 @@ import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.WaoUser; +import java.util.ArrayList; +import java.util.List; + import static org.nuiton.i18n.I18n.n_; /** @@ -47,7 +50,9 @@ /** Coordinator role **/ COORDINATOR(n_("UserRole.COORDINATOR")), /** Guest role **/ - GUEST(n_("UserRole.GUEST")); + GUEST(n_("UserRole.GUEST")), + /** Professional role **/ + PROFESSIONAL(n_("UserRole.PROFESSIONAL")); protected String i18nKey; @@ -72,4 +77,24 @@ return WaoUtils.translate(i18nKey); } + /** for a given program, return the roles that can be assigned by someone + * who own the role <code>userRole</code> + * @param obsProgram available roles depends on the program + * @param userRole role of the user who want to grant rights + * @return roles that the user can affect + */ + public static UserRole[] getAllowedRoles(ObsProgram obsProgram, UserRole userRole) { + List<UserRole> allowedRoles = new ArrayList<UserRole>(); + allowedRoles.add(UserRole.COORDINATOR); + allowedRoles.add(UserRole.OBSERVER); + if (userRole.equals(UserRole.ADMIN)) { + allowedRoles.add(UserRole.ADMIN); + allowedRoles.add(UserRole.GUEST); + if (obsProgram.equals(ObsProgram.OBSMER)) { + allowedRoles.add(UserRole.PROFESSIONAL); + } + } + UserRole[] result = allowedRoles.toArray(new UserRole[allowedRoles.size()]); + return result; + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java 2011-02-07 15:48:21 UTC (rev 993) @@ -77,6 +77,11 @@ } @Override + public boolean isProfessional() { + return getUserRole() == UserRole.PROFESSIONAL; + } + + @Override public boolean isGuest() { return getUserRole() == UserRole.GUEST; } Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-02-07 15:48:21 UTC (rev 993) @@ -36,6 +36,7 @@ UserRole.COORDINATOR=Coordinator UserRole.GUEST=Guest UserRole.OBSERVER=Observer +UserRole.PROFESSIONAL=Professional fr.ifremer.wao.entity.FishingGearDCF.=Not specified fr.ifremer.wao.entity.FishingGearDCF.DRB=Boat dredges fr.ifremer.wao.entity.FishingGearDCF.DRH=Hand dredges Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-02-07 15:48:21 UTC (rev 993) @@ -36,6 +36,7 @@ UserRole.COORDINATOR=Coordinateur UserRole.GUEST=Invit\u00E9 UserRole.OBSERVER=Observateur +UserRole.PROFESSIONAL=Professionnel fr.ifremer.wao.entity.FishingGearDCF.=Non sp\u00E9cifi\u00E9 fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorqu\u00E9es par bateau fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues \u00E0 main Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.java 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/data/RequiresAuthentication.java 2011-02-07 15:48:21 UTC (rev 993) @@ -46,7 +46,7 @@ // By default everybody can access UserRole[] allowedRoles() default - {UserRole.OBSERVER, UserRole.ADMIN, UserRole.COORDINATOR, UserRole.GUEST}; + {UserRole.OBSERVER, UserRole.ADMIN, UserRole.COORDINATOR, UserRole.GUEST, UserRole.PROFESSIONAL}; ObsProgram[] allowedPrograms() default {ObsProgram.OBSMER, ObsProgram.OBSVENTE}; 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 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2011-02-07 15:48:21 UTC (rev 993) @@ -78,6 +78,7 @@ import org.apache.tapestry5.ioc.services.PropertyAccess; import org.apache.tapestry5.ioc.services.TypeCoercer; import org.apache.tapestry5.services.BeanModelSource; +import org.apache.tapestry5.util.EnumSelectModel; import org.slf4j.Logger; import java.io.FileNotFoundException; @@ -602,15 +603,10 @@ @Log public SelectModel getUserRoleSelectModel() { if (userRoleSelectModel == null) { - List<OptionModel> options = new ArrayList<OptionModel>(); - options.add(newUserRoleOption(UserRole.OBSERVER)); - options.add(newUserRoleOption(UserRole.COORDINATOR)); - // Only admin can set ADMIN and GUEST role - if (currentUser.isAdmin()) { - options.add(newUserRoleOption(UserRole.ADMIN)); - options.add(newUserRoleOption(UserRole.GUEST)); - } - userRoleSelectModel = new SelectModelImpl(null, options); + UserRole[] allowedRoles = UserRole.getAllowedRoles( + currentUser.getProfile().getObsProgram(), + currentUser.getProfile().getUserRole()); + return new EnumSelectModel(UserRole.class, messages, allowedRoles); } return userRoleSelectModel; } 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 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-02-07 15:48:21 UTC (rev 993) @@ -87,7 +87,7 @@ * * @author fdesbois <fdesbois at codelutin.com> */ - at RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) + at RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER, UserRole.PROFESSIONAL}) @Import(stylesheet = "context:css/boats.css") public class Boats extends AbstractFilteredPage { @@ -532,7 +532,7 @@ } public boolean canCreateNewContactFromList() throws WaoException { - if (!user.isAdmin() && !user.isReadOnly() && isSampleRowExists()) { + if (!user.isAdmin() && !user.isProfessional() && !user.isReadOnly() && isSampleRowExists()) { return boat.canCreateContact(user.getProfile().getObsProgram(), user.getCompany()); } return false; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-02-07 15:48:21 UTC (rev 993) @@ -38,12 +38,10 @@ import fr.ifremer.wao.ui.data.GenericSelectModel; import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.services.WaoManager; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.Block; import org.apache.tapestry5.EventContext; -import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.SelectModel; import org.apache.tapestry5.annotations.Component; import org.apache.tapestry5.annotations.Environmental; @@ -59,9 +57,9 @@ import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; +import org.apache.tapestry5.services.javascript.JavaScriptSupport; import org.apache.tapestry5.util.EnumSelectModel; import org.chenillekit.tapestry.core.components.DateTimeField; -import org.nuiton.util.CollectionUtil; import org.slf4j.Logger; import java.text.DateFormat; @@ -103,7 +101,7 @@ private ServiceUser serviceUser; @Environmental - private RenderSupport renderSupport; + private JavaScriptSupport javascriptSupport; @InjectComponent private Zone globalZone; @@ -154,12 +152,12 @@ "saisir les données ?"; // TODO-fdesbois-2010-07-27 : manage array of states in JavaScript - renderSupport.addScript("new ContactSendEmail('%s', '%s');", + javascriptSupport.addScript("new ContactSendEmail('%s', '%s');", confirmMessage, // Check state OBSERVATION_DONE ContactState.OBSERVATION_DONE.name()); - renderSupport.addScript("new ContactSendEmail('%s', '%s');", + javascriptSupport.addScript("new ContactSendEmail('%s', '%s');", confirmMessage, // Check state BOARDING_EXPECTED ContactState.OBSERVATION_EXPECTED.name()); 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 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-02-07 15:48:21 UTC (rev 993) @@ -51,7 +51,6 @@ import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; import org.apache.tapestry5.ComponentResources; -import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.Environmental; import org.apache.tapestry5.annotations.Import; @@ -66,6 +65,7 @@ import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; import org.apache.tapestry5.services.BeanModelSource; +import org.apache.tapestry5.services.javascript.JavaScriptSupport; import org.apache.tapestry5.upload.services.UploadedFile; import org.slf4j.Logger; @@ -105,7 +105,7 @@ private ServiceContact serviceContact; @Environmental - private RenderSupport renderSupport; + private JavaScriptSupport javascriptSupport; @Inject private WaoManager manager; 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 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java 2011-02-07 15:48:21 UTC (rev 993) @@ -85,7 +85,7 @@ * * @author fdesbois <fdesbois at codelutin.com> */ - at RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER}) + at RequiresAuthentication(allowedRoles = {UserRole.ADMIN, UserRole.COORDINATOR, UserRole.OBSERVER, UserRole.PROFESSIONAL}) @Import(stylesheet = "context:css/synthesis.css") public class Synthesis extends AbstractFilteredPage { Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2011-02-07 15:48:21 UTC (rev 993) @@ -103,7 +103,12 @@ <img src="${asset:context:}/img/contact-22px.png" title="${message:wao.ui.action.addNewContactFromBoat}"/> </a>  </t:if> - <a t:type="actionlink" t:id="showBoatInfos" t:context="boat.immatriculation" t:zone="boatsZone">${boat.name}</a> ${boatInactive} + <t:unless test="user.professional"> + <a t:type="actionlink" t:id="showBoatInfos" t:context="boat.immatriculation" t:zone="boatsZone">${boat.name}</a> ${boatInactive} + <p:else> + ${boat.name} ${boatInactive} + </p:else> + </t:unless> </p:nameCell> <p:boatLengthCell> ${boat.boatLength} m Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-02-07 14:39:59 UTC (rev 992) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-02-07 15:48:21 UTC (rev 993) @@ -120,42 +120,44 @@ title="Graphique des sollicitations des navires" /> </a> </li> - <t:if test="showObsMer()"> + <t:unless test="user.professional"> + <t:if test="showObsMer()"> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_COMPLIANCE_BOARDING']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-ind-non-compliance-boarding.png" alt="Indicateur de non respect du nombre d'observateurs embarqués" + title="Indicateur de non respect du nombre d'observateurs embarqués" /> + </a> + </li> + </t:if> <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_COMPLIANCE_BOARDING']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-non-compliance-boarding.png" alt="Indicateur de non respect du nombre d'observateurs embarqués" - title="Indicateur de non respect du nombre d'observateurs embarqués" /> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_ALLEGRO_REACTIVITY']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-ind-allegro-reactivity.png" alt="Indicateur de réactivité sur la saisie des données dans Allegro" + title="Indicateur de réactivité sur la saisie des données dans Allegro" /> </a> </li> - </t:if> - <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_ALLEGRO_REACTIVITY']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-allegro-reactivity.png" alt="Indicateur de réactivité sur la saisie des données dans Allegro" - title="Indicateur de réactivité sur la saisie des données dans Allegro" /> - </a> - </li> - <t:if test="showObsMer()"> + <t:if test="showObsMer()"> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_DATA_RELIABILITY']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-ind-data-reliability.png" alt="Indicateur de la qualité des données" + title="Indicateur de la qualité des données" /> + </a> + </li> + </t:if> + <t:if test="user.indicatorsViewer"> + <li> + <a t:type="actionlink" t:context="[actionShowGlobalSynthesis,'']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-global-synthesis.png" alt="Synthèse globale des indicateurs" + title="Synthèse globale des indicateurs" /> + </a> + </li> + </t:if> <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_DATA_RELIABILITY']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-data-reliability.png" alt="Indicateur de la qualité des données" - title="Indicateur de la qualité des données" /> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_CONTACT_STATE']" t:zone="so-synthesis-main"> + <img src="${asset:context:}/img/synthesis-ind-contact-states.png" alt="Indicateur sur les états des contacts" + title="Indicateur sur les états des contacts" /> </a> </li> - </t:if> - <t:if test="user.indicatorsViewer"> - <li> - <a t:type="actionlink" t:context="[actionShowGlobalSynthesis,'']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-global-synthesis.png" alt="Synthèse globale des indicateurs" - title="Synthèse globale des indicateurs" /> - </a> - </li> - </t:if> - <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_CONTACT_STATE']" t:zone="so-synthesis-main"> - <img src="${asset:context:}/img/synthesis-ind-contact-states.png" alt="Indicateur sur les états des contacts" - title="Indicateur sur les états des contacts" /> - </a> - </li> + </t:unless> </ul> </div> <div t:type="zone" t:id="delegator" class="fleft" t:update="show" id="so-synthesis-main">

1 0

[Suiviobsmer-commits] r992 - trunk/wao-business/src/main/java/fr/ifremer/wao
by bleny＠users.labs.libre-entreprise.org Feb. 7, 2011

Feb. 7, 2011

Author: bleny Date: 2011-02-07 14:39:59 +0000 (Mon, 07 Feb 2011) New Revision: 992 Log: fix warning Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-02-07 10:18:36 UTC (rev 991) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-02-07 14:39:59 UTC (rev 992) @@ -246,9 +246,9 @@ } } - query.addEquals(sampleRowProperty.$alias(), - filter.getSampleRows().toArray( - new SampleRow[filter.getSampleRows().size()])); + query.addEquals(sampleRowProperty.$alias(), new Object[]{ + filter.getSampleRows().toArray( + new SampleRow[filter.getSampleRows().size()])}); // another implementation for above line : (not tested) // List<String> sampleRowsCodes = new ArrayList<String>(sampleRows.size()); // for (SampleRow row : sampleRows) {

1 0

[Suiviobsmer-commits] r991 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org Feb. 7, 2011

Feb. 7, 2011

Author: bleny Date: 2011-02-07 10:18:36 +0000 (Mon, 07 Feb 2011) New Revision: 991 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-07 10:18:34 UTC (rev 990) +++ trunk/pom.xml 2011-02-07 10:18:36 UTC (rev 991) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> <modules> <module>wao-ui</module> @@ -355,12 +355,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0 + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0 + scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.0?root=suiviobsm… + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-02-07 10:18:34 UTC (rev 990) +++ trunk/wao-business/pom.xml 2011-02-07 10:18:36 UTC (rev 991) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -244,13 +244,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.0/?root=suiviobs… + http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0/wao-business + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0/wao-business + scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business </developerConnection> </scm> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-02-07 10:18:34 UTC (rev 990) +++ trunk/wao-ui/pom.xml 2011-02-07 10:18:36 UTC (rev 991) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -310,13 +310,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.0/?root=suiviobs… + 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/tags/wao-2.0/wao-ui + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0/wao-ui + scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </developerConnection> </scm>

1 0

[Suiviobsmer-commits] r990 - in tags: . wao-2.0
by bleny＠users.labs.libre-entreprise.org Feb. 7, 2011

Feb. 7, 2011

Author: bleny Date: 2011-02-07 10:18:34 +0000 (Mon, 07 Feb 2011) New Revision: 990 Log: [maven-release-plugin] copy for tag wao-2.0 Added: tags/wao-2.0/ Property changes on: tags/wao-2.0 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws *.iml *.idea target nbactions.xml Added: svn:mergeinfo + /branches/wao-1.5.x:679-733

1 0

[Suiviobsmer-commits] r989 - in trunk: . wao-business wao-ui
by bleny＠users.labs.libre-entreprise.org Feb. 7, 2011

Feb. 7, 2011

Author: bleny Date: 2011-02-07 10:18:31 +0000 (Mon, 07 Feb 2011) New Revision: 989 Log: [maven-release-plugin] prepare release wao-2.0 Modified: trunk/pom.xml trunk/wao-business/pom.xml trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-07 10:13:14 UTC (rev 988) +++ trunk/pom.xml 2011-02-07 10:18:31 UTC (rev 989) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> <modules> <module>wao-ui</module> @@ -355,12 +355,12 @@ <scm> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0 </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0 </developerConnection> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/?root=suiviobsmer + <url>http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.0?root=suiviobsm… </url> </scm> Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-02-07 10:13:14 UTC (rev 988) +++ trunk/wao-business/pom.xml 2011-02-07 10:18:31 UTC (rev 989) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -244,13 +244,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=su… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.0/?root=suiviobs… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0/wao-business </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0/wao-business </developerConnection> </scm> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-02-07 10:13:14 UTC (rev 988) +++ trunk/wao-ui/pom.xml 2011-02-07 10:18:31 UTC (rev 989) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <groupId>fr.ifremer.wao</groupId> @@ -312,13 +310,13 @@ <scm> <url> - http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobs… + http://labs.libre-entreprise.org/scm/viewvc.php/tags/wao-2.0/?root=suiviobs… </url> <connection> - scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0/wao-ui </connection> <developerConnection> - scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/tags/wao-2.0/wao-ui </developerConnection> </scm>

1 0

[Suiviobsmer-commits] r988 - trunk
by bleny＠users.labs.libre-entreprise.org Feb. 7, 2011

Feb. 7, 2011

Author: bleny Date: 2011-02-07 10:13:14 +0000 (Mon, 07 Feb 2011) New Revision: 988 Log: add missing commons-lang, should be removed when mavenpom updated Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-07 09:54:00 UTC (rev 987) +++ trunk/pom.xml 2011-02-07 10:13:14 UTC (rev 988) @@ -25,6 +25,11 @@ <dependencyManagement> <dependencies> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> <version>1.2</version>

1 0

[Suiviobsmer-commits] r987 - in trunk: . wao-ui wao-ui/src/license
by bleny＠users.labs.libre-entreprise.org Feb. 7, 2011

Feb. 7, 2011

Author: bleny Date: 2011-02-07 09:54:00 +0000 (Mon, 07 Feb 2011) New Revision: 987 Log: update pom Modified: trunk/pom.xml trunk/wao-ui/pom.xml trunk/wao-ui/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-07 09:19:52 UTC (rev 986) +++ trunk/pom.xml 2011-02-07 09:54:00 UTC (rev 987) @@ -24,13 +24,7 @@ <dependencyManagement> <dependencies> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.6</version> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> <version>1.2</version> @@ -83,6 +77,11 @@ </dependency> <dependency> <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-json</artifactId> + <version>${tapestryVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-ioc</artifactId> <version>${tapestryVersion}</version> </dependency> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-02-07 09:19:52 UTC (rev 986) +++ trunk/wao-ui/pom.xml 2011-02-07 09:54:00 UTC (rev 987) @@ -40,6 +40,10 @@ <artifactId>nuiton-utils</artifactId> </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + <dependency> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-tapestry</artifactId> <scope>runtime</scope> @@ -51,6 +55,10 @@ </dependency> <dependency> <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-json</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-ioc</artifactId> </dependency> <dependency> Modified: trunk/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-ui/src/license/THIRD-PARTY.properties 2011-02-07 09:19:52 UTC (rev 986) +++ trunk/wao-ui/src/license/THIRD-PARTY.properties 2011-02-07 09:54:00 UTC (rev 987) @@ -1,23 +1,3 @@ -### -# #%L -# Wao :: Web Interface -# %% -# Copyright (C) 2009 - 2011 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : @@ -37,12 +17,13 @@ # - GNU Lesser General Public License version 2.1 # - GNU Library or Lesser General Public License # - GPL, LGPL, MPL +# - LGPL 2.1 # - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 # - MIT License +# - MPL 1.1 # - Public Domain # - The Apache Software License, Version 2.0 -# - The BSD License # - The GNU General Public License (GPL) # - The H2 License, Version 1.0 # - The MIT License @@ -51,16 +32,14 @@ # Please fill the missing licenses for dependencies : # # -#Fri Nov 26 17:05:56 CET 2010 +#Mon Feb 07 10:25:43 CET 2011 antlr--antlr--2.7.6--jar=BSD com.formos.tapestry--tapestry-testify--1.0.2--jar=The Apache Software License, Version 2.0 com.sun.xml.bind--jaxb-impl--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 com.sun.xml.bind--jaxb-xjc--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 -commons-beanutils--commons-beanutils-core--1.7.0--jar=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1--jar=BSD javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 -javassist--javassist--3.9.0.GA--jar=Lesser General Public License (LGPL) v 2.1 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.xml.bind--jaxb-api--2.2--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 & GNU General Public License (GPL) Version 2 ognl--ognl--2.7.3--jar=The OpenSymphony Software License, Version 1.1

1 0

[Suiviobsmer-commits] r986 - in trunk: wao-business/src/main/resources/i18n wao-ui/src/main/resources/i18n
by bleny＠users.labs.libre-entreprise.org Feb. 7, 2011

Feb. 7, 2011

Author: bleny Date: 2011-02-07 09:19:52 +0000 (Mon, 07 Feb 2011) New Revision: 986 Log: remove headers from i18n bundles Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-02-04 15:30:32 UTC (rev 985) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-02-07 09:19:52 UTC (rev 986) @@ -1,23 +1,3 @@ -### -# #%L -# Wao :: Business -# %% -# Copyright (C) 2009 - 2011 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### ContactPieChartConstant.OTHER=Others ContactPieChartConstant.REALIZED=Realized ContactPieChartConstant.REFUSED=Refused Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-02-04 15:30:32 UTC (rev 985) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-02-07 09:19:52 UTC (rev 986) @@ -1,23 +1,3 @@ -### -# #%L -# Wao :: Business -# %% -# Copyright (C) 2009 - 2011 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### ContactPieChartConstant.OTHER=Autres ContactPieChartConstant.REALIZED=R\u00E9alis\u00E9s ContactPieChartConstant.REFUSED=Refus\u00E9s Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-02-04 15:30:32 UTC (rev 985) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-02-07 09:19:52 UTC (rev 986) @@ -1,23 +1,3 @@ -### -# #%L -# Wao :: Web Interface -# %% -# Copyright (C) 2009 - 2011 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### wao.ui.action.acceptContact=Validate contact wao.ui.action.add=Add wao.ui.action.addNewContactFromBoat=Create a new contact for this boat and the selected sample row (in filters) Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-02-04 15:30:32 UTC (rev 985) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-02-07 09:19:52 UTC (rev 986) @@ -1,23 +1,3 @@ -### -# #%L -# Wao :: Web Interface -# %% -# Copyright (C) 2009 - 2011 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### wao.ui.action.acceptContact=Valider le contact wao.ui.action.add=Ajouter wao.ui.action.addNewContactFromBoat=Cr\u00E9er un nouveau contact pour ce navire et la ligne s\u00E9lectionn\u00E9e dans les filtres

1 0

[Suiviobsmer-commits] r985 - in trunk: wao-business/src/license wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/io/csv2 wao-business/src/main/resources/i18n wao-business/src/test/java/fr/ifremer/wao/io/csv2 wao-business/src/test/java/fr/ifremer/wao/service wao-ui/src/license wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/resources/i18n wao-ui/src/main/webapp wao-ui/src/main/webapp/css
by bleny＠users.labs.libre-entreprise.org Feb. 4, 2011

Feb. 4, 2011

Author: bleny Date: 2011-02-04 15:30:32 +0000 (Fri, 04 Feb 2011) New Revision: 985 Log: update file headers Modified: trunk/wao-business/src/license/THIRD-PARTY.properties trunk/wao-business/src/main/java/fr/ifremer/wao/bean/LocationType.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ObsProgram.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportableColumn.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportableColumnImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/SamplingPlanImportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/TerrestrialLocationImportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueParser.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueSetter.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ImportTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java trunk/wao-ui/src/license/THIRD-PARTY.properties trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties trunk/wao-ui/src/main/webapp/ContactForm.tml trunk/wao-ui/src/main/webapp/Contacts.tml trunk/wao-ui/src/main/webapp/css/contactForm.css Modified: trunk/wao-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-business/src/license/THIRD-PARTY.properties 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/license/THIRD-PARTY.properties 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +### +# #%L +# Wao :: Business +# %% +# Copyright (C) 2009 - 2011 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/LocationType.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/LocationType.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/LocationType.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.bean; import fr.ifremer.wao.WaoUtils; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ObsProgram.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ObsProgram.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ObsProgram.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.bean; import fr.ifremer.wao.WaoUtils; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingStrategy.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.bean; import fr.ifremer.wao.WaoUtils; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoUtils; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import fr.ifremer.wao.WaoUtils; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserDAOImpl.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/WaoUserDAOImpl.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.entity; import org.nuiton.topia.TopiaException; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2; import com.csvreader.CsvReader; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportModel.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportModel.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2; import java.util.Collection; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportableColumn.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportableColumn.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportableColumn.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2; public interface ImportableColumn<E, T> { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportableColumnImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportableColumnImpl.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ImportableColumnImpl.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2; public class ImportableColumnImpl<E, T> implements ImportableColumn<E, T> { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/SamplingPlanImportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/SamplingPlanImportModel.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/SamplingPlanImportModel.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2; import fr.ifremer.wao.bean.ObsProgram; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/TerrestrialLocationImportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/TerrestrialLocationImportModel.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/TerrestrialLocationImportModel.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2; import fr.ifremer.wao.bean.LocationType; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueParser.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueParser.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueParser.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2; public interface ValueParser<T> { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueSetter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueSetter.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/ValueSetter.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2; public interface ValueSetter<E, T> { Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +### +# #%L +# Wao :: Business +# %% +# Copyright (C) 2009 - 2011 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### ContactPieChartConstant.OTHER=Others ContactPieChartConstant.REALIZED=Realized ContactPieChartConstant.REFUSED=Refused Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +### +# #%L +# Wao :: Business +# %% +# Copyright (C) 2009 - 2011 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### ContactPieChartConstant.OTHER=Autres ContactPieChartConstant.REALIZED=R\u00E9alis\u00E9s ContactPieChartConstant.REFUSED=Refus\u00E9s Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ImportTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ImportTest.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/io/csv2/ImportTest.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Business + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.io.csv2; import fr.ifremer.wao.bean.ObsProgram; Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactImplTest.java 2011-02-04 15:30:32 UTC (rev 985) @@ -8,12 +8,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% Modified: trunk/wao-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-ui/src/license/THIRD-PARTY.properties 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-ui/src/license/THIRD-PARTY.properties 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +### +# #%L +# Wao :: Web Interface +# %% +# Copyright (C) 2009 - 2011 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package fr.ifremer.wao.ui.pages; import fr.ifremer.wao.WaoBusinessException; Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +### +# #%L +# Wao :: Web Interface +# %% +# Copyright (C) 2009 - 2011 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### wao.ui.action.acceptContact=Validate contact wao.ui.action.add=Add wao.ui.action.addNewContactFromBoat=Create a new contact for this boat and the selected sample row (in filters) Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +### +# #%L +# Wao :: Web Interface +# %% +# Copyright (C) 2009 - 2011 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### wao.ui.action.acceptContact=Valider le contact wao.ui.action.add=Ajouter wao.ui.action.addNewContactFromBoat=Cr\u00E9er un nouveau contact pour ce navire et la ligne s\u00E9lectionn\u00E9e dans les filtres Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-02-04 15:30:32 UTC (rev 985) @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <t:layout t:pageTitle="Modification d'un contact" t:contentId="so-contact-form" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2011-02-04 15:30:32 UTC (rev 985) @@ -21,7 +21,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License observer + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> Modified: trunk/wao-ui/src/main/webapp/css/contactForm.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/contactForm.css 2011-02-04 15:22:16 UTC (rev 984) +++ trunk/wao-ui/src/main/webapp/css/contactForm.css 2011-02-04 15:30:32 UTC (rev 985) @@ -1,3 +1,23 @@ +/* + * #%L + * Wao :: Web Interface + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ fieldset { border: solid 1px black; padding: 10px;

1 0

[Suiviobsmer-commits] r984 - in trunk: . src/announcement wao-business/src/main/resources/i18n wao-ui
by bleny＠users.labs.libre-entreprise.org Feb. 4, 2011

Feb. 4, 2011

Author: bleny Date: 2011-02-04 15:22:16 +0000 (Fri, 04 Feb 2011) New Revision: 984 Log: prepare release Modified: trunk/changelog.txt trunk/src/announcement/release-email.2.0.txt trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-ui/pom.xml Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-02-04 15:01:22 UTC (rev 983) +++ trunk/changelog.txt 2011-02-04 15:22:16 UTC (rev 984) @@ -3,6 +3,21 @@ Historique des versions +2.0 +--- + +Evolution ++++++++++ + +- [bleny] Evo #2360 : Liste des observateurs par ligne contact +- [bleny] Evo #2594 : I18N +- [bleny] Evo #2592 : Référentiel LIEU +- [bleny] Evo #2593 : Ajout de Stratégie pour OBSVENTE +- [bleny] Evo #2597 : Passage au niveau horaire sur les contacts +- [bleny] Evo #2590 : Ajout de la notion de programme (OBSVENTE, OBSMER, OBSDEB) +- [bleny] Evo #2607 : Migration Tapestry 5.2 + + 1.6 --- Modified: trunk/src/announcement/release-email.2.0.txt =================================================================== --- trunk/src/announcement/release-email.2.0.txt 2011-02-04 15:01:22 UTC (rev 983) +++ trunk/src/announcement/release-email.2.0.txt 2011-02-04 15:22:16 UTC (rev 984) @@ -1,3 +1,22 @@ -Veuillez ajouter dans la configuration de Tomcat (/etc/default/tomcat) : +La nouvelle version 2.0 de l'applicatif Wao est disponible ! -JAVA_OPTS="$JAVA_OPTS -XX:MaxPermSize=256M" +Nouveautés : +- [bleny] Evo #2360 : Liste des observateurs par ligne contact +- [bleny] Evo #2594 : I18N +- [bleny] Evo #2592 : Référentiel LIEU +- [bleny] Evo #2593 : Ajout de Stratégie pour OBSVENTE +- [bleny] Evo #2597 : Passage au niveau horaire sur les contacts +- [bleny] Evo #2590 : Ajout de la notion de programme (OBSVENTE, OBSMER, OBSDEB) +- [bleny] Evo #2607 : Migration Tapestry 5.2 + +Documentation : + +http://suiviobsmer.labs.libre-entreprise.org/wao/ + +Téléchargement : + +https://labs.libre-entreprise.org/frs/?group_id=154 + +Cordialement, + +L'équipe Wao Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-02-04 15:01:22 UTC (rev 983) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-02-04 15:22:16 UTC (rev 984) @@ -1,155 +1,155 @@ ContactPieChartConstant.OTHER=Autres -ContactPieChartConstant.REALIZED=R\u00e9alis\u00e9s -ContactPieChartConstant.REFUSED=Refus\u00e9s -ContactState.CONTACT_DEFINITELY_REFUSED=Refus d\u00e9finitif +ContactPieChartConstant.REALIZED=R\u00E9alis\u00E9s +ContactPieChartConstant.REFUSED=Refus\u00E9s +ContactState.CONTACT_DEFINITELY_REFUSED=Refus d\u00E9finitif ContactState.CONTACT_REFUSED=Refus ContactState.CONTACT_START=Contact pris -ContactState.OBSERVATION_CANCELLED=Annul\u00e9e -ContactState.OBSERVATION_DONE=Observation r\u00e9alis\u00e9e -ContactState.OBSERVATION_EXPECTED=Observation programm\u00e9e -DataReliability.CORRECTION_ASKED=Correction demand\u00e9e +ContactState.OBSERVATION_CANCELLED=Annul\u00E9e +ContactState.OBSERVATION_DONE=Observation r\u00E9alis\u00E9e +ContactState.OBSERVATION_EXPECTED=Observation programm\u00E9e +DataReliability.CORRECTION_ASKED=Correction demand\u00E9e DataReliability.DOUBTFUL=Douteuse -DataReliability.NOT_PROVIDED=Non contr\u00f4l\u00e9e +DataReliability.NOT_PROVIDED=Non contr\u00F4l\u00E9e DataReliability.NOT_RELIABLE=Non exploitable DataReliability.RELIABLE=Exploitable DataReliability.UNKNOWN=Inconnue -GlobalIndicatorValue.BAD=P\u00e9nalit\u00e9 de niveau 1 +GlobalIndicatorValue.BAD=P\u00E9nalit\u00E9 de niveau 1 GlobalIndicatorValue.GOOD=Bonus de niveau 1 GlobalIndicatorValue.NEUTRAL=Conforme au cahier des charges -GlobalIndicatorValue.VERY_BAD=P\u00e9nalit\u00e9 de niveau 2 +GlobalIndicatorValue.VERY_BAD=P\u00E9nalit\u00E9 de niveau 2 GlobalIndicatorValue.VERY_GOOD=Bonus de niveau 2 -LocationType.AUCTION=Cri\u00e9e +LocationType.AUCTION=Cri\u00E9e LocationType.PORT=Port ObsProgram.OBSMER=ObsMer ObsProgram.OBSVENTE=ObsVente -SamplingStrategy.SIMULTANEOUS_ALL_SPECIES=Simultan\u00e9 \: Toutes esp\u00e8ces commerciales -SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES=Simultan\u00e9 \: esp\u00e8ces G1+G2 -SamplingStrategy.SIMULTANEOUS_G1_SPECIES=Simultan\u00e9 \: esp\u00e8ces G1 -SamplingStrategy.SPECIFIC_STOCK=Stock sp\u00e9cifique -SynthesisId.GRAPH_BOARDING=Taux d'embarquement sur un m\u00eame navire conforme aux exigences -SynthesisId.GRAPH_SAMPLING=Taux de r\u00e9alisation du plan d'\u00e9chantillonage -SynthesisId.IND_ALLEGRO_REACTIVITY=D\u00e9lais de transmission des donn\u00e9es -SynthesisId.IND_COMPLIANCE_BOARDING=Respect du nombre d'observateurs embarqu\u00e9s -SynthesisId.IND_CONTACT_STATE=\u00c9tats des contacts -SynthesisId.IND_DATA_RELIABILITY=Qualit\u00e9 de la donn\u00e9e +SamplingStrategy.SIMULTANEOUS_ALL_SPECIES=Simultan\u00E9 \: Toutes esp\u00E8ces commerciales +SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES=Simultan\u00E9 \: esp\u00E8ces G1+G2 +SamplingStrategy.SIMULTANEOUS_G1_SPECIES=Simultan\u00E9 \: esp\u00E8ces G1 +SamplingStrategy.SPECIFIC_STOCK=Stock sp\u00E9cifique +SynthesisId.GRAPH_BOARDING=Taux d'embarquement sur un m\u00EAme navire conforme aux exigences +SynthesisId.GRAPH_SAMPLING=Taux de r\u00E9alisation du plan d'\u00E9chantillonage +SynthesisId.IND_ALLEGRO_REACTIVITY=D\u00E9lais de transmission des donn\u00E9es +SynthesisId.IND_COMPLIANCE_BOARDING=Respect du nombre d'observateurs embarqu\u00E9s +SynthesisId.IND_CONTACT_STATE=\u00C9tats des contacts +SynthesisId.IND_DATA_RELIABILITY=Qualit\u00E9 de la donn\u00E9e UserRole.ADMIN=Administrateur UserRole.COORDINATOR=Coordinateur -UserRole.GUEST=Invit\u00e9 +UserRole.GUEST=Invit\u00E9 UserRole.OBSERVER=Observateur -fr.ifremer.wao.entity.FishingGearDCF.=Non sp\u00e9cifi\u00e9 -fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorqu\u00e9es par bateau -fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues \u00e0 main -fr.ifremer.wao.entity.FishingGearDCF.FAR=Pi\u00e8ges a\u00e9riens -fr.ifremer.wao.entity.FishingGearDCF.FCN=\u00c9perviers -fr.ifremer.wao.entity.FishingGearDCF.FG=Autres engins retombants (non-sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.FIX=Pi\u00e8ges (non-sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.FPN=Filets-pi\u00e8ges fixes non couverts +fr.ifremer.wao.entity.FishingGearDCF.=Non sp\u00E9cifi\u00E9 +fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorqu\u00E9es par bateau +fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues \u00E0 main +fr.ifremer.wao.entity.FishingGearDCF.FAR=Pi\u00E8ges a\u00E9riens +fr.ifremer.wao.entity.FishingGearDCF.FCN=\u00C9perviers +fr.ifremer.wao.entity.FishingGearDCF.FG=Autres engins retombants (non-sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.FIX=Pi\u00E8ges (non-sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.FPN=Filets-pi\u00E8ges fixes non couverts fr.ifremer.wao.entity.FishingGearDCF.FPO=Nasses (casiers) -fr.ifremer.wao.entity.FishingGearDCF.FSN=Filets \u00e0 l'\u00e9talage (diables) +fr.ifremer.wao.entity.FishingGearDCF.FSN=Filets \u00E0 l'\u00E9talage (diables) fr.ifremer.wao.entity.FishingGearDCF.FWR=Barrages, parcs, bordigues, etc. fr.ifremer.wao.entity.FishingGearDCF.FYK=Verveux -fr.ifremer.wao.entity.FishingGearDCF.GEN=Filets maillants et filets emm\u00e9lants (non sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.GES=Tamis \u00e0 civelles -fr.ifremer.wao.entity.FishingGearDCF.GN=Filets maillants (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.GEN=Filets maillants et filets emm\u00E9lants (non sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.GES=Tamis \u00E0 civelles +fr.ifremer.wao.entity.FishingGearDCF.GN=Filets maillants (non sp\u00E9cifi\u00E9s) fr.ifremer.wao.entity.FishingGearDCF.GNC=Filets maillants encerclants -fr.ifremer.wao.entity.FishingGearDCF.GND=Filets maillants d\u00e9rivants (filets d\u00e9rivants) +fr.ifremer.wao.entity.FishingGearDCF.GND=Filets maillants d\u00E9rivants (filets d\u00E9rivants) fr.ifremer.wao.entity.FishingGearDCF.GNF=Filets maillants fixes (sur perches) -fr.ifremer.wao.entity.FishingGearDCF.GNS=Filets maillants cal\u00e9s (ancr\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.GT=Tr\u00e9mailleurs -fr.ifremer.wao.entity.FishingGearDCF.GTN=Tr\u00e9mails et filets maillants combin\u00e9s -fr.ifremer.wao.entity.FishingGearDCF.GTR=Tr\u00e9mails +fr.ifremer.wao.entity.FishingGearDCF.GNS=Filets maillants cal\u00E9s (ancr\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.GT=Tr\u00E9mailleurs +fr.ifremer.wao.entity.FishingGearDCF.GTN=Tr\u00E9mails et filets maillants combin\u00E9s +fr.ifremer.wao.entity.FishingGearDCF.GTR=Tr\u00E9mails fr.ifremer.wao.entity.FishingGearDCF.HAR=Harpons -fr.ifremer.wao.entity.FishingGearDCF.HMD=Dragues m\u00e9canis\u00e9es +fr.ifremer.wao.entity.FishingGearDCF.HMD=Dragues m\u00E9canis\u00E9es fr.ifremer.wao.entity.FishingGearDCF.HMP=Pompes -fr.ifremer.wao.entity.FishingGearDCF.HMX=Engins de r\u00e9colte (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.HMX=Engins de r\u00E9colte (non sp\u00E9cifi\u00E9s) fr.ifremer.wao.entity.FishingGearDCF.LA=Filets tournants sans coulisse (filet lamparo) -fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes \u00e0 main et lignes avec cannes -fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes \u00e0 main et lignes \u00e0 cannes -fr.ifremer.wao.entity.FishingGearDCF.LL=Palangres (non sp\u00e9cifi\u00e9es) -fr.ifremer.wao.entity.FishingGearDCF.LLD=Palangres d\u00e9rivantes -fr.ifremer.wao.entity.FishingGearDCF.LLS=Palangres cal\u00e9es ou semi-flottantes -fr.ifremer.wao.entity.FishingGearDCF.LN=Filets soulev\u00e9s (non sp\u00e9cifi\u00e9s) -fr.ifremer.wao.entity.FishingGearDCF.LNB=Filets soulev\u00e9s man\u0153uvr\u00e9es du bateau -fr.ifremer.wao.entity.FishingGearDCF.LNP=Filets soulev\u00e9s portatifs -fr.ifremer.wao.entity.FishingGearDCF.LNS=Filets soulev\u00e9s fixes man\u0153uvr\u00e9es du rivage -fr.ifremer.wao.entity.FishingGearDCF.LTL=lignes de tra\u00eene -fr.ifremer.wao.entity.FishingGearDCF.LX=Hame\u00e7ons et lignes (non sp\u00e9cifi\u00e9s) +fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes \u00E0 main et lignes avec cannes +fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes \u00E0 main et lignes \u00E0 cannes +fr.ifremer.wao.entity.FishingGearDCF.LL=Palangres (non sp\u00E9cifi\u00E9es) +fr.ifremer.wao.entity.FishingGearDCF.LLD=Palangres d\u00E9rivantes +fr.ifremer.wao.entity.FishingGearDCF.LLS=Palangres cal\u00E9es ou semi-flottantes +fr.ifremer.wao.entity.FishingGearDCF.LN=Filets soulev\u00E9s (non sp\u00E9cifi\u00E9s) +fr.ifremer.wao.entity.FishingGearDCF.LNB=Filets soulev\u00E9s man\u0153uvr\u00E9es du bateau +fr.ifremer.wao.entity.FishingGearDCF.LNP=Filets soulev\u00E9s portatifs +fr.ifremer.wao.entity.FishingGearDCF.LNS=Filets soulev\u00E9s fixes man\u0153uvr\u00E9es du rivage +fr.ifremer.wao.entity.FishingGearDCF.LTL=lignes de tra\u00EEne +fr.ifremer.wao.entity.FishingGearDCF.LX=Hame\u00E7ons et lignes (non sp\u00E9cifi\u00E9s) fr.ifremer.wao.entity.FishingGearDCF.MIS=Divers -fr.ifremer.wao.entity.FishingGearDCF.NK=Engins inconnus ou non sp\u00e9cifi\u00e9s -fr.ifremer.wao.entity.FishingGearDCF.OT=Chaluts \u00e0 panneaux (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.FishingGearDCF.OTB=Chalut de fond \u00e0 panneaux -fr.ifremer.wao.entity.FishingGearDCF.OTM=Chaluts p\u00e9lagiques \u00e0 panneaux -fr.ifremer.wao.entity.FishingGearDCF.OTT=Chaluts jumeaux \u00e0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.NK=Engins inconnus ou non sp\u00E9cifi\u00E9s +fr.ifremer.wao.entity.FishingGearDCF.OT=Chaluts \u00E0 panneaux (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.FishingGearDCF.OTB=Chalut de fond \u00E0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.OTM=Chaluts p\u00E9lagiques \u00E0 panneaux +fr.ifremer.wao.entity.FishingGearDCF.OTT=Chaluts jumeaux \u00E0 panneaux fr.ifremer.wao.entity.FishingGearDCF.PS=Filets tournants avec coulisse (sennes coulissantes) -fr.ifremer.wao.entity.FishingGearDCF.PS1=Filets tournants, sennes coulissantes man\u0153uvr\u00e9es par un bateau -fr.ifremer.wao.entity.FishingGearDCF.PS2=Filets tournants, sennes coulissantes man\u0153uvr\u00e9es par deux bateaux -fr.ifremer.wao.entity.FishingGearDCF.PT=Chalut-b\u0153ufs (non sp\u00e9cifi\u00e9) +fr.ifremer.wao.entity.FishingGearDCF.PS1=Filets tournants, sennes coulissantes man\u0153uvr\u00E9es par un bateau +fr.ifremer.wao.entity.FishingGearDCF.PS2=Filets tournants, sennes coulissantes man\u0153uvr\u00E9es par deux bateaux +fr.ifremer.wao.entity.FishingGearDCF.PT=Chalut-b\u0153ufs (non sp\u00E9cifi\u00E9) fr.ifremer.wao.entity.FishingGearDCF.PTB=Chalut-b\u0153ufs de fond -fr.ifremer.wao.entity.FishingGearDCF.PTM=Chalut-b\u0153ufs p\u00e9lagiques -fr.ifremer.wao.entity.FishingGearDCF.RG=Engins de p\u00eache r\u00e9vr\u00e9ative +fr.ifremer.wao.entity.FishingGearDCF.PTM=Chalut-b\u0153ufs p\u00E9lagiques +fr.ifremer.wao.entity.FishingGearDCF.RG=Engins de p\u00EAche r\u00E9vr\u00E9ative fr.ifremer.wao.entity.FishingGearDCF.SB=Sennes de plages fr.ifremer.wao.entity.FishingGearDCF.SDN=Sennes danoises -fr.ifremer.wao.entity.FishingGearDCF.SPR=Sennes man\u0153uvr\u00e9es par deux bateaux -fr.ifremer.wao.entity.FishingGearDCF.SSC=Sennes \u00e9cossaises -fr.ifremer.wao.entity.FishingGearDCF.SV=Sennes hal\u00e9es \u00e0 bord -fr.ifremer.wao.entity.FishingGearDCF.SW=Sennes (non sp\u00e9cifi\u00e9es) -fr.ifremer.wao.entity.FishingGearDCF.TB=Chalut de fond (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.FishingGearDCF.TBB=Chaluts \u00e0 perche -fr.ifremer.wao.entity.FishingGearDCF.TBN=Chalut \u00e0 langoustines -fr.ifremer.wao.entity.FishingGearDCF.TBS=Chalut \u00e0 crevettes -fr.ifremer.wao.entity.FishingGearDCF.TM=Chalut p\u00e9lagique (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut \u00e0 crevettes -fr.ifremer.wao.entity.FishingGearDCF.TX=Autre chalut (non sp\u00e9cifi\u00e9) -fr.ifremer.wao.entity.TargetSpeciesDCF.=Non sp\u00e9cifi\u00e9 +fr.ifremer.wao.entity.FishingGearDCF.SPR=Sennes man\u0153uvr\u00E9es par deux bateaux +fr.ifremer.wao.entity.FishingGearDCF.SSC=Sennes \u00E9cossaises +fr.ifremer.wao.entity.FishingGearDCF.SV=Sennes hal\u00E9es \u00E0 bord +fr.ifremer.wao.entity.FishingGearDCF.SW=Sennes (non sp\u00E9cifi\u00E9es) +fr.ifremer.wao.entity.FishingGearDCF.TB=Chalut de fond (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.FishingGearDCF.TBB=Chaluts \u00E0 perche +fr.ifremer.wao.entity.FishingGearDCF.TBN=Chalut \u00E0 langoustines +fr.ifremer.wao.entity.FishingGearDCF.TBS=Chalut \u00E0 crevettes +fr.ifremer.wao.entity.FishingGearDCF.TM=Chalut p\u00E9lagique (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut \u00E0 crevettes +fr.ifremer.wao.entity.FishingGearDCF.TX=Autre chalut (non sp\u00E9cifi\u00E9) +fr.ifremer.wao.entity.TargetSpeciesDCF.=Non sp\u00E9cifi\u00E9 fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algues -fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Esp\u00e8ces catadromes -fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustac\u00e9s +fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Esp\u00E8ces catadromes +fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustac\u00E9s fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Coquilles Saint-Jacques -fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Esp\u00e8ces d\u00e9mersales -fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Esp\u00e8ces d'eaux profondes +fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Esp\u00E8ces d\u00E9mersales +fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Esp\u00E8ces d'eaux profondes fr.ifremer.wao.entity.TargetSpeciesDCF.FIN=Poisson plats -fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands p\u00e9lagiques +fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands p\u00E9lagiques fr.ifremer.wao.entity.TargetSpeciesDCF.MOL=Mollusques -fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits p\u00e9lagiques -wao.business.contact.validation.commentAdminNecessaryForDataReliability=Il faut pr\u00e9ciser dans le commentaire administrateur pourquoi la donn\u00e9e est '%s' -wao.business.contact.validation.dataReliabilityMissingForValidation=Il faut pr\u00e9ciser la qualit\u00e9 de la donn\u00e9e avant de valider +fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits p\u00E9lagiques +wao.business.contact.validation.commentAdminNecessaryForDataReliability=Il faut pr\u00E9ciser dans le commentaire administrateur pourquoi la donn\u00E9e est '%s' +wao.business.contact.validation.dataReliabilityMissingForValidation=Il faut pr\u00E9ciser la qualit\u00E9 de la donn\u00E9e avant de valider wao.business.entity.UserProfile.description=%s sur %s%s wao.business.other=Autre wao.business.readOnly=(lecture seule) -wao.error.boat.canCreateContact=Impossible de cr\u00e9er un nouveau contact pour la soci\u00e9t\u00e9 %1$s et le navire %2$s (%3$d) -wao.error.boat.getNbBoarding=Impossible de r\u00e9cup\u00e9rer le nombre d'embarquements r\u00e9els depuis le %1$s -wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00e9cup\u00e9rer le nombre d'embarquements r\u00e9els depuis le %1$s pour la soci\u00e9t\u00e9 %2$s +wao.error.boat.canCreateContact=Impossible de cr\u00E9er un nouveau contact pour la soci\u00E9t\u00E9 %1$s et le navire %2$s (%3$d) +wao.error.boat.getNbBoarding=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s +wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s pour la soci\u00E9t\u00E9 %2$s wao.error.context.close=Une erreur est survenue pendant la fermeture du contexte principale de ToPIA wao.error.context.encodeString= -wao.error.context.getRootContext=Une erreur est survenue pour la r\u00e9cup\u00e9ration du contexte principale de ToPIA +wao.error.context.getRootContext=Une erreur est survenue pour la r\u00E9cup\u00E9ration du contexte principale de ToPIA wao.error.context.parse=Une erreur est survenue pendant le chargement de la configuration du fichier %1$s wao.error.context.rollback=Une erreur est survenue pendant l'annulation de la transaction courante -wao.error.context.start=Une erreur est survenue pendant le d\u00e9marrage de l'application +wao.error.context.start=Une erreur est survenue pendant le d\u00E9marrage de l'application wao.error.context.stop=Une erreur est survenue pendant la fermeture de l'application -wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de mar\u00e9es r\u00e9els pour le mois de %1$s [ligne \: %2$s] -wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire \u00e9crit par %1$s -wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de cr\u00e9er ou modifier les informations li\u00e9s au navire %1$d pour la soci\u00e9t\u00e9 %2$s -wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires s\u00e9lectionn\u00e9s +wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de mar\u00E9es r\u00E9els pour le mois de %1$s [ligne \: %2$s] +wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire \u00E9crit par %1$s +wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de cr\u00E9er ou modifier les informations li\u00E9s au navire %1$d pour la soci\u00E9t\u00E9 %2$s +wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires s\u00E9lectionn\u00E9s wao.error.serviceBoat.getActivityCalendarLogAccessFile= wao.error.serviceBoat.getActivityCalendarLogFile= wao.error.serviceBoat.getBoat=Impossible de charger le navire -wao.error.serviceBoat.getBoatNamesStartWith=Impossible de r\u00e9cup\u00e9rer les navires avec un nom commencant par '%1$s' +wao.error.serviceBoat.getBoatNamesStartWith=Impossible de r\u00E9cup\u00E9rer les navires avec un nom commencant par '%1$s' wao.error.serviceBoat.getBoatsByFilter=Impossible de filtrer la liste des navires -wao.error.serviceBoat.getBoatsByImmatriculations=La cha\u00eene d'immatriculations est incorrect \! Chaque immatriculation doit poss\u00e9der 6 chiffres -wao.error.serviceBoat.getCompanyBoatInfos=Impossible de r\u00e9cup\u00e9rer les informations du navire immatricul\u00e9 %1$d pour la soci\u00e9t\u00e9 %2$s -wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activit\u00e9 du navire %1$s (%2$d) +wao.error.serviceBoat.getBoatsByImmatriculations=La cha\u00EEne d'immatriculations est incorrect \! Chaque immatriculation doit poss\u00E9der 6 chiffres +wao.error.serviceBoat.getCompanyBoatInfos=Impossible de r\u00E9cup\u00E9rer les informations du navire immatricul\u00E9 %1$d pour la soci\u00E9t\u00E9 %2$s +wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activit\u00E9 du navire %1$s (%2$d) wao.error.serviceBoat.getNbBoatsByFilter=Impossible de filtrer la liste des navires wao.error.serviceBoat.getShipOwnerNamesContains= -wao.error.serviceBoat.importActivityCalendarCsv=Probl\u00e8me d'import du fichier CSV des calendriers d'activit\u00e9 -wao.error.serviceBoat.importBoatCsv=Probl\u00e8me d'import du fichier CSV. V\u00e9rifiez l'en-t\u00eate du fichier \: [ NAVS_COD,CARN_NOM,CARN_LONGUEUR_HT,CARN_ANNEE,QUARTIER_IMMA,PER_COD,PER_NOM,PER_PRENOM,NAVS_ACTIVE ]. Voir documentation pour plus de d\u00e9tails. +wao.error.serviceBoat.importActivityCalendarCsv=Probl\u00E8me d'import du fichier CSV des calendriers d'activit\u00E9 +wao.error.serviceBoat.importBoatCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier \: [ NAVS_COD,CARN_NOM,CARN_LONGUEUR_HT,CARN_ANNEE,QUARTIER_IMMA,PER_COD,PER_NOM,PER_PRENOM,NAVS_ACTIVE ]. Voir documentation pour plus de d\u00E9tails. wao.error.serviceCartography.exportContactStatisticsKml= -wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonn\u00e9es des quartiers des navires. V\u00e9rifiez la documentation pour le bon format du fichier Kml. +wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonn\u00E9es des quartiers des navires. V\u00E9rifiez la documentation pour le bon format du fichier Kml. wao.error.serviceChart.getContactPieChartData= wao.error.serviceChart.getContactPieChartUrl= wao.error.serviceContact.exportContactCsv=Impossible d'exporter les contacts wao.error.serviceContact.getContact=Impossible de trouver le contact wao.error.serviceContact.getContacts=Impossible de filtrer la liste des contacts -wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00e9s +wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtr\u00E9s wao.error.serviceContact.getNewContact=Impossible d'instancier un nouveau contact wao.error.serviceContact.importContactCsv=Impossible d'importer les contacts wao.error.serviceContact.saveComment= @@ -158,60 +158,60 @@ wao.error.serviceContact.updateSampleMonthTidesValue= wao.error.serviceContact.validateContact= wao.error.serviceNews.getNewNews= -wao.error.serviceNews.getNews=Impossible de r\u00e9cup\u00e9rer l'ensemble des news +wao.error.serviceNews.getNews=Impossible de r\u00E9cup\u00E9rer l'ensemble des news wao.error.serviceNews.saveNews=Impossible d'enregistrer la news ayant pour titre '%1$s' wao.error.serviceReferential.getAllTerrestrialDistricts= wao.error.serviceReferential.getAllTerrestrialLocations= wao.error.serviceReferential.getCodesDCF5Contains= wao.error.serviceReferential.getFacades=Impossible de charger la liste des facades -wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de p\u00eache -wao.error.serviceReferential.getProfessions=Impossible de charger la liste des m\u00e9tiers -wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de p\u00eache +wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de p\u00EAche +wao.error.serviceReferential.getProfessions=Impossible de charger la liste des m\u00E9tiers +wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de p\u00EAche wao.error.serviceReferential.getTerrestrialDistrict= -wao.error.serviceReferential.importDCFcodes=Impossible de cr\u00e9er le r\u00e9f\u00e9rentiel des codes DCF -wao.error.serviceReferential.importFishingZoneCsv=Probl\u00e8me d'import du fichier CSV. V\u00e9rifiez l'en-t\u00eate du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de d\u00e9tails. +wao.error.serviceReferential.importDCFcodes=Impossible de cr\u00E9er le r\u00E9f\u00E9rentiel des codes DCF +wao.error.serviceReferential.importFishingZoneCsv=Probl\u00E8me d'import du fichier CSV. V\u00E9rifiez l'en-t\u00EAte du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de d\u00E9tails. wao.error.serviceReferential.importTerrestrialLocations= wao.error.serviceSampling.createSampleRowLog= -wao.error.serviceSampling.createUpdateSampleRow=Impossible de sauvegarder la ligne d'\u00e9chantillon -wao.error.serviceSampling.deleteSampleRow=Impossible de supprimer la ligne d'\u00e9chantillon \: %1$s -wao.error.serviceSampling.exportSamplingPlanCsv=Impossible d'exporter le plan d'\u00e9chantillonnage sur la p\u00e9riode du %1$s au %2$s +wao.error.serviceSampling.createUpdateSampleRow=Impossible de sauvegarder la ligne d'\u00E9chantillon +wao.error.serviceSampling.deleteSampleRow=Impossible de supprimer la ligne d'\u00E9chantillon \: %1$s +wao.error.serviceSampling.exportSamplingPlanCsv=Impossible d'exporter le plan d'\u00E9chantillonnage sur la p\u00E9riode du %1$s au %2$s wao.error.serviceSampling.getDCFGears= wao.error.serviceSampling.getDCFSpecies= wao.error.serviceSampling.getNewProfession= wao.error.serviceSampling.getNewSampleMonth= wao.error.serviceSampling.getNewSampleRow= -wao.error.serviceSampling.getNewSampleRowCode=Impossible de r\u00e9cup\u00e9rer un nouveau code pour une ligne d'\u00e9chantillonnage +wao.error.serviceSampling.getNewSampleRowCode=Impossible de r\u00E9cup\u00E9rer un nouveau code pour une ligne d'\u00E9chantillonnage wao.error.serviceSampling.getNewSampleRowLog= wao.error.serviceSampling.getPrograms=Impossible de charger la liste des programmes -wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'\u00e9chantillon ayant pour identifiant \: %1$s -wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00e9chantillon ayant pour code %1$s -wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00e9cup\u00e9rer la liste des lignes du plan d'\u00e9chantillonnage -wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00e9cup\u00e9rer la liste des lignes du plan d'\u00e9chantillonnage -wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00e0 la ligne %1$d [CODE \= %2$s] +wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'\u00E9chantillon ayant pour identifiant \: %1$s +wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00E9chantillon ayant pour code %1$s +wao.error.serviceSampling.getSampleRowsByFilter=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage +wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de r\u00E9cup\u00E9rer la liste des lignes du plan d'\u00E9chantillonnage +wao.error.serviceSampling.importSamplingPlanCsv=Erreur \u00E0 la ligne %1$d [CODE \= %2$s] wao.error.serviceSynthesis.getAllIndicatorLogs= -wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es du graphique concernant les embarquements sur les navires +wao.error.serviceSynthesis.getBoardingBoats=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es du graphique concernant les embarquements sur les navires wao.error.serviceSynthesis.getComplianceBoardingIndicator= -wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de r\u00e9cup\u00e9rer l'indicateur de r\u00e9activit\u00e9 sur les dates de saisies dans Allegro +wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de r\u00E9cup\u00E9rer l'indicateur de r\u00E9activit\u00E9 sur les dates de saisies dans Allegro wao.error.serviceSynthesis.getContactPieChartData= wao.error.serviceSynthesis.getContactPieChartDataByBoatDistrict= -wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00e9cup\u00e9rer les statistiques sur les \u00e9tats des contacts +wao.error.serviceSynthesis.getContactStateStatistics=Impossible de r\u00E9cup\u00E9rer les statistiques sur les \u00E9tats des contacts wao.error.serviceSynthesis.getDataReliability= -wao.error.serviceSynthesis.getDataSampling=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es pour le graphique dynamique des efforts de mar\u00e9es -wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00e9cup\u00e9rer les donn\u00e9es concernant les indicateurs pour la synth\u00e8se globale +wao.error.serviceSynthesis.getDataSampling=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es pour le graphique dynamique des efforts de mar\u00E9es +wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de r\u00E9cup\u00E9rer les donn\u00E9es concernant les indicateurs pour la synth\u00E8se globale wao.error.serviceSynthesis.getGlobalSynthesisResult= -wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00e9cup\u00e9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00e9s -wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00e0 jour les param\u00e8tres de la synth\u00e8se globale +wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de r\u00E9cup\u00E9rer l'indicateur de non respect du nombre d'observateurs embarqu\u00E9s +wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre \u00E0 jour les param\u00E8tres de la synth\u00E8se globale wao.error.serviceUser.connect=Une erreur est survenue lors de la demande de connexion -wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00e9er l'administrateur par d\u00e9faut -wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00e9er ou de mettre \u00e0 jour la soci\u00e9t\u00e9 -wao.error.serviceUser.createUpdateUser=Impossible de cr\u00e9er ou de mettre \u00e0 jour l'utilisateur -wao.error.serviceUser.deleteCompany=Impossible de supprimer la soci\u00e9t\u00e9 ou de v\u00e9rifier les contraintes de suppression +wao.error.serviceUser.createDefaultAdmin=Impossible de cr\u00E9er l'administrateur par d\u00E9faut +wao.error.serviceUser.createUpdateCompany=Impossible de cr\u00E9er ou de mettre \u00E0 jour la soci\u00E9t\u00E9 +wao.error.serviceUser.createUpdateUser=Impossible de cr\u00E9er ou de mettre \u00E0 jour l'utilisateur +wao.error.serviceUser.deleteCompany=Impossible de supprimer la soci\u00E9t\u00E9 ou de v\u00E9rifier les contraintes de suppression wao.error.serviceUser.deleteUser=Impossible de supprimer l'utilisateur wao.error.serviceUser.existLogin= wao.error.serviceUser.forgetPassword=Impossible d'envoyer le mail d'oubli de mot de passe -wao.error.serviceUser.getCompanies=Impossible de r\u00e9cup\u00e9rer la liste des soci\u00e9t\u00e9s +wao.error.serviceUser.getCompanies=Impossible de r\u00E9cup\u00E9rer la liste des soci\u00E9t\u00E9s wao.error.serviceUser.getCompany= wao.error.serviceUser.getNewUser=Impossible d'instancier un nouvel utilisateur -wao.error.serviceUser.getObservers=Impossible de r\u00e9cup\u00e9rer la liste des observateurs +wao.error.serviceUser.getObservers=Impossible de r\u00E9cup\u00E9rer la liste des observateurs wao.error.serviceUser.getUserRolesByLogin= -wao.error.serviceUser.getUsersByCompany=Impossible de r\u00e9cup\u00e9rer la liste des utilisateurs de la soci\u00e9t\u00e9 %1$s +wao.error.serviceUser.getUsersByCompany=Impossible de r\u00E9cup\u00E9rer la liste des utilisateurs de la soci\u00E9t\u00E9 %1$s Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-02-04 15:01:22 UTC (rev 983) +++ trunk/wao-ui/pom.xml 2011-02-04 15:22:16 UTC (rev 984) @@ -310,7 +310,7 @@ scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </connection> <developerConnection> - scm:svn:svn+ssh://bleny at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui + scm:svn:svn+ssh://${user.name}@labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui </developerConnection> </scm>

1 0