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

r264 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie
by bleny＠users.forge.codelutin.com 28 Jun '13

28 Jun '13

Author: bleny Date: 2013-06-28 10:29:11 +0200 (Fri, 28 Jun 2013) New Revision: 264 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove unused configuration options Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java 2013-06-28 08:28:50 UTC (rev 263) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java 2013-06-28 08:29:11 UTC (rev 264) @@ -30,24 +30,9 @@ */ public enum MagalieConfigOption implements ConfigOptionDef { - SMTP_HOST( - "smtp.host", - "Nom d'hôte du serveur SMTP", - "", String.class), - - SMTP_PORT( - "smtp.port", - "Le port du serveur SMTP", - "25", Integer.class), - - SMTP_FROM( - "smtp.from", - "L'adresse d'expéditeur pour les mails de notifications", - "", String.class), - ORACLE_COMPATIBILITY_MODE( "magalie.oracleCompatibilityMode", - "Empêche la création de noms d'identifiants de plus de 30 caractères, utilise Float pour persister les doubles", + "Configure hibernate pour supporter une base Oracle", "false", Boolean.class), DEV_MODE(

1 0

r263 - trunk/magalie-web/src/main/resources
by bleny＠users.forge.codelutin.com 28 Jun '13

28 Jun '13

Author: bleny Date: 2013-06-28 10:28:50 +0200 (Fri, 28 Jun 2013) New Revision: 263 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove MagalieInterceptor traces from log Modified: trunk/magalie-web/src/main/resources/log4j.properties Modified: trunk/magalie-web/src/main/resources/log4j.properties =================================================================== --- trunk/magalie-web/src/main/resources/log4j.properties 2013-06-28 08:24:42 UTC (rev 262) +++ trunk/magalie-web/src/main/resources/log4j.properties 2013-06-28 08:28:50 UTC (rev 263) @@ -37,6 +37,7 @@ # log4j.logger.org.nuiton.web.filter.JpaTransactionFilter=TRACE log4j.logger.com.franciaflex.magalie=TRACE +log4j.logger.com.franciaflex.magalie.web.MagalieInterceptor=WARN # log4j.logger.com.franciaflex.magalie.services.service.RequestedArticleService=TRACE # log4j.logger.com.franciaflex.magalie.services.service.ArticleStorageService=TRACE

1 0

r262 - trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 28 Jun '13

28 Jun '13

Author: bleny Date: 2013-06-28 10:24:42 +0200 (Fri, 28 Jun 2013) New Revision: 262 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add more explicit logs when barcode not found Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-06-27 15:17:40 UTC (rev 261) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-06-28 08:24:42 UTC (rev 262) @@ -56,11 +56,11 @@ if (article == null) { if (log.isWarnEnabled()) { - log.warn("no article with code " + articleBarcode); + log.warn("no article with code " + articleBarcode + " for company " + company); } throw new InvalidMagalieBarcodeException( - "no article with code " + articleBarcode); + "no article with code " + articleBarcode + " for company " + company); } @@ -79,11 +79,11 @@ if (location == null) { if (log.isWarnEnabled()) { - log.warn("no location with code " + locationBarcode); + log.warn("no location with code " + locationBarcode + " in building " + building); } throw new InvalidMagalieBarcodeException( - "no location with code " + locationBarcode); + "no location with code " + locationBarcode + " in building " + building); }

1 0

r261 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-web/src/main/resources
by bleny＠users.forge.codelutin.com 27 Jun '13

27 Jun '13

Author: bleny Date: 2013-06-27 17:17:40 +0200 (Thu, 27 Jun 2013) New Revision: 261 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: implements toString in entities, improve logs Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Building.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Company.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java Removed: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/PreparedReceptionService.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/OrderResumeService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-web/src/main/resources/log4j.properties Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.java 2013-06-27 14:27:22 UTC (rev 260) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.java 2013-06-27 15:17:40 UTC (rev 261) @@ -96,9 +96,15 @@ int yRemainingCount = getRemainingCount(y); int compare = xRemainingCount - yRemainingCount; if (log.isTraceEnabled()) { - if (compare < 0) log.trace(x.getId() + " is before " + y.getId()); - if (compare == 0) log.trace(x.getId() + " is same position as " + y.getId()); - if (compare > 0) log.trace(y.getId() + " is before " + x.getId()); + if (compare < 0) { + log.trace(x.getId() + " is before " + y.getId()); + } + if (compare == 0 && ! x.equals(y)) { + log.trace(x.getId() + " is same position as " + y.getId()); + } + if (compare > 0) { + log.trace(y.getId() + " is before " + x.getId()); + } } return compare; } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-06-27 14:27:22 UTC (rev 260) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-06-27 15:17:40 UTC (rev 261) @@ -23,6 +23,8 @@ * #L% */ +import com.google.common.base.Objects; + import javax.persistence.Entity; import java.util.Set; @@ -39,4 +41,13 @@ } return isFixedLocation; } + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_CODE, code) + .add(PROPERTY_DESCRIPTION, description) + .add(PROPERTY_ID, id) + .toString(); + } } //Article Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Building.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Building.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Building.java 2013-06-27 15:17:40 UTC (rev 261) @@ -0,0 +1,19 @@ +package com.franciaflex.magalie.persistence.entity; + +import com.google.common.base.Objects; + +import javax.persistence.Entity; + +@Entity +public class Building extends AbstractJpaBuilding { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_CODE, code) + .toString(); + } + +} //Building Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Company.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Company.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Company.java 2013-06-27 15:17:40 UTC (rev 261) @@ -0,0 +1,18 @@ +package com.franciaflex.magalie.persistence.entity; + +import com.google.common.base.Objects; + +import javax.persistence.Entity; + +@Entity +public class Company extends AbstractJpaCompany { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_NAME, name) + .toString(); + } +} //Company Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java 2013-06-27 15:17:40 UTC (rev 261) @@ -0,0 +1,20 @@ +package com.franciaflex.magalie.persistence.entity; + +import com.google.common.base.Objects; + +import javax.persistence.Entity; + +@Entity +public class Kanban extends AbstractJpaKanban { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_ARTICLE, article.getCode()) + .add(PROPERTY_WAREHOUSE, warehouse) + .add(PROPERTY_REQUIRED_QUANTITY, requiredQuantity) + .toString(); + } +} //Kanban Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-06-27 14:27:22 UTC (rev 260) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-06-27 15:17:40 UTC (rev 261) @@ -23,6 +23,8 @@ * #L% */ +import com.google.common.base.Objects; + import javax.persistence.Entity; @Entity @@ -34,4 +36,14 @@ String barcode = getWarehouse().getCode() + getCode(); return barcode; } + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_CODE, code) + .add(PROPERTY_WAREHOUSE, getWarehouse().getCode()) + .add(PROPERTY_ID, id) + .toString(); + } + } //Location Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java 2013-06-27 15:17:40 UTC (rev 261) @@ -0,0 +1,19 @@ +package com.franciaflex.magalie.persistence.entity; + +import com.google.common.base.Objects; + +import javax.persistence.Entity; + +@Entity +public class LocationError extends AbstractJpaLocationError { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_LOCATION, location) + .toString(); + } + +} //LocationError Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java 2013-06-27 15:17:40 UTC (rev 261) @@ -0,0 +1,21 @@ +package com.franciaflex.magalie.persistence.entity; + +import com.google.common.base.Objects; + +import javax.persistence.Entity; + +@Entity +public class MagalieUser extends AbstractJpaMagalieUser { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_LOGIN, login) + .add(PROPERTY_ACCREDITATION_LEVEL, accreditationLevel) + .add(PROPERTY_CRANE_MAN, craneMan) + .toString(); + } + +} //MagalieUser Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java 2013-06-27 15:17:40 UTC (rev 261) @@ -0,0 +1,21 @@ +package com.franciaflex.magalie.persistence.entity; + +import com.google.common.base.Objects; + +import javax.persistence.Entity; + +@Entity +public class RequestedArticle extends AbstractJpaRequestedArticle { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_QUANTITY, quantity) + .add(PROPERTY_ARTICLE, article.getCode()) + .add(PROPERTY_REQUESTED_LIST, requestedList.getCode()) + .toString(); + } + +} //RequestedArticle Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java 2013-06-27 15:17:40 UTC (rev 261) @@ -0,0 +1,19 @@ +package com.franciaflex.magalie.persistence.entity; + +import com.google.common.base.Objects; + +import javax.persistence.Entity; + +@Entity +public class RequestedList extends AbstractJpaRequestedList { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_CODE, code) + .toString(); + } + +} //RequestedList Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-06-27 14:27:22 UTC (rev 260) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-06-27 15:17:40 UTC (rev 261) @@ -40,4 +40,20 @@ double quantity = Objects.firstNonNull(actualQuantity, expectedQuantity); return quantity; } + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_ID, id) + .add(PROPERTY_ORDER_DATE, orderDate) + .add(PROPERTY_CONFIRM_DATE, confirmDate) + .add(PROPERTY_ORIGIN_LOCATION, originLocation) + .add(PROPERTY_DESTINATION_LOCATION, destinationLocation) + .add(PROPERTY_EXPECTED_QUANTITY, expectedQuantity) + .add(PROPERTY_ACTUAL_QUANTITY, actualQuantity) + .add(PROPERTY_ARTICLE, article) + .add(PROPERTY_MAGALIE_USER, magalieUser) + .toString(); + } + } //StorageMovement Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java 2013-06-27 15:17:40 UTC (rev 261) @@ -0,0 +1,20 @@ +package com.franciaflex.magalie.persistence.entity; + +import com.google.common.base.Objects; + +import javax.persistence.Entity; + +@Entity +public class StoredArticle extends AbstractJpaStoredArticle { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_QUANTITY, quantity + " " + getArticle().getCode()) + .add(PROPERTY_ARTICLE, article) + .add(PROPERTY_LOCATION, location) + .toString(); + } +} //StoredArticle Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java 2013-06-27 15:17:40 UTC (rev 261) @@ -0,0 +1,19 @@ +package com.franciaflex.magalie.persistence.entity; + +import com.google.common.base.Objects; + +import javax.persistence.Entity; + +@Entity +public class Supplier extends AbstractJpaSupplier { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_NAME, name) + .toString(); + } + +} //Supplier Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java 2013-06-27 15:17:40 UTC (rev 261) @@ -0,0 +1,20 @@ +package com.franciaflex.magalie.persistence.entity; + +import com.google.common.base.Objects; + +import javax.persistence.Entity; + +@Entity +public class UnavailableArticle extends AbstractJpaUnavailableArticle { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_ARTICLE, article) + .add(PROPERTY_BUILDING, building) + .toString(); + } + +} //UnavailableArticle Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java 2013-06-27 15:17:40 UTC (rev 261) @@ -0,0 +1,21 @@ +package com.franciaflex.magalie.persistence.entity; + +import com.google.common.base.Objects; + +import javax.persistence.Entity; + +@Entity +public class Warehouse extends AbstractJpaWarehouse { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_ID, id) + .add(PROPERTY_CODE, code) + .add(PROPERTY_BUILDING, building) + .toString(); + } + +} //Warehouse Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-06-27 14:27:22 UTC (rev 260) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-06-27 15:17:40 UTC (rev 261) @@ -486,6 +486,10 @@ persistenceContext.commit(); + if (log.isInfoEnabled()) { + log.info("confirmed storage movement order: " + storageMovementOrder); + } + } public void cancelStorageMovement(String storageMovementOrderId) { @@ -505,5 +509,9 @@ storageMovementOrderDao.remove(storageMovementOrder); persistenceContext.commit(); + + if (log.isInfoEnabled()) { + log.info("cancelled storage movement order " + storageMovementOrder); + } } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java 2013-06-27 14:27:22 UTC (rev 260) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java 2013-06-27 15:17:40 UTC (rev 261) @@ -82,6 +82,10 @@ serviceContext.getPersistenceContext().commit(); + if (log.isInfoEnabled()) { + log.info("reported error on location: " + newLocationError); + } + } else { if (log.isInfoEnabled()) { Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-06-27 14:27:22 UTC (rev 260) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-06-27 15:17:40 UTC (rev 261) @@ -33,9 +33,13 @@ import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; public class MagalieBarcodeService implements MagalieService { + private static final Log log = LogFactory.getLog(MagalieBarcodeService.class); + protected MagalieServiceContext serviceContext; @Override @@ -51,6 +55,10 @@ if (article == null) { + if (log.isWarnEnabled()) { + log.warn("no article with code " + articleBarcode); + } + throw new InvalidMagalieBarcodeException( "no article with code " + articleBarcode); @@ -70,6 +78,10 @@ if (location == null) { + if (log.isWarnEnabled()) { + log.warn("no location with code " + locationBarcode); + } + throw new InvalidMagalieBarcodeException( "no location with code " + locationBarcode); Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/OrderResumeService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/OrderResumeService.java 2013-06-27 14:27:22 UTC (rev 260) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/OrderResumeService.java 2013-06-27 15:17:40 UTC (rev 261) @@ -31,6 +31,7 @@ import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; +import com.google.common.collect.Iterables; import java.util.List; @@ -51,11 +52,10 @@ List<StorageMovementOrder> notConfirmedByUser = storageMovementOrderDao.findNotConfirmedByUser(magalieUser, building); - if (notConfirmedByUser.isEmpty()) { - return null; - } else { - return notConfirmedByUser.get(0); - } + StorageMovementOrder orderToResume = Iterables.getFirst(notConfirmedByUser, null); + + return orderToResume; + } } Deleted: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/PreparedReceptionService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/PreparedReceptionService.java 2013-06-27 14:27:22 UTC (rev 260) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/PreparedReceptionService.java 2013-06-27 15:17:40 UTC (rev 261) @@ -1,48 +0,0 @@ -package com.franciaflex.magalie.services.service; - -/* - * #%L - * MagaLiE :: Services - * $Id:$ - * $HeadURL:$ - * %% - * Copyright (C) 2013 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ - -import com.franciaflex.magalie.services.MagalieServiceContext; - -public class PreparedReceptionService { - - protected MagalieServiceContext serviceContext; - - public void setServiceContext(MagalieServiceContext serviceContext) { - this.serviceContext = serviceContext; - } - - public void findLocationsToReceiveArticle(String preparedReceptionBarcode) { - - ReceptionService receptionService = - serviceContext.newService(ReceptionService.class); - -// List<Location> locations = -// receptionService.findLocationsToReceiveArticle(); - - - - } - -} Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-06-27 14:27:22 UTC (rev 260) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-06-27 15:17:40 UTC (rev 261) @@ -53,6 +53,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.util.Date; import java.util.List; @@ -61,6 +64,8 @@ public class ReceptionService implements MagalieService { + private static final Log log = LogFactory.getLog(ReceptionService.class); + protected MagalieServiceContext serviceContext; @Override @@ -154,6 +159,10 @@ ReceptionTask receptionTask = buildReceptionTask(storedArticle, quantity); + if (log.isInfoEnabled()) { + log.info("reception task is " + receptionTask); + } + return receptionTask; } @@ -190,6 +199,10 @@ storedArticle, preparedArticleReception.getQuantity()); + if (log.isInfoEnabled()) { + log.info("reception task for prepared article reception '" + barcode + "' is " + receptionTask); + } + return receptionTask; } @@ -266,6 +279,12 @@ ) ); + if (log.isDebugEnabled()) { + log.debug("locations to receive articles for article " + + article + " in warehouse " + warehouse + " are " + + StringUtils.join(result, ", ")); + } + return result; } Modified: trunk/magalie-web/src/main/resources/log4j.properties =================================================================== --- trunk/magalie-web/src/main/resources/log4j.properties 2013-06-27 14:27:22 UTC (rev 260) +++ trunk/magalie-web/src/main/resources/log4j.properties 2013-06-27 15:17:40 UTC (rev 261) @@ -34,7 +34,7 @@ log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n -log4j.logger.org.nuiton.web.filter.JpaTransactionFilter=TRACE +# log4j.logger.org.nuiton.web.filter.JpaTransactionFilter=TRACE log4j.logger.com.franciaflex.magalie=TRACE

1 0

r260 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/xmi magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 27 Jun '13

27 Jun '13

Author: bleny Date: 2013-06-27 16:27:22 +0200 (Thu, 27 Jun 2013) New Revision: 260 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: use IdFactory Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java trunk/magalie-persistence/src/main/xmi/magalie.properties trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-06-27 12:29:36 UTC (rev 259) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-06-27 14:27:22 UTC (rev 260) @@ -23,6 +23,8 @@ * #L% */ +import org.nuiton.jpa.api.DefaultJpaEntityIdFactory; +import org.nuiton.jpa.api.JpaEntityIdFactoryResolver; import org.nuiton.jpa.hibernate.HibernateUtil; import javax.persistence.EntityManager; @@ -31,6 +33,7 @@ public JpaMagaliePersistenceContext(EntityManager entityManager) { super(entityManager); + JpaEntityIdFactoryResolver.setFactory(new DefaultJpaEntityIdFactory()); } public void clearDatabase() { Modified: trunk/magalie-persistence/src/main/xmi/magalie.properties =================================================================== --- trunk/magalie-persistence/src/main/xmi/magalie.properties 2013-06-27 12:29:36 UTC (rev 259) +++ trunk/magalie-persistence/src/main/xmi/magalie.properties 2013-06-27 14:27:22 UTC (rev 260) @@ -20,6 +20,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### +model.tagValue.idFactory=true + com.franciaflex.magalie.persistence.entity.Article.attribute.fixedLocations.stereotype=unique com.franciaflex.magalie.persistence.entity.ReceivedPreparedArticleReception.attribute.storageMovements.stereotype=unique Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-06-27 12:29:36 UTC (rev 259) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-06-27 14:27:22 UTC (rev 260) @@ -150,8 +150,6 @@ } - persistenceContext.commit(); - LocationJpaDao locationDao = persistenceContext.getLocationDao(); Collection<Location> locations = fixtures.fixture("locations"); @@ -162,8 +160,6 @@ } - persistenceContext.commit(); - SupplierJpaDao supplierDao = persistenceContext.getSupplierDao(); Collection<Supplier> suppliers = fixtures.fixture("suppliers"); @@ -174,15 +170,13 @@ } - persistenceContext.commit(); - ArticleJpaDao articleDao = persistenceContext.getArticleDao(); Collection<Article> articles = fixtures.fixture("articles"); for (Article article : articles) { - articleDao.merge(article); + articleDao.persist(article); } @@ -196,8 +190,6 @@ } - persistenceContext.commit(); - StoredArticleJpaDao storedArticleDao = persistenceContext.getStoredArticleDao(); Collection<StoredArticle> storedArticles = fixtures.fixture("storedArticles"); @@ -208,8 +200,6 @@ } - persistenceContext.commit(); - RequestedListJpaDao requestedListDao = persistenceContext.getRequestedListDao(); Collection<RequestedList> requestedLists = fixtures.fixture("requestedLists"); @@ -220,8 +210,6 @@ } - persistenceContext.commit(); - RequestedArticleJpaDao requestedArticleDao = persistenceContext.getRequestedArticleDao(); Collection<RequestedArticle> requestedArticles = fixtures.fixture("requestedArticles"); @@ -232,8 +220,6 @@ } - persistenceContext.commit(); - PreparedArticleReceptionJpaDao preparedArticleReceptionDao = persistenceContext.getPreparedArticleReceptionDao(); Collection<PreparedArticleReception> preparedArticleReceptions = fixtures.fixture("preparedArticleReceptions");

1 0

r259 - in trunk: . magalie-web/src/main/resources
by bleny＠users.forge.codelutin.com 27 Jun '13

27 Jun '13

Author: bleny Date: 2013-06-27 14:29:36 +0200 (Thu, 27 Jun 2013) New Revision: 259 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: use org.nuiton.web.struts2.converters.DoubleConverter Added: trunk/magalie-web/src/main/resources/xwork-conversion.properties Modified: trunk/pom.xml Added: trunk/magalie-web/src/main/resources/xwork-conversion.properties =================================================================== --- trunk/magalie-web/src/main/resources/xwork-conversion.properties (rev 0) +++ trunk/magalie-web/src/main/resources/xwork-conversion.properties 2013-06-27 12:29:36 UTC (rev 259) @@ -0,0 +1,2 @@ +java.lang.Double=org.nuiton.web.struts2.converters.DoubleConverter +double=org.nuiton.web.struts2.converters.DoubleConverter Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-27 12:29:04 UTC (rev 258) +++ trunk/pom.xml 2013-06-27 12:29:36 UTC (rev 259) @@ -112,7 +112,7 @@  <nuitonJpaVersion>0.1-SNAPSHOT</nuitonJpaVersion> - <nuitonWebVersion>1.13</nuitonWebVersion> + <nuitonWebVersion>1.14-SNAPSHOT</nuitonWebVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.172</h2Version> <struts2Version>2.3.14.2</struts2Version>

1 0

r258 - trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 27 Jun '13

27 Jun '13

Author: bleny Date: 2013-06-27 14:29:04 +0200 (Thu, 27 Jun 2013) New Revision: 258 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add a log for where an id error occur Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-06-27 09:54:30 UTC (rev 257) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-06-27 12:29:04 UTC (rev 258) @@ -148,5 +148,10 @@ storageMovementDao.persist(storageMovement); persistenceContext.commit(); + + if (log.isInfoEnabled()) { + log.info("storage movement recorded " + storageMovement); + } + } }

1 0

Jenkins build became unstable: franciaflex-magalie #76
by admin+hudson＠codelutin.com 27 Jun '13

27 Jun '13

See <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/76/changes>

1 1

Jenkins build became unstable: franciaflex-magalie » MagaLiE :: Services #76
by admin+hudson＠codelutin.com 27 Jun '13

27 Jun '13

See <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/com.franciaflex$magali…>

1 1

r257 - in trunk: magalie-persistence magalie-persistence/src/main/java/com/franciaflex/magalie magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/resources magalie-services/src/test/java/com/franciaflex/magalie/services magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 27 Jun '13

27 Jun '13

Author: bleny Date: 2013-06-27 11:54:30 +0200 (Thu, 27 Jun 2013) New Revision: 257 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: factorize oracle compatible mode in hibernate-oracle.properties ; add some validation in kanban ; use ' SANS' for locations code Modified: trunk/magalie-persistence/pom.xml trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-06-27 09:16:36 UTC (rev 256) +++ trunk/magalie-persistence/pom.xml 2013-06-27 09:54:30 UTC (rev 257) @@ -145,7 +145,6 @@ <configuration> <type>CREATE</type> <hibernateProperties>${maven.src.dir}/main/resources/hibernate-oracle.properties</hibernateProperties> - <hibernateDialect>com.franciaflex.magalie.persistence.MagalieOracleHibernateDialect</hibernateDialect> <outputFile>${project.build.directory}/generated-sources/magalie-create-oracle.sql</outputFile> </configuration> </execution> @@ -157,14 +156,12 @@ <configuration> <type>DROP</type> <hibernateProperties>${maven.src.dir}/main/resources/hibernate-oracle.properties</hibernateProperties> - <hibernateDialect>com.franciaflex.magalie.persistence.MagalieOracleHibernateDialect</hibernateDialect> <outputFile>${project.build.directory}/generated-sources/magalie-drop-oracle.sql</outputFile> </configuration> </execution> </executions> <configuration> <target>SCRIPT</target> - <hibernateProperties>${maven.src.dir}/main/resources/magalie.properties</hibernateProperties> </configuration> <dependencies>  Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-06-27 09:16:36 UTC (rev 256) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-06-27 09:54:30 UTC (rev 257) @@ -23,15 +23,17 @@ * #L% */ -import com.franciaflex.magalie.persistence.MagalieOracleHibernateDialect; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.config.ApplicationConfig; import org.nuiton.util.config.ArgumentsParserException; +import java.io.IOException; +import java.io.InputStream; import java.util.List; import java.util.Map; import java.util.Properties; @@ -42,11 +44,7 @@ protected ApplicationConfig applicationConfig; - protected ImmutableMap<String, String> oracleCompatibilityModeJpaParameters = - ImmutableMap.of( - "hibernate.ejb.naming_strategy", org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy.class.getCanonicalName(), - "hibernate.dialect", MagalieOracleHibernateDialect.class.getCanonicalName() - ); + protected ImmutableMap<String,String> oracleCompatibilityModeJpaParameters; public MagalieApplicationConfig() { applicationConfig = new ApplicationConfig(); @@ -79,11 +77,32 @@ if (log.isInfoEnabled()) { log.info("oracle compatibility mode enabled: overriding settings with " + oracleCompatibilityModeJpaParameters); } - jpaParameters.putAll(oracleCompatibilityModeJpaParameters); + jpaParameters.putAll(getOracleCompatibilityModeJpaParameters()); } return jpaParameters; } + protected ImmutableMap<String, String> getOracleCompatibilityModeJpaParameters() { + if (oracleCompatibilityModeJpaParameters == null) { + InputStream inputStream = null; + try { + inputStream = getClass().getResourceAsStream("/hibernate-oracle.properties"); + Properties oracleCompatibilityModeProperties = new Properties(); + oracleCompatibilityModeProperties.load(inputStream); + oracleCompatibilityModeJpaParameters = Maps.fromProperties(oracleCompatibilityModeProperties); + IOUtils.closeQuietly(inputStream); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("should never occur", e); + } + throw new MagalieTechnicalException(e); + } finally { + IOUtils.closeQuietly(inputStream); + } + } + return oracleCompatibilityModeJpaParameters; + } + public boolean isDevMode() { boolean isDevMode = applicationConfig.getOptionAsBoolean(MagalieConfigOption.DEV_MODE.key); return isDevMode; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-06-27 09:16:36 UTC (rev 256) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-06-27 09:54:30 UTC (rev 257) @@ -100,7 +100,7 @@ } public static String codeForWarehouseWithoutLocations() { - return "SANS"; + return " SANS"; } public static String codeForReceptionLocations() { Modified: trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties =================================================================== --- trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties 2013-06-27 09:16:36 UTC (rev 256) +++ trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties 2013-06-27 09:54:30 UTC (rev 257) @@ -1 +1,2 @@ hibernate.ejb.naming_strategy=org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy +hibernate.dialect=com.franciaflex.magalie.persistence.MagalieOracleHibernateDialect Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java 2013-06-27 09:16:36 UTC (rev 256) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java 2013-06-27 09:54:30 UTC (rev 257) @@ -64,7 +64,7 @@ serviceContext.setMagalieApplicationConfig(getMagalieApplicationConfig()); - EntityManager entityManager = getJpaEntityManagerRule().getEntityManager(); + EntityManager entityManager = getJpaEntityManagerRule().newEntityManager(); JpaMagaliePersistenceContext jpaMagaliePersistenceContext = new JpaMagaliePersistenceContext(entityManager); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-06-27 09:16:36 UTC (rev 256) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-06-27 09:54:30 UTC (rev 257) @@ -138,6 +138,14 @@ Company company = session.getCompany(); + if (destinationWarehouseId == null) { + + addFieldError("destinationWarehouseId", "Vous devez sélectionner un magasin de destination"); + + return INPUT; + + } + destinationWarehouse = service.getStore(destinationWarehouseId); // save used destination warehouse to propose it by default on next kanban

1 0