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

r2013 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-persistence/src/main/xmi wao-services/src/main/java/fr/ifremer/wao/services wao-services/src/main/resources/i18n wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/webapp wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 10, 2014

June 10, 2014

Author: bleny Date: 2014-06-10 14:11:12 +0200 (Tue, 10 Jun 2014) New Revision: 2013 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2013 Log: fixes #5098 update icons in contact lists Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ValidateContactJsonAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-06-10 12:11:12 UTC (rev 2013) @@ -24,6 +24,9 @@ package fr.ifremer.wao.entity; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; + import java.util.Date; import java.util.LinkedList; import java.util.List; @@ -178,4 +181,49 @@ } return allObservers; } + + @Override + public boolean isAcceptableByCompany() { + boolean requiredDataAreFilled; + if (getObsProgram() == ObsProgram.OBSMER) { + requiredDataAreFilled = getRestitution() != null; + } else { + requiredDataAreFilled = getDataInputDate() != null; + } + ContactState state = getContactState(); + boolean observationDone = + state.equals(ContactState.OBSERVATION_DONE) && + requiredDataAreFilled; + boolean acceptable = getValidationCompany() == null && + (state.isUnfinishedState() || observationDone); + return acceptable; + } + + @Override + public boolean isRefusableByCompany() { + return getValidationCompany() == null && StringUtils.isNotBlank(commentCoordinator); + } + + @Override + public boolean isUnacceptableByCompany() { + return getValidationCompany() != null && getValidationProgram() == null; + } + + @Override + public boolean isAcceptableByProgram() { + boolean acceptable = BooleanUtils.isTrue(getValidationCompany()) + && getValidationProgram() == null; + return acceptable; + } + + @Override + public boolean isRefusableByProgram() { + return BooleanUtils.isTrue(getValidationCompany()) && StringUtils.isNotBlank(commentAdmin); + } + + @Override + public boolean isUnacceptableByProgram() { + return getValidationProgram() != null; + } + } Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-10 12:11:12 UTC (rev 2013) @@ -24,7 +24,6 @@ import com.google.common.base.Preconditions; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.Contact; -import fr.ifremer.wao.entity.ContactState; import fr.ifremer.wao.entity.News; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.entity.UserProfile; @@ -242,41 +241,18 @@ return noValidation && getCanWrite(); } - /** - * Display validation actions. Evo #2063 : only coordinator can validate - * for a company. - * - * @return true if the validation actions can be displayed - */ - public boolean isAuthorizedToValidateContacts() { - return (isAdmin() || isCoordinator()) && !isReadOnly(); + public boolean isAuthorizedToChangeValidationCompany() { + return userProfile.isCoordinator(); } - public boolean isAuthorizedToValidateContact(Contact contact) { - // Can't validate during edition of the contact row - switch (getUserRole()) { - case ADMIN: - return contact.getValidationProgram() == null && - BooleanUtils.isTrue(contact.getValidationCompany()); - // Evo #2063 : only coordinator can validate - case COORDINATOR: - boolean requiredDataAreFilled; - if (contact.getObsProgram() == ObsProgram.OBSMER) { - requiredDataAreFilled = contact.getRestitution() != null; - } else { - requiredDataAreFilled = contact.getDataInputDate() != null; - } - ContactState state = contact.getContactState(); - boolean observationDone = - state.equals(ContactState.OBSERVATION_DONE) && - requiredDataAreFilled; - return contact.getValidationCompany() == null && - (state.isUnfinishedState() || observationDone); - default: - return false; - } + public boolean isAuthorizedToChangeValidationProgram() { + return userProfile.isAdmin(); } + public boolean isAuthorizedToChangeContactValidation() { + return isAuthorizedToChangeValidationCompany() || isAuthorizedToChangeValidationProgram(); + } + public boolean isAuthorizedToUnvalidateContact(Contact contact) { switch (getUserRole()) { case ADMIN: Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-06-10 12:11:12 UTC (rev 2013) @@ -89,5 +89,6 @@ wao.synthesis.planned=Planned wao.ui.chart.numberBoats=Number of boats wao.ui.chart.numberOfBoatsWithBoardings=Number of boats with x boardings +wao.ui.samplingPlan.Actual= wao.validation.sampleRow.conflictOnObserver=Observer %s cannot be associated to the line %s because he has to observer, on the same day, for row %s wao.validation.sampleRow.observerNotInCompany=Observer %s doesn't work for company %s Modified: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-06-10 12:11:12 UTC (rev 2013) @@ -86,5 +86,6 @@ wao.synthesis.planned=Planifié wao.ui.chart.numberBoats=Nombre de navires wao.ui.chart.numberOfBoatsWithBoardings=Nombres de navires avec x embarquements +wao.ui.samplingPlan.Actual= wao.validation.sampleRow.conflictOnObserver=L'observateur %s ne peut être associé à la ligne %s car il doit observer, le même jour, pour la ligne %s wao.validation.sampleRow.observerNotInCompany=L'observateur %s ne fait pas parti de la société %s Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-06-10 12:11:12 UTC (rev 2013) @@ -182,4 +182,40 @@ return dcf5CodesAndDescriptions; } + public boolean isAcceptable(Contact contact) { + boolean acceptable; + if (getAuthenticatedWaoUser().isAuthorizedToChangeValidationCompany()) { + acceptable = contact.isAcceptableByCompany(); + } else if (getAuthenticatedWaoUser().isAuthorizedToChangeValidationProgram()) { + acceptable = contact.isAcceptableByProgram(); + } else { + throw new IllegalStateException(); + } + return acceptable; + } + + public boolean isRefusable(Contact contact) { + boolean refuseable; + if (getAuthenticatedWaoUser().isAuthorizedToChangeValidationCompany()) { + refuseable = contact.isRefusableByCompany(); + } else if (getAuthenticatedWaoUser().isAuthorizedToChangeValidationProgram()) { + refuseable = contact.isRefusableByProgram(); + } else { + throw new IllegalStateException(); + } + return refuseable; + } + + public boolean isUnacceptable(Contact contact) { + boolean unacceptable; + if (getAuthenticatedWaoUser().isAuthorizedToChangeValidationCompany()) { + unacceptable = contact.isUnacceptableByCompany(); + } else if (getAuthenticatedWaoUser().isAuthorizedToChangeValidationProgram()) { + unacceptable = contact.isUnacceptableByProgram(); + } else { + throw new IllegalStateException(); + } + return unacceptable; + } + } \ No newline at end of file Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ValidateContactJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ValidateContactJsonAction.java 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ValidateContactJsonAction.java 2014-06-10 12:11:12 UTC (rev 2013) @@ -25,6 +25,7 @@ import com.google.common.base.Preconditions; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.WaoUtils; +import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.services.AuthenticatedWaoUser; import fr.ifremer.wao.services.service.ContactDataInputDateBeforeObservationEndDateException; import fr.ifremer.wao.services.service.ContactDataInputDateAfterTodayException; @@ -88,16 +89,6 @@ */ protected String errorMessage; - /** - * To update contact validation actions. - */ - protected boolean canValidateContact; - - /** - * To update contact validation actions. - */ - protected boolean canUnvalidateContact; - protected transient ObsMerContactsService service; protected UpdateContactCommand updateContactCommand; @@ -130,14 +121,6 @@ return errorMessage; } - public boolean isCanValidateContact() { - return canValidateContact; - } - - public boolean isCanUnvalidateContact() { - return canUnvalidateContact; - } - public boolean isSuccessful() { return errorMessage == null; } @@ -259,12 +242,53 @@ } else { successMessage = t("wao.ui.contacts.validation.to.reject.state.success"); } + } - canValidateContact = authenticatedWaoUser.isAuthorizedToValidateContact(updateContactCommand.getContact()); + return SUCCESS; + } - canUnvalidateContact = authenticatedWaoUser.isAuthorizedToUnvalidateContact(updateContactCommand.getContact()); + public boolean isAcceptable(Contact contact) { + boolean acceptable; + if (session.getAuthenticatedWaoUser().isAuthorizedToChangeValidationCompany()) { + acceptable = contact.isAcceptableByCompany(); + } else if (session.getAuthenticatedWaoUser().isAuthorizedToChangeValidationProgram()) { + acceptable = contact.isAcceptableByProgram(); + } else { + throw new IllegalStateException(); } + return acceptable; + } - return SUCCESS; + public boolean isRefusable(Contact contact) { + boolean refuseable; + if (session.getAuthenticatedWaoUser().isAuthorizedToChangeValidationCompany()) { + refuseable = contact.isRefusableByCompany(); + } else if (session.getAuthenticatedWaoUser().isAuthorizedToChangeValidationProgram()) { + refuseable = contact.isRefusableByProgram(); + } else { + throw new IllegalStateException(); + } + return refuseable; } + + public boolean isUnacceptable(Contact contact) { + boolean unacceptable; + if (session.getAuthenticatedWaoUser().isAuthorizedToChangeValidationCompany()) { + unacceptable = contact.isUnacceptableByCompany(); + } else if (session.getAuthenticatedWaoUser().isAuthorizedToChangeValidationProgram()) { + unacceptable = contact.isUnacceptableByProgram(); + } else { + throw new IllegalStateException(); + } + return unacceptable; + } + + public Boolean getValidationProgram() { + return updateContactCommand.getContact().getValidationProgram(); + } + + public Boolean getValidationCompany() { + return updateContactCommand.getContact().getValidationCompany(); + } + } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-10 12:11:12 UTC (rev 2013) @@ -132,7 +132,18 @@ if (successful) { var success = data['successMessage']; WAO.notifications.success(success); - // TODO Update line and data actions + var $tr = $('#contacts-list').find('tr[data-contactId="' + data.contactId + '"]'); + $tr.removeClass('accepted-by-company refused-by-company accepted-by-program refused-by-program'); + if (data.validationCompany) { + $tr.addClass('accepted-by-company'); + } else if (data.validationCompany === false) { + $tr.addClass('refused-by-company'); + } + if (data.validationProgram) { + $tr.addClass('accepted-by-program'); + } else if (data.validationProgram === false) { + $tr.addClass('refused-by-program'); + } } else { var error = data['errorMessage']; WAO.notifications.error(error); @@ -320,7 +331,8 @@ <tbody> <s:iterator value="contacts" var="contact"> - <tr class="contact-row<s:if test="topiaId.equals(contactToHighlightId)"> highlight</s:if>"> + <s:set name="trCssClasses">contact-row<s:if test="topiaId.equals(contactToHighlightId)"> highlight</s:if><s:if test="validationCompany==null"></s:if><s:elseif test="validationCompany"> accepted-by-company</s:elseif><s:else> refused-by-company</s:else><s:if test="validationProgram==null"></s:if><s:elseif test="validationProgram"> accepted-by-program</s:elseif><s:else> refused-by-program</s:else></s:set> + <tr class="<s:property value="#trCssClasses"/>" data-contactId="<s:property value="topiaId"/>"> <td> <s:property value="creationDate"/> </td> @@ -458,39 +470,16 @@ </s:if> </td> <td> - <s:if test="validationCompany == null"> - "> - - - </s:if> - <s:elseif test="validationCompany"> - "> - - - - </s:elseif> - <s:else> - "> - - - - </s:else> - <s:if test="validationProgram == null"> - "> - - - </s:if> - <s:elseif test="validationProgram"> - "> - - - - </s:elseif> - <s:else>"> - - - - </s:else> + "> + + + + + "> + + + + </td> <td class="actions"> <div class="dropdown"> @@ -516,37 +505,34 @@ </s:a> </li> </s:if> - <s:if test="authenticatedWaoUser.authorizedToValidateContacts"> - <s:if test="authenticatedWaoUser.isAuthorizedToValidateContact(#contact)"> - <li> - <s:url action="validate-contact-json" id="acceptContactUrl" escapeAmp="false"> - <s:param name="contactId" value="topiaId"/> - <s:param name="validationState">true</s:param> - </s:url> - <s:a cssClass="validation-action" href="%{acceptContactUrl}"> - <s:text name="wao.ui.action.acceptContact"/> - </s:a> - </li> - <li> - <s:url action="validate-contact-json" id="refuseContactUrl" escapeAmp="false"> - <s:param name="contactId" value="topiaId"/> - <s:param name="validationState">false</s:param> - </s:url> - <s:a cssClass="validation-action" href="%{refuseContactUrl}"> - <s:text name="wao.ui.action.refuseContact"/> - </s:a> - </li> - </s:if> - <s:if test="authenticatedWaoUser.isAuthorizedToUnvalidateContact(#contact)"> - <li> - <s:url action="validate-contact-json" id="unvalidateContactUrl"> - <s:param name="contactId" value="topiaId"/> - </s:url> - <s:a cssClass="validation-action" href="%{unvalidateContactUrl}"> - <s:text name="wao.ui.action.unvalidateContact"/> - </s:a> - </li> - </s:if> + <s:if test="authenticatedWaoUser.authorizedToChangeContactValidation"> + <li> + <s:url action="validate-contact-json" id="acceptContactUrl" escapeAmp="false"> + <s:param name="contactId" value="topiaId"/> + <s:param name="validationState">true</s:param> + </s:url> + <s:set name="disabled"><s:if test="%{ ! isAcceptable(#contact)}">disabled</s:if></s:set> + <s:a cssClass="validation-action" href="%{acceptContactUrl}"> + <s:text name="wao.ui.action.acceptContact"/> + </s:a> + </li> + <li> + <s:url action="validate-contact-json" id="refuseContactUrl" escapeAmp="false"> + <s:param name="contactId" value="topiaId"/> + <s:param name="validationState">false</s:param> + </s:url> + <s:a cssClass="validation-action" href="%{refuseContactUrl}"> + <s:text name="wao.ui.action.refuseContact"/> + </s:a> + </li> + <li> + <s:url action="validate-contact-json" id="unvalidateContactUrl"> + <s:param name="contactId" value="topiaId"/> + </s:url> + <s:a cssClass="validation-action" href="%{unvalidateContactUrl}"> + <s:text name="wao.ui.action.unvalidateContact"/> + </s:a> + </li> </s:if> </ul> </div> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-06-06 13:09:47 UTC (rev 2012) +++ trunk/wao-web/src/main/webapp/wao.css 2014-06-10 12:11:12 UTC (rev 2013) @@ -708,6 +708,24 @@ } /** + * Contacts + */ + +#contacts-list .only-if-refused-by-company, +#contacts-list .only-if-accepted-by-company, +#contacts-list .only-if-refused-by-program, +#contacts-list .only-if-accepted-by-program { + display: none; +} + +#contacts-list tr.accepted-by-company .only-if-accepted-by-company, +#contacts-list tr.refused-by-company .only-if-refused-by-company, +#contacts-list tr.accepted-by-program .only-if-accepted-by-program, +#contacts-list tr.refused-by-program .only-if-refused-by-program { + display: block; +} + +/** * Accueil */ main.home .news {

1 0

r2012 - trunk/wao-web/src/main/webapp
by lkaufmann＠users.forge.codelutin.com June 6, 2014

June 6, 2014

Author: lkaufmann Date: 2014-06-06 15:09:47 +0200 (Fri, 06 Jun 2014) New Revision: 2012 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2012 Log: Update Synthetis display Modified: trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-06-06 12:50:34 UTC (rev 2011) +++ trunk/wao-web/src/main/webapp/wao.css 2014-06-06 13:09:47 UTC (rev 2012) @@ -838,6 +838,35 @@ * Synthèse */ +.syntheses { + background: #EFEFEF; +} + +.syntheses #synthesis-filters-form { + margin-bottom: 0; +} + +.syntheses article { + max-width: 968px; + margin: 0 auto; + background-color: #FFF; + border-left: 1px solid #BBB; + border-right: 1px solid #BBB; + border-bottom: 1px solid #EEE; + margin: 0 auto; + max-width: 968px; + padding: 10px 20px 20px 20px; +} + +.syntheses .table { + background-color: #FAFAFA; + margin: 0 auto; + max-width: 968px; +} +.syntheses .table thead tr th { + background-color: #F0F0F0; +} + .syntheses th, .syntheses td { text-align: right;

1 0

r2011 - trunk/wao-web/src/main/webapp
by lkaufmann＠users.forge.codelutin.com June 6, 2014

June 6, 2014

Author: lkaufmann Date: 2014-06-06 14:50:34 +0200 (Fri, 06 Jun 2014) New Revision: 2011 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2011 Log: Refs #4997 Change filter display & Tooltip correction Modified: trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-06-05 15:46:38 UTC (rev 2010) +++ trunk/wao-web/src/main/webapp/wao.css 2014-06-06 12:50:34 UTC (rev 2011) @@ -398,6 +398,32 @@ margin: 0; } +.extra-filters .control-group { + background-color: #EEE; + padding: 0; + border: 1px solid #DADADA; +} + +.extra-filters .control-group .control-label { + background-color: #E5E5E5; + border-bottom: 1px solid #AAA; + padding: 0 5px; + margin: 0; +} +.extra-filters .control-group .control-label button.open-button { + float: right; + padding: 0 0 0 10px; +} + +.extra-filters .control-group .control-label:hover { + background-color: #E0E0E0; +} +.extra-filters .control-group .controls { + border-top: 1px solid #FFF; + padding: 0 5px; +} + + /** * Les boutons */ @@ -501,7 +527,11 @@ .fa-comment { font-size: 1.5em; color: #2F4F4F; + padding: 5px; } +.fa-comment:hover { + cursor: pointer; +} .chart { height: 400px; @@ -596,14 +626,30 @@ #boats-filters-form .control-group { clear: left; + width: 90%; } -#boats-filters-form button { - margin-top: 5px; +#boats-filters-form .form-actions button, +#boats-filters-form .form-actions a.btn { + margin: 5px 0; + padding: 0 10px 0 5px; clear: left; float: left; } +#boats-filters-form .extra-filters .control-group{ + background-color: #F3F3F3; + border: 1px solid #CCC; +} +#boats-filters-form .extra-filters .control-group .control-label { + background-color: #DADADA; +} +#boats-filters-form .extra-filters .control-group .controls { + border-top: 1px solid #DDD; + min-height: 20px; +} + + #boats-filters-list-details-layout { display: flex; justify-content: space-around;

1 0

Build failed in Jenkins: wao-nightly #56
by admin+ci-codelutin.com＠codelutin.com June 5, 2014

June 5, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/56/changes> Changes: [bleny] refs #4490 just put the link on the name [bleny] fix NPE [bleny] refs #4490 introduce cache for boats [bleny] refs #4490 too many shipowners, ask user to type 3 caracters before searching [bleny] fixes #4483 cache for sampling plan [bleny] refactor to allow caching ------------------------------------------ [...truncated 256 lines...] [JENKINS] Recording test results log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ wao-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ wao-persistence >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ wao-persistence --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-persistence --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ wao-persistence --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [INFO] [INFO] --- eugene-maven-plugin:2.9:generate (generate-entities) @ wao-persistence --- [INFO] Process phase [zargo] [INFO] No file generated. [INFO] Process phase [xmi] [INFO] No file generated. [INFO] Process phase [model] [INFO] Process phase [generator] [INFO] Apply generator TopiaMetaTransformer [INFO] No file generated. [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ wao-persistence <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ wao-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ wao-persistence --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ wao-persistence --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ wao-persistence --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ wao-persistence --- [INFO] Loaded <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/target/collect-art…> [INFO] Copying wao-persistence-4.0-SNAPSHOT.jar to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/target/collect/fr.…> [INFO] Copying THIRD-PARTY.properties to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/target/collect/fr.…> [INFO] Copying wao-persistence-4.0-SNAPSHOT-sources.jar to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/target/collect/fr.…> [INFO] Copying wao-persistence-4.0-SNAPSHOT-javadoc.jar to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/target/collect/fr.…> [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ wao-persistence --- [WARNING] Skipping goal (No file to collect). [INFO] [INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ wao-persistence --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ wao-persistence --- [INFO] Used declared dependencies found: [INFO] org.nuiton.topia:topia-persistence:jar:3.0-beta-4:compile [INFO] org.hibernate:hibernate-core:jar:4.3.5.Final:compile [INFO] org.nuiton:nuiton-utils:jar:3.0-SNAPSHOT:compile [INFO] org.nuiton:nuiton-config:jar:3.0-alpha-2:compile [INFO] org.nuiton.i18n:nuiton-i18n:jar:3.1:compile [INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile [INFO] commons-logging:commons-logging:jar:1.1.3:compile [INFO] org.apache.commons:commons-collections4:jar:4.0:compile [INFO] com.google.guava:guava:jar:17.0:compile [INFO] junit:junit:jar:4.11:test [INFO] [INFO] --- maven-install-plugin:2.5.1:install (default-install) @ wao-persistence --- [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/po…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT.pom [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/sr…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT-third-party.properties [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT-sources.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT-javadoc.jar [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT.jar.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT.pom.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT-third-party.properties.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT-sources.jar.asc [INFO] Installing <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-persistence/ta…> to /var/local/forge/data/codelutin.com/maven/repository/fr/ifremer/wao-persistence/4.0-SNAPSHOT/wao-persistence-4.0-SNAPSHOT-javadoc.jar.asc [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Wao :: Services 4.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ wao-services --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ wao-services --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-services --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ wao-services --- [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ wao-services --- [INFO] [INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ wao-services --- [INFO] Load missing file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/l…> [INFO] Missing file <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/l…> is up-to-date. [INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/l…> [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (parseOthersAndGen) @ wao-services --- [INFO] start entry basedir:<http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/m…,> includes:[**/*.java] [INFO] 112 file(s) to process (among 112 files) [INFO] Parsing is done. [treated file(s) : 32/112](total time:278.65ms) ( ~ 2.488ms / file) [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ wao-services --- [INFO] config - basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] config - locales : [fr_FR, en_GB] [INFO] import getter java.getter in 200703ns [INFO] Copying wao-services.properties to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] Copying wao-services.properties to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-services --- [INFO] config - src basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/m…> [INFO] config - out basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] config - locales : [fr_FR, en_GB] [INFO] prepare bundle for locale fr_FR [INFO] merge bundle fr_FR to out [INFO] copy bundle fr_FR to src [INFO] prepare bundle for locale en_GB [INFO] merge bundle en_GB to out [WARNING] bundle en_GB contains 2/93 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle en_GB to src [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ wao-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] Copying 2 resources [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ wao-services --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src> [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] Scan 124 files header done in 201.017ms. [INFO] * uptodate header on 98 files. * add header on 26 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ wao-services --- [INFO] Compiling 112 source files to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/m…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/m…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.11:check (default) @ wao-services --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java17:1.0 [INFO] [INFO] --- jredmine-maven-plugin:1.8.2:generate-changes (jredmine-generate-changes) @ wao-services --- [INFO] Skipping goal (skipGenerateChanges flag is on). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ wao-services --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ wao-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 9 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ wao-services --- [INFO] Compiling 11 source files to <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/targe…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/t…>:[50,8] fr.ifremer.wao.services.FakeWaoApplicationContext is not abstract and does not override abstract method getBoatsFilterValuesCache() in fr.ifremer.wao.services.WaoApplicationContext [INFO] 1 error [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Wao ............................................... SUCCESS [ 7.775 s] [INFO] Wao :: Persistence ................................ SUCCESS [ 26.243 s] [INFO] Wao :: Services ................................... FAILURE [ 3.558 s] [INFO] Wao :: Web ........................................ SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 39.174 s [INFO] Finished at: 2014-06-04T00:06:58+01:00 [INFO] Final Memory: 105M/966M [INFO] ------------------------------------------------------------------------ Waiting for Jenkins to finish collecting data [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile (default-testCompile) on project wao-services: Compilation failure [ERROR] <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/t…>:[50,8] fr.ifremer.wao.services.FakeWaoApplicationContext is not abstract and does not override abstract method getBoatsFilterValuesCache() in fr.ifremer.wao.services.WaoApplicationContext [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile (default-testCompile) on project wao-services: Compilation failure <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/t…>:[50,8] fr.ifremer.wao.services.FakeWaoApplicationContext is not abstract and does not override abstract method getBoatsFilterValuesCache() in fr.ifremer.wao.services.WaoApplicationContext at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:745) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure <http://ci.codelutin.com/jenkins/job/wao-nightly/ws/trunk/wao-services/src/t…>:[50,8] fr.ifremer.wao.services.FakeWaoApplicationContext is not abstract and does not override abstract method getBoatsFilterValuesCache() in fr.ifremer.wao.services.WaoApplicationContext at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.TestCompilerMojo.execute(TestCompilerMojo.java:152) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :wao-services Sending e-mails to: wao-commits(a)list.forge.codelutin.com leny(a)codelutin.com channel stopped Skipping sonar analysis due to bad build status FAILURE

1 2

Build failed in Jenkins: wao-nightly » Wao :: Web #57
by admin+ci-codelutin.com＠codelutin.com June 5, 2014

June 5, 2014

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/57/chang…> Changes: [bleny] introduce CacheInvalidationTopiaEntityListener ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Wao :: Web 4.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ wao-web --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ wao-web --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-web --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ wao-web --- [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ wao-web --- [INFO] Will create or update license file [agpl_v3] to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/LICEN…> [INFO] [INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ wao-web --- [INFO] Load missing file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/l…> [INFO] Missing file <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/l…> is up-to-date. [INFO] Writing third-party file to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] Will attach third party file from <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/l…> [INFO] [INFO] --- i18n-maven-plugin:3.1:parserStruts2 (parseJsp) @ wao-web --- [INFO] start entry basedir:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…,> includes:[**/*.jsp] [INFO] 23 file(s) to process (among 23 files) [INFO] Parsing is done. [treated file(s) : 20/23](total time:1.137s) ( ~ 49.427ms / file) [INFO] [INFO] --- i18n-maven-plugin:3.1:parserJava (parseOthersAndGen) @ wao-web --- [INFO] start entry basedir:<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…,> includes:[**/*.java] [INFO] 67 file(s) to process (among 67 files) [INFO] Parsing is done. [treated file(s) : 22/67](total time:2.374s) ( ~ 35.434ms / file) [INFO] [INFO] >>> i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-web >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:get (get) @ wao-web --- [INFO] config - basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] config - locales : [fr_FR, en_GB] [INFO] import getter java.getter in 199796ns [INFO] import getter struts2.getter in 326225ns [INFO] Copying wao-web.properties to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] Copying wao-web.properties to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-web <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:gen (parseOthersAndGen) @ wao-web --- [INFO] config - src basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] config - out basedir : <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] config - locales : [fr_FR, en_GB] [INFO] prepare bundle for locale fr_FR [INFO] merge bundle fr_FR to out [INFO] copy bundle fr_FR to src [INFO] prepare bundle for locale en_GB [INFO] merge bundle en_GB to out [WARNING] bundle en_GB contains 20/548 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] copy bundle en_GB to src [INFO] [INFO] >>> i18n-maven-plugin:3.1:bundle (parseOthersAndGen) @ wao-web >>> [INFO] [INFO] --- i18n-maven-plugin:3.1:collect-i18n-artifacts (collect-i18n-artifacts) @ wao-web --- [INFO] detected i18n artifact fr.ifremer:wao-persistence:4.0-SNAPSHOT [INFO] detected i18n artifact fr.ifremer:wao-services:4.0-SNAPSHOT [INFO] detected i18n artifact org.nuiton:nuiton-csv:3.0-rc-2 [INFO] detected i18n artifact org.nuiton:nuiton-utils:3.0-20140604.092010-29 [INFO] detected i18n artifact org.nuiton:nuiton-validator:3.0-rc-1 [INFO] detected i18n artifact org.nuiton.web:nuiton-struts2:1.16 [INFO] detected i18n artifact fr.ifremer:wao-web:4.0-SNAPSHOT [INFO] generate collected i18n artifacts for locale fr_FR [INFO] collected 7 i18n artifacts for locale fr_FR stored in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] generate collected i18n artifacts for locale en_GB [INFO] collected 7 i18n artifacts for locale en_GB stored in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] [INFO] <<< i18n-maven-plugin:3.1:bundle (parseOthersAndGen) @ wao-web <<< [INFO] [INFO] --- i18n-maven-plugin:3.1:bundle (parseOthersAndGen) @ wao-web --- [INFO] config - resources dir : <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] config - package name : META-INF [INFO] config - bundle name : wao [INFO] config - input encoding : UTF-8 [INFO] config - output encoding : UTF-8 [INFO] config - locales : [fr_FR, en_GB] [INFO] config - version : 4.0 [INFO] generate bundle for locale fr_FR from 7 i18n resource(s) [INFO] i18n/nuiton-utils_fr_FR.properties [INFO] i18n/nuiton-struts2_fr_FR.properties [INFO] i18n/nuiton-csv_fr_FR.properties [INFO] i18n/nuiton-validator_fr_FR.properties [INFO] i18n/wao-persistence_fr_FR.properties [INFO] i18n/wao-services_fr_FR.properties [INFO] i18n/wao-web_fr_FR.properties [WARNING] bundle fr_FR contains 1/834 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] generate bundle for locale en_GB from 7 i18n resource(s) [INFO] i18n/nuiton-utils_en_GB.properties [INFO] i18n/nuiton-struts2_en_GB.properties [INFO] i18n/nuiton-csv_en_GB.properties [INFO] i18n/nuiton-validator_en_GB.properties [INFO] i18n/wao-persistence_en_GB.properties [INFO] i18n/wao-services_en_GB.properties [INFO] i18n/wao-web_en_GB.properties [WARNING] bundle en_GB contains 23/837 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] prepare i18n definition file in <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ wao-web --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 17 resources [INFO] Copying 1 resource [INFO] Copying 2 resources [INFO] Copying 3 resources [INFO] [INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ wao-web --- [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src> [INFO] Will search files to update from root <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] - ignore file (detected %%Ignore-License) <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…> [INFO] Scan 185 files header done in 6.43s. [INFO] * update header on 5 files. * uptodate header on 90 files. * add header on 80 files. * ignore header on 10 files. [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ wao-web --- [INFO] Compiling 67 source files to <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…>:[28,31] org.apache.struts2.impl.StrutsObjectFactory in org.apache.struts2.impl has been deprecated [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- animal-sniffer-maven-plugin:1.11:check (default) @ wao-web --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java17:1.0 [INFO] [INFO] --- jredmine-maven-plugin:1.8.2:generate-changes (jredmine-generate-changes) @ wao-web --- [INFO] Skipping goal (skipGenerateChanges flag is on). [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ wao-web --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ wao-web --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 0 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ wao-web --- [INFO] Nothing to compile - all classes are up to date [INFO] [INFO] --- maven-surefire-plugin:2.17:test (default-test) @ wao-web --- [JENKINS] Recording test results [INFO] [INFO] --- maven-war-plugin:2.4:war (default-war) @ wao-web --- [INFO] Packaging webapp [INFO] Assembling webapp [wao-web] in [<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…]> [INFO] Processing war project [INFO] Copying webapp webResources [<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…]> to [<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…]> [INFO] Copying webapp resources [<http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/src/m…]> [INFO] Webapp assembled in [5116 msecs] [INFO] Building war: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] [INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ wao-web >>> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ wao-web --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-web --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ wao-web --- [INFO] Skipping goal (runOnce flag is on and goal was already executed). [WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo [INFO] [INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ wao-web <<< [INFO] [INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ wao-web --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] [INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ wao-web --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao-web/ws/targe…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ wao-web --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ wao-web --- [INFO] Exporting server [gpg-signer] username in ${gpg.keyname} [INFO] Exporting server [gpg-signer] password in ${gpg.passphrase} [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ wao-web --- [INFO] Loaded /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect-artifacts.txt [INFO] Copying wao-4.0-SNAPSHOT.war to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-web/wao-4.0-SNAPSHOT.war [INFO] Copying THIRD-PARTY.properties to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-web/THIRD-PARTY.properties [INFO] Copying wao-4.0-SNAPSHOT-sources.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-web/wao-4.0-SNAPSHOT-sources.jar [INFO] Copying wao-4.0-SNAPSHOT-javadoc.jar to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-web/wao-4.0-SNAPSHOT-javadoc.jar [INFO] [INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ wao-web --- [INFO] Copying wao-4.0-SNAPSHOT.war to /var/local/forge/data/codelutin.com/jenkins/workspace/wao-nightly/trunk/target/collect/fr.ifremer--wao-web/wao-4.0-SNAPSHOT.war [INFO] [INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ wao-web --- [INFO] [INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ wao-web --- [INFO] Used declared dependencies found: [INFO] fr.ifremer:wao-persistence:jar:4.0-SNAPSHOT:compile [INFO] fr.ifremer:wao-services:jar:4.0-SNAPSHOT:compile [INFO] org.nuiton.topia:topia-persistence:jar:3.0-beta-4:compile [INFO] org.nuiton:nuiton-utils:jar:3.0-SNAPSHOT:compile [INFO] commons-logging:commons-logging:jar:1.1.3:compile [INFO] commons-io:commons-io:jar:2.4:compile [INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile [INFO] org.nuiton.i18n:nuiton-i18n:jar:3.1:compile [INFO] com.google.guava:guava:jar:17.0:compile [INFO] org.nuiton.web:nuiton-struts2:jar:1.16:compile [INFO] org.apache.struts:struts2-core:jar:2.3.16.3:compile [INFO] org.apache.struts.xwork:xwork-core:jar:2.3.16.3:compile [INFO] org.apache.commons:commons-collections4:jar:4.0:compile [INFO] javax.servlet:servlet-api:jar:2.5:provided [INFO] org.apache.struts:struts2-convention-plugin:jar:2.3.16.3:compile [INFO] log4j:log4j:jar:1.2.17:compile [INFO] org.jsoup:jsoup:jar:1.7.3:compile [WARNING] Unused declared dependencies found: [WARNING] net.sf.ehcache:ehcache-core:jar:2.6.9:compile [JENKINS] Archiving disabled

1 1

r2010 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 17:46:38 +0200 (Thu, 05 Jun 2014) New Revision: 2010 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2010 Log: refs #5188 add a todo Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-05 15:43:15 UTC (rev 2009) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-05 15:46:38 UTC (rev 2010) @@ -684,6 +684,8 @@ // le temps qui a vraiment été passé en mer. // temps de mer réalisé par ligne du plan = somme [arrondi-supérieur (nb d'heures total de la marée/ 24)] + + // TODO brendan 05/06/14 issue #5188 long real = 0; long estimated = 0; for (Contact contact : contacts) {

1 0

r2009 - trunk/wao-web/src/main/webapp
by lkaufmann＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: lkaufmann Date: 2014-06-05 17:43:15 +0200 (Thu, 05 Jun 2014) New Revision: 2009 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2009 Log: Refs #4997 : Modify actions menu position Modified: trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-06-05 15:29:20 UTC (rev 2008) +++ trunk/wao-web/src/main/webapp/wao.css 2014-06-05 15:43:15 UTC (rev 2009) @@ -573,9 +573,10 @@ text-align: center; } -table.sampling-plan .actions .dropdown-menu { - left: -367px; - width: 450px; +table.sampling-plan .actions .dropdown-menu, +table.contacts-list .actions .dropdown-menu { + left: auto; + right: 0; } #boats-list th, #boats-list td {

1 0

r2008 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by lkaufmann＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: lkaufmann Date: 2014-06-05 17:29:20 +0200 (Thu, 05 Jun 2014) New Revision: 2008 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2008 Log: Refs #4997 : Tiny display modification Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-05 15:12:29 UTC (rev 2007) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-05 15:29:20 UTC (rev 2008) @@ -429,7 +429,7 @@ </s:if> </td> - <td> + <td class="align-center"> <s:if test=" ! comment.empty"> " data-toggle="tooltip" data-placement="left">

1 0

r2007 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 17:12:29 +0200 (Thu, 05 Jun 2014) New Revision: 2007 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2007 Log: remove 404 from css Modified: trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-06-05 14:37:27 UTC (rev 2006) +++ trunk/wao-web/src/main/webapp/wao.css 2014-06-05 15:12:29 UTC (rev 2007) @@ -379,23 +379,24 @@ margin-left: 5px; margin-right: 5px; } -#sampling-plan-filters-form, + +#sampling-plan-filters-form, #contacts-filters-form, #synthesis-filters-form { - padding-top:20px; - background:#f5f5f5 url(images/bg-filtres.jpg) repeat-x 0 bottom; - border-bottom:1px solid #CCC; + padding-top: 20px; + background-color: #f5f5f5; + border-bottom: 1px solid #ccc; } - form.filters-form .filters-group { - float: left; - margin-right: 30px; - } +form.filters-form .filters-group { + float: left; + margin-right: 30px; +} - .selected-options-container ul { - list-style-type: none; - margin: 0; - } +.selected-options-container ul { + list-style-type: none; + margin: 0; +} /** * Les boutons

1 0

r2006 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com June 5, 2014

June 5, 2014

Author: bleny Date: 2014-06-05 16:37:27 +0200 (Thu, 05 Jun 2014) New Revision: 2006 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2006 Log: refs #4493 change chart label Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-05 14:29:53 UTC (rev 2005) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-05 14:37:27 UTC (rev 2006) @@ -202,7 +202,7 @@ BarChartData.BarChartDataSeries actualObservationsMyMonthsBarChartDataSeries = new BarChartData.BarChartDataSeries(); - actualObservationsMyMonthsBarChartDataSeries.setLabel(I18n.l(locale, "wao.synthesis.estimated")); + actualObservationsMyMonthsBarChartDataSeries.setLabel(I18n.l(locale, "wao.ui.samplingPlan.Actual")); for (Map.Entry<Date, Integer> actualObservationsMyMonth : actualObservationsMyMonths.entrySet()) { Date month = actualObservationsMyMonth.getKey(); String tick = WaoUtils.formatMonth(locale, month);

1 0