- Franciaflex-magalie-commits - mailman.cloud.codelutin.com

r394 - trunk/magalie-services/src/main/resources
by bleny＠users.forge.codelutin.com 29 Aug '13

29 Aug '13

Author: bleny Date: 2013-08-29 13:19:42 +0200 (Thu, 29 Aug 2013) New Revision: 394 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: reverted a change in the fixtures made in #392 : commited by error Modified: trunk/magalie-services/src/main/resources/fixtures.yaml Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-08-29 11:18:09 UTC (rev 393) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-08-29 11:19:42 UTC (rev 394) @@ -623,8 +623,8 @@ &requestedList1 !requested-list id: requestedList1 code: 123456789 - requestDate: 2013-06-08 12:00:00 - urgent: false + requestDate: 2013-04-08 12:00:00 + urgent: true building: *B1 listType: LOT DE FAB @@ -633,7 +633,7 @@ id: requestedList2 code: 987654321 requestDate: 2013-04-08 12:00:00 - urgent: true + urgent: false building: *B1 listType: LOT DE FAB

1 0

r393 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 29 Aug '13

29 Aug '13

Author: bleny Date: 2013-08-29 13:18:09 +0200 (Thu, 29 Aug 2013) New Revision: 393 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3112 hide messages that duplicate the message in service notifications Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-29 10:48:01 UTC (rev 392) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-29 11:18:09 UTC (rev 393) @@ -43,7 +43,8 @@ import java.util.List; @Results({ - @Result(name="success", type="redirectAction", params = { "actionName", "withdraw-item!input", "requestedArticleId", "${requestedArticleId}" }) + @Result(name="success", type="redirectAction", params = { "actionName", "withdraw-item!input", "requestedArticleId", "${requestedArticleId}" }), + @Result(name="choose-list-type", type="redirectAction", params = { "actionName", "deliver-requested-article!input" }) }) public class DeliverRequestedArticleAction extends MagalieActionSupport implements Preparable { @@ -107,6 +108,12 @@ this.listType = listType; } + /** + * On arrive ici quand l'utilisateur a sélectionné un type de liste. On cherche + * quelque-chose à faire et si on trouve ou redirige vers l'interface de prélèvement + * sinon on reste sur la liste des types de listes en affichant un message expliquant + * pourquoi on est pas allé plus loin + */ @Override public String execute() { @@ -157,6 +164,44 @@ } + /** + * On arrive ici après avoir terminer de prélever un article. On redirige vers l'article + * suivant s'il y en a un sinon on propose directement de changer le type de liste. + * + * On affiche pas de message particulier, l'utilisateur a déjà été notifié qu'il n'est + * plus affecté à la liste + */ + public String next() { + + Preconditions.checkState(listType != null); + + session.setActivity(Activity.REQUESTED_LISTS); + + MagalieUser magalieUser = session.getMagalieUser(); + + Building building = session.getBuilding(); + + FindOrderToExecuteResult findOrderToExecuteResult = + service.findOrderToExecute(magalieUser, building, listType); + + String result; + + if (findOrderToExecuteResult.isSuccess()) { + + requestedArticle = findOrderToExecuteResult.getRequestedArticle(); + + result = SUCCESS; + + } else { + + result = "choose-list-type"; + + } + + return result; + + } + public String getRequestedArticleId() { return requestedArticle.getId(); } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-29 10:48:01 UTC (rev 392) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-29 11:18:09 UTC (rev 393) @@ -48,7 +48,7 @@ @Results({ @Result(name="KANBANS", type="redirectAction", params = { "actionName", "fulfil-kanban!input" }), - @Result(name="REQUESTED_LISTS", type="redirectAction", params = { "actionName", "deliver-requested-article", "listType", "%{listType}" }), + @Result(name="REQUESTED_LISTS", type="redirectAction", params = { "actionName", "deliver-requested-article!next", "listType", "%{listType}" }), @Result(name="REQUESTED_LISTS_CANCEL", type="redirectAction", params = { "actionName", "deliver-requested-article!input" }) }) public class WithdrawItemAction extends MagalieActionSupport implements Preparable {

1 0

r392 - in trunk: magalie-services/src/main/resources magalie-web/src/main/java/com/franciaflex/magalie/web magalie-web/src/main/java/com/franciaflex/magalie/web/action magalie-web/src/main/webapp/WEB-INF/decorators
by bleny＠users.forge.codelutin.com 29 Aug '13

29 Aug '13

Author: bleny Date: 2013-08-29 12:48:01 +0200 (Thu, 29 Aug 2013) New Revision: 392 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove messages from session and use notification context because notifications was lost in case of two redirections Modified: trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SimpleWithdrawItemAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-08-29 10:48:01 UTC (rev 392) @@ -623,8 +623,8 @@ &requestedList1 !requested-list id: requestedList1 code: 123456789 - requestDate: 2013-04-08 12:00:00 - urgent: true + requestDate: 2013-06-08 12:00:00 + urgent: false building: *B1 listType: LOT DE FAB @@ -633,7 +633,7 @@ id: requestedList2 code: 987654321 requestDate: 2013-04-08 12:00:00 - urgent: false + urgent: true building: *B1 listType: LOT DE FAB Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java 2013-08-29 10:48:01 UTC (rev 392) @@ -24,12 +24,15 @@ */ import com.google.common.base.Objects; +import com.google.common.collect.ImmutableSet; import com.opensymphony.xwork2.ActionSupport; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.util.Arrays; import java.util.List; +import java.util.Set; public class MagalieActionSupport extends ActionSupport { @@ -41,12 +44,14 @@ "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z" }); + protected Set<String> messages; + public List<String> getShortcuts () { return SHORTCUTS; } public boolean isWithMessages() { - return super.hasActionErrors() || super.hasActionMessages(); + return super.hasActionErrors() || super.hasActionMessages() || CollectionUtils.isNotEmpty(messages); } @Override @@ -54,4 +59,18 @@ return Objects.toStringHelper(this).toString(); } + public Set<String> getMessages() { + ImmutableSet<String> messages = ImmutableSet.copyOf(this.messages); + this.messages.clear(); + return messages; + } + + public void setMessages(Set<String> messages) { + this.messages = messages; + } + + protected void addMessage(String message) { + messages.add(message); + } + } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-08-29 10:48:01 UTC (rev 392) @@ -34,7 +34,6 @@ import com.franciaflex.magalie.web.action.RestoreFixturesAction; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor; import org.apache.commons.logging.Log; @@ -78,18 +77,10 @@ if (action instanceof MagalieActionSupport) { - // on ajoute les notifications pour l'utilisateur - - Set<String> messages = Sets.newLinkedHashSet(); - - // d'abord on récupère les notifications ajoutées par les actions dans la session - MagalieSession magalieSession = getMagalieSession(invocation); - messages.addAll(magalieSession.getMessagesAndClear()); + // on ajoute les notifications - // ensuite on ajoute les notifications ajoutées par les services - MagalieApplicationContext magalieApplicationContext = getMagalieApplicationContext(invocation); @@ -100,18 +91,10 @@ if (magalieUser != null) { - messages.addAll(userNotificationContext.getMessagesAndClearFor(magalieUser)); + ((MagalieActionSupport) action).setMessages(userNotificationContext.getMessages(magalieUser)); } - // on ajoute tous ces messages comme actionMessage - - for (String message : messages) { - - ((MagalieActionSupport) action).addActionMessage(message); - - } - Class<?> actionClass = action.getClass(); Set<PropertyDescriptor> descriptors = Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-08-29 10:48:01 UTC (rev 392) @@ -33,7 +33,6 @@ import java.io.Serializable; import java.util.Collection; -import java.util.List; /** * The single object every user will have in its session. @@ -88,16 +87,6 @@ this.lastUsedDestinationWarehouseForKanbans = lastUsedDestinationWarehouseForKanbans; } - public void addMessage(String message) { - messages.add(message); - } - - public List<String> getMessagesAndClear() { - List<String> messages = Lists.newArrayList(this.messages); - this.messages.clear(); - return messages; - } - public Activity getActivity() { return activity; } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java 2013-08-29 10:48:01 UTC (rev 392) @@ -81,8 +81,8 @@ return usersNotifications; } - public Set<String> getMessagesAndClearFor(MagalieUser magalieUser) { - return usersNotifications.removeAll(magalieUser); + public Set<String> getMessages(MagalieUser magalieUser) { + return usersNotifications.get(magalieUser); } } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-29 10:48:01 UTC (rev 392) @@ -133,19 +133,19 @@ if (findOrderToExecuteResult.isNothingToDo()) { - addActionMessage("Il n'y a aucune demande. Vous n'avez rien à faire"); + addMessage("Il n'y a aucune demande. Vous n'avez rien à faire"); } if (findOrderToExecuteResult.isDriverLicenseRequired()) { - addActionMessage("Il y a des demandes en cours, mais un permis est requis"); + addMessage("Il y a des demandes en cours, mais un permis est requis"); } if (findOrderToExecuteResult.isEverythingUnavailable()) { - addActionMessage("Toutes les demandes en cours concernent des articles indisponibles"); + addMessage("Toutes les demandes en cours concernent des articles indisponibles"); } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-08-29 10:48:01 UTC (rev 392) @@ -113,7 +113,7 @@ } catch (PreparedArticleReceptionAlreadyStoredException e) { - session.addMessage("Article déjà rangé"); + addMessage("Article déjà rangé"); log.warn("should never occur", e); @@ -121,7 +121,7 @@ } catch (InvalidMagalieBarcodeException e) { - session.addMessage("Le code n'est pas valide"); + addMessage("Le code n'est pas valide"); log.warn("should never occur", e); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-08-29 10:48:01 UTC (rev 392) @@ -51,7 +51,7 @@ service.cleanDatabaseAndLoadFixtures("fixtures"); - session.addMessage("Jeu de données initial restauré"); + addMessage("Jeu de données initial restauré"); return SUCCESS; Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SimpleWithdrawItemAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SimpleWithdrawItemAction.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SimpleWithdrawItemAction.java 2013-08-29 10:48:01 UTC (rev 392) @@ -100,13 +100,13 @@ log.error("should never occur, barcode is validated before arriving in this action", e); - session.addMessage("Le code barre " + articleBarcode + " n'est pas un code valide"); + addMessage("Le code barre " + articleBarcode + " n'est pas un code valide"); return ERROR; } catch (IllegalWithdrawException e) { - session.addMessage("Cet article ne peut pas être prélevé avec cette méthode"); + addMessage("Cet article ne peut pas être prélevé avec cette méthode"); return ERROR; @@ -114,7 +114,7 @@ if (simpleWithdrawItemTask.isDriverLicenseRequired()) { - session.addMessage("Un permis est requis pour accéder à cet article"); + addMessage("Un permis est requis pour accéder à cet article"); return ERROR; @@ -122,7 +122,7 @@ if (simpleWithdrawItemTask.isArticleUnavailable()) { - session.addMessage("Cet article n'est pas disponible"); + addMessage("Cet article n'est pas disponible"); return ERROR; Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-08-29 10:48:01 UTC (rev 392) @@ -250,7 +250,7 @@ locationErrorsService.reportError(storedArticleId, magalieUser); - session.addMessage("L'emplacement a bien été reporté en erreur"); + addMessage("L'emplacement a bien été reporté en erreur"); return ERROR; Modified: trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2013-08-29 09:43:16 UTC (rev 391) +++ trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2013-08-29 10:48:01 UTC (rev 392) @@ -50,6 +50,9 @@ <s:iterator value="actionErrors" var="actionError" > alert('<s:property value="#actionError" escapeJavaScript="true" escapeHtml="false"/>'); </s:iterator> + <s:iterator value="messages" var="message" > + alert('<s:property value="#message" escapeJavaScript="true" escapeHtml="false"/>'); + </s:iterator> }); </script> </s:if>

1 0

r391 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 29 Aug '13

29 Aug '13

Author: bleny Date: 2013-08-29 11:43:16 +0200 (Thu, 29 Aug 2013) New Revision: 391 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #3115 don't break workflow, execute result must send to another article Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-29 08:46:25 UTC (rev 390) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-29 09:43:16 UTC (rev 391) @@ -30,6 +30,7 @@ import com.franciaflex.magalie.services.StorageMovementConfirmation; import com.franciaflex.magalie.services.service.ArticleStorageService; import com.franciaflex.magalie.services.service.RequestedArticleService; +import com.franciaflex.magalie.web.Activity; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; import com.google.common.base.Preconditions; @@ -47,7 +48,8 @@ @Results({ @Result(name="KANBANS", type="redirectAction", params = { "actionName", "fulfil-kanban!input" }), - @Result(name="REQUESTED_LISTS", type="redirectAction", params = { "actionName", "deliver-requested-article!input", "listType", "%{listType}" }) + @Result(name="REQUESTED_LISTS", type="redirectAction", params = { "actionName", "deliver-requested-article", "listType", "%{listType}" }), + @Result(name="REQUESTED_LISTS_CANCEL", type="redirectAction", params = { "actionName", "deliver-requested-article!input" }) }) public class WithdrawItemAction extends MagalieActionSupport implements Preparable { @@ -232,6 +234,12 @@ String resultName = session.getActivity().name(); + if (Activity.REQUESTED_LISTS.equals(session.getActivity())) { + + resultName = "REQUESTED_LISTS_CANCEL"; + + } + return resultName; }

1 0

r390 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 29 Aug '13

29 Aug '13

Author: bleny Date: 2013-08-29 10:46:25 +0200 (Thu, 29 Aug 2013) New Revision: 390 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3115 redirect to the page showing affectation Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-29 08:35:10 UTC (rev 389) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-29 08:46:25 UTC (rev 390) @@ -47,7 +47,7 @@ @Results({ @Result(name="KANBANS", type="redirectAction", params = { "actionName", "fulfil-kanban!input" }), - @Result(name="REQUESTED_LISTS", type="redirectAction", params = { "actionName", "deliver-requested-article", "listType", "%{listType}" }) + @Result(name="REQUESTED_LISTS", type="redirectAction", params = { "actionName", "deliver-requested-article!input", "listType", "%{listType}" }) }) public class WithdrawItemAction extends MagalieActionSupport implements Preparable {

1 0

r389 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 29 Aug '13

29 Aug '13

Author: bleny Date: 2013-08-29 10:35:10 +0200 (Thu, 29 Aug 2013) New Revision: 389 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: don't ask to cancel 0 movements Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-08-29 08:34:26 UTC (rev 388) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-08-29 08:35:10 UTC (rev 389) @@ -307,9 +307,11 @@ var confirmation = model.getConfirmation(); - var confirmMessage = 'Annuler ' + Object.keys(confirmation.locationIdToStoredQuantities).length + ' mouvements ?'; + var storageMovementCount = Object.keys(confirmation.locationIdToStoredQuantities).length; - var redirect = confirmation.locationIdToStoredQuantities.length == 0 + var confirmMessage = 'Annuler ' + storageMovementCount + ' mouvements ?'; + + var redirect = storageMovementCount == 0 || confirm(confirmMessage); if (redirect) {

1 0

r388 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 29 Aug '13

29 Aug '13

Author: bleny Date: 2013-08-29 10:34:26 +0200 (Thu, 29 Aug 2013) New Revision: 388 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3114 add parameter to redirect on articles for the same supplier on cancel Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-08-28 09:33:07 UTC (rev 387) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-08-29 08:34:26 UTC (rev 388) @@ -59,7 +59,9 @@ <s:hidden name="confirmation" /> <div style="width: 180px"> - <s:url action="receive-article!cancel" id="cancelUrl" /> + <s:url action="receive-article!cancel" id="cancelUrl"> + <s:param name="supplierId" value="%{supplierId}" /> + </s:url> <s:a href="%{cancelUrl}" cssClass="btn btn-mini" id="cancelLink">Abandon (Esc)</s:a> <input type="button" name="full" value="Plein (F5)" class="btn btn-danger btn-mini" id="receive-article_full" /> <s:submit name="next" value="Suivant (⏎)" cssClass="btn btn-primary btn-mini" />

1 0

Build failed in Jenkins: franciaflex-magalie » MagaLiE :: Services #106
by admin+hudson＠codelutin.com 28 Aug '13

28 Aug '13

See <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/com.franciaflex$magali…> Changes: [Brendan Le Ny] fixes #2991 show already stored quantity ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building MagaLiE :: Services 1.0-rc-4-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ magalie-services --- [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ magalie-services --- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ magalie-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 2 resources [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ magalie-services --- [INFO] Compiling 34 source files to <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/com.franciaflex$magali…> [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ magalie-services --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/com.franciaflex$magali…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ magalie-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] [INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ magalie-services --- [INFO] Compiling 8 source files to <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/com.franciaflex$magali…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/com.franciaflex$magali…>:[150,59] error: incompatible types [ERROR] required: Location found: ReceptionLocation <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/com.franciaflex$magali…>:[352,96] error: incompatible types [INFO] 2 errors [INFO] -------------------------------------------------------------

1 2

Build failed in Jenkins: franciaflex-magalie #106
by admin+hudson＠codelutin.com 28 Aug '13

28 Aug '13

See <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/106/changes> Changes: [Brendan Le Ny] fixes #2991 show already stored quantity ------------------------------------------ [...truncated 670 lines...] add constraint FK50B279C8905039D2 foreign key (article_id) references Article; alter table RequestedArticle add constraint FK50B279C8E722EC32 foreign key (requestedList_id) references RequestedList; alter table RequestedList add constraint FKA10A850CE86E0C62 foreign key (building_id) references Building; alter table StorageMovement add constraint FK836EB42ABD85A7F4 foreign key (destinationLocation_id) references Location; alter table StorageMovement add constraint FK836EB42A905039D2 foreign key (article_id) references Article; alter table StorageMovement add constraint FK836EB42A14FD5F92 foreign key (magalieUser_id) references MagalieUser; alter table StorageMovement add constraint FK836EB42A6E50DDDC foreign key (originLocation_id) references Location; alter table StoredArticle add constraint FK735EA3B3905039D2 foreign key (article_id) references Article; alter table StoredArticle add constraint FK735EA3B3246760C2 foreign key (location_id) references Location; alter table UnavailableArticle add constraint FK279A4EA6905039D2 foreign key (article_id) references Article; alter table UnavailableArticle add constraint FK279A4EA6E86E0C62 foreign key (building_id) references Building; alter table Warehouse add constraint FK615AA3E86E0C62 foreign key (building_id) references Building; [INFO] HHH000230: Schema export complete [INFO] [INFO] --- hibernate4-maven-plugin:1.0.1:export (executionDropOracle) @ magalie-persistence --- [INFO] Scanning directory <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-persi…> for annotated classes... [INFO] Reading properties from file <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-persi…...> [INFO] Gathered hibernate-configuration (turn on debugging for details): [INFO] hibernate.dialect = com.franciaflex.magalie.persistence.MagalieOracleHibernateDialect [INFO] hibernate.ejb.naming_strategy = org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy [INFO] HHH000400: Using dialect: com.franciaflex.magalie.persistence.MagalieOracleHibernateDialect [INFO] HHH000227: Running hbm2ddl schema export drop table Article cascade constraints; drop table Article_Location cascade constraints; drop table Building cascade constraints; drop table Company cascade constraints; drop table DeliveredRequestedArticle cascade constraints; drop table DeliveredRequestedArticle_StorageMovement cascade constraints; drop table DeliveredRequestedList cascade constraints; drop table Kanban cascade constraints; drop table Location cascade constraints; drop table LocationError cascade constraints; drop table MagalieUser cascade constraints; drop table PreparedArticleReception cascade constraints; drop table ReceivedPreparedArticleReception cascade constraints; drop table ReceivedPreparedArticleReception_StorageMovement cascade constraints; drop table RequestedArticle cascade constraints; drop table RequestedList cascade constraints; drop table StorageMovement cascade constraints; drop table StoredArticle cascade constraints; drop table Supplier cascade constraints; drop table UnavailableArticle cascade constraints; drop table Warehouse cascade constraints; [INFO] HHH000230: Schema export complete [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ magalie-persistence --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-persi…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ magalie-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 0 resource [INFO] [INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ magalie-persistence --- [INFO] Compiling 1 source file to <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-persi…> [INFO] [INFO] --- maven-surefire-plugin:2.14.1:test (default-test) @ magalie-persistence --- [INFO] Surefire report directory: <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-persi…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running com.franciaflex.magalie.persistence.SuppliersTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.062 sec Results : Tests run: 1, Failures: 0, Errors: 0, Skipped: 0 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ magalie-persistence --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-persi…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ magalie-persistence --- [INFO] [INFO] --- maven-install-plugin:2.4:install (default-install) @ magalie-persistence --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-persi…> to /var/local/maven/data/repository/com/franciaflex/magalie-persistence/1.0-rc-4-SNAPSHOT/magalie-persistence-1.0-rc-4-SNAPSHOT.jar [INFO] Installing <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-persi…> to /var/local/maven/data/repository/com/franciaflex/magalie-persistence/1.0-rc-4-SNAPSHOT/magalie-persistence-1.0-rc-4-SNAPSHOT.pom [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building MagaLiE :: Services 1.0-rc-4-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ magalie-services --- [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ magalie-services --- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ magalie-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 2 resources [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ magalie-services --- [INFO] Compiling 34 source files to <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-servi…> [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ magalie-services --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-servi…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ magalie-services --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] [INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ magalie-services --- [INFO] Compiling 8 source files to <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-servi…> [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-servi…>:[150,59] error: incompatible types [ERROR] required: Location found: ReceptionLocation <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-servi…>:[352,96] error: incompatible types [INFO] 2 errors [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] MagaLiE ........................................... SUCCESS [2.455s] [INFO] MagaLiE :: Persistence ............................ SUCCESS [6.294s] [INFO] MagaLiE :: Services ............................... FAILURE [0.952s] [INFO] MagaLiE :: UI ..................................... SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 10.290s [INFO] Finished at: Mon Aug 26 13:21:27 CEST 2013 [INFO] Final Memory: 28M/233M [INFO] ------------------------------------------------------------------------ [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-persi…> to /var/local/jenkins/data/jobs/franciaflex-magalie/modules/com.franciaflex$magalie-persistence/builds/2013-08-26_13-21-15/archive/com.franciaflex/magalie-persistence/1.0-rc-4-SNAPSHOT/magalie-persistence-1.0-rc-4-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-persi…> to /var/local/jenkins/data/jobs/franciaflex-magalie/modules/com.franciaflex$magalie-persistence/builds/2013-08-26_13-21-15/archive/com.franciaflex/magalie-persistence/1.0-rc-4-SNAPSHOT/magalie-persistence-1.0-rc-4-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-web/p…> to /var/local/jenkins/data/jobs/franciaflex-magalie/modules/com.franciaflex$magalie-web/builds/2013-08-26_13-21-15/archive/com.franciaflex/magalie-web/1.0-rc-4-SNAPSHOT/magalie-web-1.0-rc-4-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/pom.xml> to /var/local/jenkins/data/jobs/franciaflex-magalie/modules/com.franciaflex$magalie/builds/2013-08-26_13-21-15/archive/com.franciaflex/magalie/1.0-rc-4-SNAPSHOT/magalie-1.0-rc-4-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/trunk/magalie-servi…> to /var/local/jenkins/data/jobs/franciaflex-magalie/modules/com.franciaflex$magalie-services/builds/2013-08-26_13-21-15/archive/com.franciaflex/magalie-services/1.0-rc-4-SNAPSHOT/magalie-services-1.0-rc-4-SNAPSHOT.pom Waiting for Jenkins to finish collecting data mavenExecutionResult exceptions not empty message : Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile (default-testCompile) on project magalie-services: Compilation failure cause : Compilation failure Stack trace : org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile (default-testCompile) on project magalie-services: Compilation failure at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:213) 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:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156) at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:79) 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:329) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:174) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) at hudson.maven.Maven3Builder.call(Maven3Builder.java:66) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) 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:724) Caused by: org.apache.maven.plugin.CompilationFailureException: Compilation failure at org.apache.maven.plugin.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:729) at org.apache.maven.plugin.TestCompilerMojo.execute(TestCompilerMojo.java:161) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209) ... 27 more Sending e-mails to: franciaflex-magalie-commits(a)list.forge.codelutin.com channel stopped

1 2

r387 - in trunk: . magalie-persistence magalie-services magalie-web
by maven-release＠users.forge.codelutin.com 28 Aug '13

28 Aug '13

Author: maven-release Date: 2013-08-28 11:33:07 +0200 (Wed, 28 Aug 2013) New Revision: 387 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/magalie-persistence/pom.xml trunk/magalie-services/pom.xml trunk/magalie-web/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-08-28 09:32:59 UTC (rev 386) +++ trunk/magalie-persistence/pom.xml 2013-08-28 09:33:07 UTC (rev 387) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-4</version> + <version>1.0-rc-5-SNAPSHOT</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-08-28 09:32:59 UTC (rev 386) +++ trunk/magalie-services/pom.xml 2013-08-28 09:33:07 UTC (rev 387) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-4</version> + <version>1.0-rc-5-SNAPSHOT</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-08-28 09:32:59 UTC (rev 386) +++ trunk/magalie-web/pom.xml 2013-08-28 09:33:07 UTC (rev 387) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-4</version> + <version>1.0-rc-5-SNAPSHOT</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-28 09:32:59 UTC (rev 386) +++ trunk/pom.xml 2013-08-28 09:33:07 UTC (rev 387) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-4</version> + <version>1.0-rc-5-SNAPSHOT</version> <packaging>pom</packaging> <name>MagaLiE</name> @@ -92,9 +92,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/tags/fra…</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/trunk</url> </scm> <distributionManagement> <site>

1 0