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

r266 - trunk/magalie-persistence/src/main/resources
by bleny＠users.forge.codelutin.com June 28, 2013

June 28, 2013

Author: bleny Date: 2013-06-28 16:21:10 +0200 (Fri, 28 Jun 2013) New Revision: 266 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: hibernate.show_sql=true Modified: trunk/magalie-persistence/src/main/resources/magalie.properties Modified: trunk/magalie-persistence/src/main/resources/magalie.properties =================================================================== --- trunk/magalie-persistence/src/main/resources/magalie.properties 2013-06-28 14:16:34 UTC (rev 265) +++ trunk/magalie-persistence/src/main/resources/magalie.properties 2013-06-28 14:21:10 UTC (rev 266) @@ -26,7 +26,7 @@ javax.persistence.jdbc.password= hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.hbm2ddl.auto=update -hibernate.show_sql=false +hibernate.show_sql=true hibernate.format_sql=true hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy

1 0

r265 - in trunk/magalie-web/src/main: java/com/franciaflex/magalie/web resources
by bleny＠users.forge.codelutin.com June 28, 2013

June 28, 2013

Author: bleny Date: 2013-06-28 16:16:34 +0200 (Fri, 28 Jun 2013) New Revision: 265 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add more logs for session Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java trunk/magalie-web/src/main/resources/log4j.properties 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-06-28 08:29:11 UTC (rev 264) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java 2013-06-28 14:16:34 UTC (rev 265) @@ -23,6 +23,7 @@ * #L% */ +import com.google.common.base.Objects; import com.opensymphony.xwork2.ActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,6 +36,7 @@ private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(MagalieActionSupport.class); + public static final List<String> SHORTCUTS = Arrays.asList(new String[]{ "0", "1", "2", "3", "5", "6", "7", "8", "9", "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" }); @@ -47,4 +49,9 @@ return super.hasActionErrors() || super.hasActionMessages(); } + @Override + public String toString() { + return Objects.toStringHelper(this).toString(); + } + } 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-06-28 08:29:11 UTC (rev 264) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-06-28 14:16:34 UTC (rev 265) @@ -27,6 +27,7 @@ import com.franciaflex.magalie.persistence.entity.Company; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.Warehouse; +import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -105,4 +106,13 @@ this.activity = activity; } + @Override + public String toString() { + return Objects.toStringHelper(this) + .add("user", magalieUser) + .add("building", building) + .add("activity", activity) + .toString(); + } + } Modified: trunk/magalie-web/src/main/resources/log4j.properties =================================================================== --- trunk/magalie-web/src/main/resources/log4j.properties 2013-06-28 08:29:11 UTC (rev 264) +++ trunk/magalie-web/src/main/resources/log4j.properties 2013-06-28 14:16:34 UTC (rev 265) @@ -37,7 +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.web.MagalieInterceptor=WARN # log4j.logger.com.franciaflex.magalie.services.service.RequestedArticleService=TRACE # log4j.logger.com.franciaflex.magalie.services.service.ArticleStorageService=TRACE

1 0

r264 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie
by bleny＠users.forge.codelutin.com June 28, 2013

June 28, 2013

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 June 28, 2013

June 28, 2013

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 June 28, 2013

June 28, 2013

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 June 27, 2013

June 27, 2013

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 June 27, 2013

June 27, 2013

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 June 27, 2013

June 27, 2013

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 June 27, 2013

June 27, 2013

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 » MagaLiE :: Services #76
by admin+hudson＠codelutin.com June 27, 2013

June 27, 2013

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

1 1

Jenkins build became unstable: franciaflex-magalie #76
by admin+hudson＠codelutin.com June 27, 2013

June 27, 2013

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

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 June 27, 2013

June 27, 2013

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

r256 - in trunk: . magalie-persistence magalie-persistence/src/main/resources
by bleny＠users.forge.codelutin.com June 27, 2013

June 27, 2013

Author: bleny Date: 2013-06-27 11:16:36 +0200 (Thu, 27 Jun 2013) New Revision: 256 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: better conf for sql generation Added: trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties Modified: trunk/magalie-persistence/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-06-25 16:55:12 UTC (rev 255) +++ trunk/magalie-persistence/pom.xml 2013-06-27 09:16:36 UTC (rev 256) @@ -144,7 +144,8 @@ </goals> <configuration> <type>CREATE</type> - <hibernateDialect>org.hibernate.dialect.Oracle10gDialect</hibernateDialect> + <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> @@ -155,32 +156,11 @@ </goals> <configuration> <type>DROP</type> - <hibernateDialect>org.hibernate.dialect.Oracle10gDialect</hibernateDialect> + <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> - <execution> - <id>executionCreateMysql</id> - <goals> - <goal>export</goal> - </goals> - <configuration> - <type>CREATE</type> - <hibernateDialect>org.hibernate.dialect.MySQLDialect</hibernateDialect> - <outputFile>${project.build.directory}/generated-sources/magalie-create-mysql.sql</outputFile> - </configuration> - </execution> - <execution> - <id>executionDropMysql</id> - <goals> - <goal>export</goal> - </goals> - <configuration> - <type>DROP</type> - <hibernateDialect>org.hibernate.dialect.MySQLDialect</hibernateDialect> - <outputFile>${project.build.directory}/generated-sources/magalie-drop-mysql.sql</outputFile> - </configuration> - </execution> </executions> <configuration> <target>SCRIPT</target> Added: trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties =================================================================== --- trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties (rev 0) +++ trunk/magalie-persistence/src/main/resources/hibernate-oracle.properties 2013-06-27 09:16:36 UTC (rev 256) @@ -0,0 +1 @@ +hibernate.ejb.naming_strategy=org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-25 16:55:12 UTC (rev 255) +++ trunk/pom.xml 2013-06-27 09:16:36 UTC (rev 256) @@ -345,6 +345,7 @@ <plugin> <groupId>de.juplo</groupId> <artifactId>hibernate4-maven-plugin</artifactId> +  <version>1.0.1</version> </plugin>

1 0

r255 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence
by bleny＠users.forge.codelutin.com June 25, 2013

June 25, 2013

Author: bleny Date: 2013-06-25 18:55:12 +0200 (Tue, 25 Jun 2013) New Revision: 255 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: use 'number' in oracle for double fields Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java 2013-06-25 12:04:48 UTC (rev 254) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java 2013-06-25 16:55:12 UTC (rev 255) @@ -40,7 +40,7 @@ public MagalieOracleHibernateDialect() { super(); - registerColumnType(Types.DOUBLE, "float"); + registerColumnType(Types.DOUBLE, "number"); } }

1 0

r254 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie
by bleny＠users.forge.codelutin.com June 25, 2013

June 25, 2013

Author: bleny Date: 2013-06-25 14:04:48 +0200 (Tue, 25 Jun 2013) New Revision: 254 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: prefix all magalie config option by 'magalie.' 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-25 08:59:02 UTC (rev 253) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java 2013-06-25 12:04:48 UTC (rev 254) @@ -46,12 +46,12 @@ "", String.class), ORACLE_COMPATIBILITY_MODE( - "oracleCompatibilityMode", + "magalie.oracleCompatibilityMode", "Empêche la création de noms d'identifiants de plus de 30 caractères, utilise Float pour persister les doubles", "false", Boolean.class), DEV_MODE( - "devMode", + "magalie.devMode", "Mode développement, court-circuite l'envoi de mail", "true", Boolean.class),

1 0

r253 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-services/src/main/java/com/franciaflex/magalie/services/exception
by bleny＠users.forge.codelutin.com June 25, 2013

June 25, 2013

Author: bleny Date: 2013-06-25 10:59:02 +0200 (Tue, 25 Jun 2013) New Revision: 253 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add missing file header Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/IllegalWithdrawException.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/InaccessibleLocationException.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java 2013-06-25 08:58:09 UTC (rev 252) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java 2013-06-25 08:59:02 UTC (rev 253) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence; +/* + * #%L + * MagaLiE :: Persistence + * $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 org.hibernate.dialect.Oracle10gDialect; import java.sql.Types; Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/IllegalWithdrawException.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/IllegalWithdrawException.java 2013-06-25 08:58:09 UTC (rev 252) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/IllegalWithdrawException.java 2013-06-25 08:59:02 UTC (rev 253) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.services.exception; +/* + * #%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.persistence.entity.Article; public class IllegalWithdrawException extends MagalieException { Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/InaccessibleLocationException.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/InaccessibleLocationException.java 2013-06-25 08:58:09 UTC (rev 252) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/InaccessibleLocationException.java 2013-06-25 08:59:02 UTC (rev 253) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.services.exception; +/* + * #%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.persistence.Locations; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser;

1 0

r252 - 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-web/src/main/resources
by bleny＠users.forge.codelutin.com June 25, 2013

June 25, 2013

Author: bleny Date: 2013-06-25 10:58:09 +0200 (Tue, 25 Jun 2013) New Revision: 252 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: in Oracle, persist double as 'float' sql type Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java Removed: trunk/magalie-web/src/main/resources/magalie-production.properties 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/MagalieConfigOption.java trunk/magalie-persistence/src/main/resources/magalie.properties Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-06-21 16:11:19 UTC (rev 251) +++ trunk/magalie-persistence/pom.xml 2013-06-25 08:58:09 UTC (rev 252) @@ -37,6 +37,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> + <scope>compile</scope>  </dependency> <dependency> 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-21 16:11:19 UTC (rev 251) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-06-25 08:58:09 UTC (rev 252) @@ -23,6 +23,8 @@ * #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.logging.Log; @@ -40,6 +42,12 @@ 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() + ); + public MagalieApplicationConfig() { applicationConfig = new ApplicationConfig(); applicationConfig.loadDefaultOptions(MagalieConfigOption.values()); @@ -67,6 +75,12 @@ jpaParameters.putAll((Map) hibernateProperties); Properties jpaProperties = applicationConfig.getOptionStartsWith("javax.persistence"); jpaParameters.putAll((Map) jpaProperties); + if (isOracleCompatibilityMode()) { + if (log.isInfoEnabled()) { + log.info("oracle compatibility mode enabled: overriding settings with " + oracleCompatibilityModeJpaParameters); + } + jpaParameters.putAll(oracleCompatibilityModeJpaParameters); + } return jpaParameters; } @@ -74,4 +88,10 @@ boolean isDevMode = applicationConfig.getOptionAsBoolean(MagalieConfigOption.DEV_MODE.key); return isDevMode; } + + public boolean isOracleCompatibilityMode() { + boolean isOracleCompatibilityMode = applicationConfig.getOptionAsBoolean(MagalieConfigOption.ORACLE_COMPATIBILITY_MODE.key); + return isOracleCompatibilityMode; + } + } 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-21 16:11:19 UTC (rev 251) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java 2013-06-25 08:58:09 UTC (rev 252) @@ -45,6 +45,11 @@ "L'adresse d'expéditeur pour les mails de notifications", "", String.class), + ORACLE_COMPATIBILITY_MODE( + "oracleCompatibilityMode", + "Empêche la création de noms d'identifiants de plus de 30 caractères, utilise Float pour persister les doubles", + "false", Boolean.class), + DEV_MODE( "devMode", "Mode développement, court-circuite l'envoi de mail", Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java 2013-06-25 08:58:09 UTC (rev 252) @@ -0,0 +1,23 @@ +package com.franciaflex.magalie.persistence; + +import org.hibernate.dialect.Oracle10gDialect; + +import java.sql.Types; + +/** + * In the actual database, we are unable to create some views with columns + * typed as "double precision", so we map all double in the entities + * to "float" in database. + * + * @link http://stackoverflow.com/questions/2524966/hibernate-found-float-expected-d… + * @link http://docs.oracle.com/cd/B28359_01/server.111/b28285/sqlqr06.htm#CHDJJEEA show that + * SQL type DOUBLE PRECISION is actually implemented as FLOAT(126) + */ +public class MagalieOracleHibernateDialect extends Oracle10gDialect { + + public MagalieOracleHibernateDialect() { + super(); + registerColumnType(Types.DOUBLE, "float"); + } + +} Modified: trunk/magalie-persistence/src/main/resources/magalie.properties =================================================================== --- trunk/magalie-persistence/src/main/resources/magalie.properties 2013-06-21 16:11:19 UTC (rev 251) +++ trunk/magalie-persistence/src/main/resources/magalie.properties 2013-06-25 08:58:09 UTC (rev 252) @@ -28,7 +28,7 @@ hibernate.hbm2ddl.auto=update hibernate.show_sql=false hibernate.format_sql=true -hibernate.ejb.naming_strategy=org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy +hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy hibernate.c3p0.min_size=3 hibernate.c3p0.max_size=5 Deleted: trunk/magalie-web/src/main/resources/magalie-production.properties =================================================================== --- trunk/magalie-web/src/main/resources/magalie-production.properties 2013-06-21 16:11:19 UTC (rev 251) +++ trunk/magalie-web/src/main/resources/magalie-production.properties 2013-06-25 08:58:09 UTC (rev 252) @@ -1,34 +0,0 @@ -### -# #%L -# MagaLiE :: UI -# $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% -### - -hibernate.hbm2ddl.auto=validate -hibernate.show_sql=false -hibernate.format_sql=true -hibernate.ejb.naming_strategy=org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy - -magalie.devMode=${devMode} - -hibernate.c3p0.min_size=3 -hibernate.c3p0.max_size=5 -hibernate.c3p0.timeout=1800 -hibernate.c3p0.max_statements=50

1 0

r251 - trunk/magalie-persistence/src/main/xmi
by bleny＠users.forge.codelutin.com June 21, 2013

June 21, 2013

Author: bleny Date: 2013-06-21 18:11:19 +0200 (Fri, 21 Jun 2013) New Revision: 251 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove 'driverLicense' from model Modified: trunk/magalie-persistence/src/main/xmi/magalie.zargo Modified: trunk/magalie-persistence/src/main/xmi/magalie.zargo =================================================================== (Binary files differ)

1 0

r250 - trunk
by bleny＠users.forge.codelutin.com June 20, 2013

June 20, 2013

Author: bleny Date: 2013-06-20 17:36:30 +0200 (Thu, 20 Jun 2013) New Revision: 250 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: use stable version of hibernate4-maven-plugin Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-20 15:34:44 UTC (rev 249) +++ trunk/pom.xml 2013-06-20 15:36:30 UTC (rev 250) @@ -345,7 +345,7 @@ <plugin> <groupId>de.juplo</groupId> <artifactId>hibernate4-maven-plugin</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.1</version> </plugin> </plugins>

1 0

r249 - in trunk: . magalie-persistence magalie-services magalie-web
by bleny＠users.forge.codelutin.com June 20, 2013

June 20, 2013

Author: bleny Date: 2013-06-20 17:34:44 +0200 (Thu, 20 Jun 2013) New Revision: 249 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: version according to roadmap in poms 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-06-20 15:21:07 UTC (rev 248) +++ trunk/magalie-persistence/pom.xml 2013-06-20 15:34:44 UTC (rev 249) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>0.1-SNAPSHOT</version> + <version>1.0-rc-1-SNAPSHOT</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-06-20 15:21:07 UTC (rev 248) +++ trunk/magalie-services/pom.xml 2013-06-20 15:34:44 UTC (rev 249) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>0.1-SNAPSHOT</version> + <version>1.0-rc-1-SNAPSHOT</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-06-20 15:21:07 UTC (rev 248) +++ trunk/magalie-web/pom.xml 2013-06-20 15:34:44 UTC (rev 249) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>0.1-SNAPSHOT</version> + <version>1.0-rc-1-SNAPSHOT</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-20 15:21:07 UTC (rev 248) +++ trunk/pom.xml 2013-06-20 15:34:44 UTC (rev 249) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>0.1-SNAPSHOT</version> + <version>1.0-rc-1-SNAPSHOT</version> <packaging>pom</packaging> <name>MagaLiE</name>

1 0

r248 - in trunk: magalie-persistence/src/main/resources magalie-web/src/main/resources
by bleny＠users.forge.codelutin.com June 20, 2013

June 20, 2013

Author: bleny Date: 2013-06-20 17:21:07 +0200 (Thu, 20 Jun 2013) New Revision: 248 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: use naming-strategy everywhere Modified: trunk/magalie-persistence/src/main/resources/magalie.properties trunk/magalie-web/src/main/resources/magalie-production.properties Modified: trunk/magalie-persistence/src/main/resources/magalie.properties =================================================================== --- trunk/magalie-persistence/src/main/resources/magalie.properties 2013-06-20 15:07:05 UTC (rev 247) +++ trunk/magalie-persistence/src/main/resources/magalie.properties 2013-06-20 15:21:07 UTC (rev 248) @@ -28,7 +28,6 @@ hibernate.hbm2ddl.auto=update hibernate.show_sql=false hibernate.format_sql=true -# hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy hibernate.ejb.naming_strategy=org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy hibernate.c3p0.min_size=3 Modified: trunk/magalie-web/src/main/resources/magalie-production.properties =================================================================== --- trunk/magalie-web/src/main/resources/magalie-production.properties 2013-06-20 15:07:05 UTC (rev 247) +++ trunk/magalie-web/src/main/resources/magalie-production.properties 2013-06-20 15:21:07 UTC (rev 248) @@ -24,7 +24,7 @@ hibernate.hbm2ddl.auto=validate hibernate.show_sql=false hibernate.format_sql=true -hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy +hibernate.ejb.naming_strategy=org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy magalie.devMode=${devMode}

1 0

r247 - in trunk: . magalie-persistence magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/resources magalie-persistence/src/test/java/com/franciaflex/magalie magalie-services/src/test/resources magalie-web/src/main/webapp/WEB-INF
by bleny＠users.forge.codelutin.com June 20, 2013

June 20, 2013

Author: bleny Date: 2013-06-20 17:07:05 +0200 (Thu, 20 Jun 2013) New Revision: 247 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: update to last modifications of nuiton-jpa, use new NamingStrategy Removed: trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java Modified: trunk/magalie-persistence/pom.xml trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java trunk/magalie-persistence/src/main/resources/magalie.properties trunk/magalie-services/src/test/resources/log4j.properties trunk/magalie-web/src/main/webapp/WEB-INF/web.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-06-12 08:58:57 UTC (rev 246) +++ trunk/magalie-persistence/pom.xml 2013-06-20 15:07:05 UTC (rev 247) @@ -25,6 +25,11 @@ </dependency> <dependency> + <groupId>org.nuiton.jpa</groupId> + <artifactId>nuiton-jpa-hibernate</artifactId> + </dependency> + + <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.0-api</artifactId> </dependency> @@ -178,7 +183,16 @@ </executions> <configuration> <target>SCRIPT</target> + <hibernateProperties>${maven.src.dir}/main/resources/magalie.properties</hibernateProperties> </configuration> + <dependencies> +  + <dependency> + <groupId>org.nuiton.jpa</groupId> + <artifactId>nuiton-jpa-hibernate</artifactId> + <version>${nuitonJpaVersion}</version> + </dependency> + </dependencies> </plugin> </plugins> </build> 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-12 08:58:57 UTC (rev 246) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-06-20 15:07:05 UTC (rev 247) @@ -23,7 +23,7 @@ * #L% */ -import org.nuiton.jpa.api.hibernate.HibernateUtil; +import org.nuiton.jpa.hibernate.HibernateUtil; import javax.persistence.EntityManager; Modified: trunk/magalie-persistence/src/main/resources/magalie.properties =================================================================== --- trunk/magalie-persistence/src/main/resources/magalie.properties 2013-06-12 08:58:57 UTC (rev 246) +++ trunk/magalie-persistence/src/main/resources/magalie.properties 2013-06-20 15:07:05 UTC (rev 247) @@ -28,7 +28,8 @@ hibernate.hbm2ddl.auto=update hibernate.show_sql=false hibernate.format_sql=true -hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy +# hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy +hibernate.ejb.naming_strategy=org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy hibernate.c3p0.min_size=3 hibernate.c3p0.max_size=5 Deleted: trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java =================================================================== --- trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java 2013-06-12 08:58:57 UTC (rev 246) +++ trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/PersistenceTest.java 2013-06-20 15:07:05 UTC (rev 247) @@ -1,71 +0,0 @@ -package com.franciaflex.magalie; - -/* - * #%L - * MagaLiE :: Persistence - * $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 org.junit.Test; - -public class PersistenceTest { - - @Test - public void testName() throws Exception { - -// MagalieFixtures fixtures = new MagalieFixtures("fixtures"); -// -// Article article = fixtures.fixture("article2"); -// -// System.out.println(article); -// -// MagalieApplicationConfig applicationConfig = new MagalieApplicationConfig(); -// -// Map<String, Object> jpaParameters = applicationConfig.getJpaParameters(); -// -// EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory("magaliePersistenceUnit", jpaParameters); -// -// EntityManager entityManager = entityManagerFactory.createEntityManager(); -// -// entityManager.getTransaction().begin(); -// -//// entityManager.persist(new MagalieUser()); -//// entityManager.persist(new Article()); -//// entityManager.persist(new StoredArticle()); -//// entityManager.persist(new Location()); -//// entityManager.persist(new RequestedArticle()); -// -//// entityManager.persist(new LocationError()); -//// entityManager.persist(new StorageMovement()); -// -// List<Location> storageMovements = fixtures.fixture("storageMovements"); -// -// for (Location location : storageMovements) { -// -// entityManager.persist(location); -// -// } -// -// entityManager.getTransaction().commit(); -// -// entityManager.close(); - - } -} Modified: trunk/magalie-services/src/test/resources/log4j.properties =================================================================== --- trunk/magalie-services/src/test/resources/log4j.properties 2013-06-12 08:58:57 UTC (rev 246) +++ trunk/magalie-services/src/test/resources/log4j.properties 2013-06-20 15:07:05 UTC (rev 247) @@ -29,4 +29,4 @@ # log4j.logger.com.franciaflex.magalie=TRACE # log4j.logger.org.hibernate.tool.hbm2ddl.SchemaExport=FATAL -# log4j.logger.org.nuiton.jpa.api.hibernate.HibernateUtil=DEBUG +# log4j.logger.org.nuiton.jpa.hibernate.HibernateUtil=DEBUG Modified: trunk/magalie-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/web.xml 2013-06-12 08:58:57 UTC (rev 246) +++ trunk/magalie-web/src/main/webapp/WEB-INF/web.xml 2013-06-20 15:07:05 UTC (rev 247) @@ -28,7 +28,6 @@ <display-name>MagaLiE ${project.version}</display-name> -  <session-config> <session-timeout>600</session-timeout> </session-config> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-12 08:58:57 UTC (rev 246) +++ trunk/pom.xml 2013-06-20 15:07:05 UTC (rev 247) @@ -224,6 +224,12 @@ <artifactId>nuiton-jpa-api</artifactId> <version>${nuitonJpaVersion}</version> </dependency> + + <dependency> + <groupId>org.nuiton.jpa</groupId> + <artifactId>nuiton-jpa-hibernate</artifactId> + <version>${nuitonJpaVersion}</version> + </dependency> <dependency> <groupId>org.nuiton.jpa</groupId> @@ -339,7 +345,7 @@ <plugin> <groupId>de.juplo</groupId> <artifactId>hibernate4-maven-plugin</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </plugin> </plugins>

1 0

Build failed in Jenkins: franciaflex-magalie #69
by admin+hudson＠codelutin.com June 17, 2013

June 17, 2013

See <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/69/> ------------------------------------------ Started by upstream project "nuiton-jpa" build number 16 originally caused by: Started by an SCM change Building on master in workspace <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/ws/> Cleaning local Directory trunk Checking out http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk at revision '2013-06-17T12:11:39.971 +0200' ERROR: Failed to check out http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk org.tmatesoft.svn.core.SVNException: svn: E175002: OPTIONS /svn/franciaflex-magalie/trunk failed at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:379) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:364) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:352) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.performHttpRequest(DAVConnection.java:708) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.exchangeCapabilities(DAVConnection.java:628) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.open(DAVConnection.java:103) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.openConnection(DAVRepository.java:1018) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.getLatestRevision(DAVRepository.java:180) at org.tmatesoft.svn.core.internal.wc16.SVNBasicDelegate.getRevisionNumber(SVNBasicDelegate.java:480) at org.tmatesoft.svn.core.internal.wc16.SVNBasicDelegate.getLocations(SVNBasicDelegate.java:833) at org.tmatesoft.svn.core.internal.wc16.SVNBasicDelegate.createRepository(SVNBasicDelegate.java:527) at org.tmatesoft.svn.core.internal.wc16.SVNUpdateClient16.doCheckout(SVNUpdateClient16.java:875) at org.tmatesoft.svn.core.internal.wc2.old.SvnOldCheckout.run(SvnOldCheckout.java:19) at org.tmatesoft.svn.core.internal.wc2.old.SvnOldCheckout.run(SvnOldCheckout.java:8) at org.tmatesoft.svn.core.internal.wc2.SvnOperationRunner.run(SvnOperationRunner.java:20) at org.tmatesoft.svn.core.wc2.SvnOperationFactory.run(SvnOperationFactory.java:1235) at org.tmatesoft.svn.core.wc2.SvnOperation.run(SvnOperation.java:291) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:777) at hudson.scm.subversion.CheckoutUpdater$1.perform(CheckoutUpdater.java:99) at hudson.scm.subversion.WorkspaceUpdater$UpdateTask.delegateTo(WorkspaceUpdater.java:153) at hudson.scm.SubversionSCM$CheckOutTask.perform(SubversionSCM.java:903) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:884) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:867) at hudson.FilePath.act(FilePath.java:905) at hudson.FilePath.act(FilePath.java:878) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:843) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:781) at hudson.model.AbstractProject.checkout(AbstractProject.java:1369) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:676) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:88) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:581) at hudson.model.Run.execute(Run.java:1576) at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:486) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:241) Caused by: svn: E175002: OPTIONS /svn/franciaflex-magalie/trunk failed at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:208) at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:154) at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:97) ... 35 more Caused by: org.tmatesoft.svn.core.SVNException: svn: E175002: OPTIONS request failed on '/svn/franciaflex-magalie/trunk' svn: E175002: unknown host at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64) at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:754) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:373) ... 34 more Caused by: svn: E175002: OPTIONS request failed on '/svn/franciaflex-magalie/trunk' at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:208) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:752) ... 35 more Caused by: svn: E175002: unknown host at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:208) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:496) ... 35 more Caused by: java.net.UnknownHostException: svn.forge.codelutin.com at java.net.InetAddress.getAllByName0(InetAddress.java:1243) at java.net.InetAddress.getAllByName(InetAddress.java:1155) at java.net.InetAddress.getAllByName(InetAddress.java:1091) at java.net.InetAddress.getByName(InetAddress.java:1041) at org.tmatesoft.svn.core.internal.util.SVNSocketFactory.createAddres(SVNSocketFactory.java:155) at org.tmatesoft.svn.core.internal.util.SVNSocketFactory.createPlainSocket(SVNSocketFactory.java:61) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.connect(HTTPConnection.java:270) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:435) ... 35 more java.io.IOException: Failed to check out http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk at hudson.scm.subversion.CheckoutUpdater$1.perform(CheckoutUpdater.java:110) at hudson.scm.subversion.WorkspaceUpdater$UpdateTask.delegateTo(WorkspaceUpdater.java:153) at hudson.scm.SubversionSCM$CheckOutTask.perform(SubversionSCM.java:903) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:884) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:867) at hudson.FilePath.act(FilePath.java:905) at hudson.FilePath.act(FilePath.java:878) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:843) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:781) at hudson.model.AbstractProject.checkout(AbstractProject.java:1369) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:676) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:88) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:581) at hudson.model.Run.execute(Run.java:1576) at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:486) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:241) Caused by: org.tmatesoft.svn.core.SVNException: svn: E175002: OPTIONS /svn/franciaflex-magalie/trunk failed at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:379) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:364) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:352) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.performHttpRequest(DAVConnection.java:708) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.exchangeCapabilities(DAVConnection.java:628) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.open(DAVConnection.java:103) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.openConnection(DAVRepository.java:1018) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.getLatestRevision(DAVRepository.java:180) at org.tmatesoft.svn.core.internal.wc16.SVNBasicDelegate.getRevisionNumber(SVNBasicDelegate.java:480) at org.tmatesoft.svn.core.internal.wc16.SVNBasicDelegate.getLocations(SVNBasicDelegate.java:833) at org.tmatesoft.svn.core.internal.wc16.SVNBasicDelegate.createRepository(SVNBasicDelegate.java:527) at org.tmatesoft.svn.core.internal.wc16.SVNUpdateClient16.doCheckout(SVNUpdateClient16.java:875) at org.tmatesoft.svn.core.internal.wc2.old.SvnOldCheckout.run(SvnOldCheckout.java:19) at org.tmatesoft.svn.core.internal.wc2.old.SvnOldCheckout.run(SvnOldCheckout.java:8) at org.tmatesoft.svn.core.internal.wc2.SvnOperationRunner.run(SvnOperationRunner.java:20) at org.tmatesoft.svn.core.wc2.SvnOperationFactory.run(SvnOperationFactory.java:1235) at org.tmatesoft.svn.core.wc2.SvnOperation.run(SvnOperation.java:291) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:777) at hudson.scm.subversion.CheckoutUpdater$1.perform(CheckoutUpdater.java:99) ... 16 more Caused by: svn: E175002: OPTIONS /svn/franciaflex-magalie/trunk failed at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:208) at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:154) at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:97) ... 35 more Caused by: org.tmatesoft.svn.core.SVNException: svn: E175002: OPTIONS request failed on '/svn/franciaflex-magalie/trunk' svn: E175002: unknown host at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64) at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:754) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:373) ... 34 more Caused by: svn: E175002: OPTIONS request failed on '/svn/franciaflex-magalie/trunk' at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:208) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:752) ... 35 more Caused by: svn: E175002: unknown host at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:208) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:496) ... 35 more Caused by: java.net.UnknownHostException: svn.forge.codelutin.com at java.net.InetAddress.getAllByName0(InetAddress.java:1243) at java.net.InetAddress.getAllByName(InetAddress.java:1155) at java.net.InetAddress.getAllByName(InetAddress.java:1091) at java.net.InetAddress.getByName(InetAddress.java:1041) at org.tmatesoft.svn.core.internal.util.SVNSocketFactory.createAddres(SVNSocketFactory.java:155) at org.tmatesoft.svn.core.internal.util.SVNSocketFactory.createPlainSocket(SVNSocketFactory.java:61) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.connect(HTTPConnection.java:270) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:435) ... 35 more

1 1

Build failed in Jenkins: magalie-eugene #12
by admin+hudson＠codelutin.com June 17, 2013

June 17, 2013

See <http://ci.nuiton.org/jenkins/job/magalie-eugene/12/> ------------------------------------------ Started by upstream project "nuiton-jpa" build number 16 originally caused by: Started by an SCM change Building on master in workspace <http://ci.nuiton.org/jenkins/job/magalie-eugene/ws/> Cleaning local Directory trunk Checking out http://svn.forge.codelutin.com/svn/franciaflex-magalie/branches/magalie-eug… at revision '2013-06-17T12:12:00.755 +0200' ERROR: Failed to check out http://svn.forge.codelutin.com/svn/franciaflex-magalie/branches/magalie-eug… org.tmatesoft.svn.core.SVNException: svn: E175002: OPTIONS /svn/franciaflex-magalie/branches/magalie-eugene failed at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:379) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:364) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:352) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.performHttpRequest(DAVConnection.java:708) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.exchangeCapabilities(DAVConnection.java:628) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.open(DAVConnection.java:103) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.openConnection(DAVRepository.java:1018) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.getLatestRevision(DAVRepository.java:180) at org.tmatesoft.svn.core.internal.wc16.SVNBasicDelegate.getRevisionNumber(SVNBasicDelegate.java:480) at org.tmatesoft.svn.core.internal.wc16.SVNBasicDelegate.getLocations(SVNBasicDelegate.java:833) at org.tmatesoft.svn.core.internal.wc16.SVNBasicDelegate.createRepository(SVNBasicDelegate.java:527) at org.tmatesoft.svn.core.internal.wc16.SVNUpdateClient16.doCheckout(SVNUpdateClient16.java:875) at org.tmatesoft.svn.core.internal.wc2.old.SvnOldCheckout.run(SvnOldCheckout.java:19) at org.tmatesoft.svn.core.internal.wc2.old.SvnOldCheckout.run(SvnOldCheckout.java:8) at org.tmatesoft.svn.core.internal.wc2.SvnOperationRunner.run(SvnOperationRunner.java:20) at org.tmatesoft.svn.core.wc2.SvnOperationFactory.run(SvnOperationFactory.java:1235) at org.tmatesoft.svn.core.wc2.SvnOperation.run(SvnOperation.java:291) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:777) at hudson.scm.subversion.CheckoutUpdater$1.perform(CheckoutUpdater.java:99) at hudson.scm.subversion.WorkspaceUpdater$UpdateTask.delegateTo(WorkspaceUpdater.java:153) at hudson.scm.SubversionSCM$CheckOutTask.perform(SubversionSCM.java:903) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:884) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:867) at hudson.FilePath.act(FilePath.java:905) at hudson.FilePath.act(FilePath.java:878) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:843) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:781) at hudson.model.AbstractProject.checkout(AbstractProject.java:1369) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:676) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:88) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:581) at hudson.model.Run.execute(Run.java:1576) at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:486) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:241) Caused by: svn: E175002: OPTIONS /svn/franciaflex-magalie/branches/magalie-eugene failed at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:208) at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:154) at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:97) ... 35 more Caused by: org.tmatesoft.svn.core.SVNException: svn: E175002: OPTIONS request failed on '/svn/franciaflex-magalie/branches/magalie-eugene' svn: E175002: unknown host at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64) at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:754) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:373) ... 34 more Caused by: svn: E175002: OPTIONS request failed on '/svn/franciaflex-magalie/branches/magalie-eugene' at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:208) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:752) ... 35 more Caused by: svn: E175002: unknown host at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:208) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:496) ... 35 more Caused by: java.net.UnknownHostException: svn.forge.codelutin.com at java.net.InetAddress.getAllByName0(InetAddress.java:1243) at java.net.InetAddress.getAllByName(InetAddress.java:1155) at java.net.InetAddress.getAllByName(InetAddress.java:1091) at java.net.InetAddress.getByName(InetAddress.java:1041) at org.tmatesoft.svn.core.internal.util.SVNSocketFactory.createAddres(SVNSocketFactory.java:155) at org.tmatesoft.svn.core.internal.util.SVNSocketFactory.createPlainSocket(SVNSocketFactory.java:61) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.connect(HTTPConnection.java:270) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:435) ... 35 more java.io.IOException: Failed to check out http://svn.forge.codelutin.com/svn/franciaflex-magalie/branches/magalie-eug… at hudson.scm.subversion.CheckoutUpdater$1.perform(CheckoutUpdater.java:110) at hudson.scm.subversion.WorkspaceUpdater$UpdateTask.delegateTo(WorkspaceUpdater.java:153) at hudson.scm.SubversionSCM$CheckOutTask.perform(SubversionSCM.java:903) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:884) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:867) at hudson.FilePath.act(FilePath.java:905) at hudson.FilePath.act(FilePath.java:878) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:843) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:781) at hudson.model.AbstractProject.checkout(AbstractProject.java:1369) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:676) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:88) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:581) at hudson.model.Run.execute(Run.java:1576) at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:486) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:241) Caused by: org.tmatesoft.svn.core.SVNException: svn: E175002: OPTIONS /svn/franciaflex-magalie/branches/magalie-eugene failed at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:379) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:364) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:352) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.performHttpRequest(DAVConnection.java:708) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.exchangeCapabilities(DAVConnection.java:628) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.open(DAVConnection.java:103) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.openConnection(DAVRepository.java:1018) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.getLatestRevision(DAVRepository.java:180) at org.tmatesoft.svn.core.internal.wc16.SVNBasicDelegate.getRevisionNumber(SVNBasicDelegate.java:480) at org.tmatesoft.svn.core.internal.wc16.SVNBasicDelegate.getLocations(SVNBasicDelegate.java:833) at org.tmatesoft.svn.core.internal.wc16.SVNBasicDelegate.createRepository(SVNBasicDelegate.java:527) at org.tmatesoft.svn.core.internal.wc16.SVNUpdateClient16.doCheckout(SVNUpdateClient16.java:875) at org.tmatesoft.svn.core.internal.wc2.old.SvnOldCheckout.run(SvnOldCheckout.java:19) at org.tmatesoft.svn.core.internal.wc2.old.SvnOldCheckout.run(SvnOldCheckout.java:8) at org.tmatesoft.svn.core.internal.wc2.SvnOperationRunner.run(SvnOperationRunner.java:20) at org.tmatesoft.svn.core.wc2.SvnOperationFactory.run(SvnOperationFactory.java:1235) at org.tmatesoft.svn.core.wc2.SvnOperation.run(SvnOperation.java:291) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doCheckout(SVNUpdateClient.java:777) at hudson.scm.subversion.CheckoutUpdater$1.perform(CheckoutUpdater.java:99) ... 16 more Caused by: svn: E175002: OPTIONS /svn/franciaflex-magalie/branches/magalie-eugene failed at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:208) at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:154) at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:97) ... 35 more Caused by: org.tmatesoft.svn.core.SVNException: svn: E175002: OPTIONS request failed on '/svn/franciaflex-magalie/branches/magalie-eugene' svn: E175002: unknown host at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64) at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:754) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:373) ... 34 more Caused by: svn: E175002: OPTIONS request failed on '/svn/franciaflex-magalie/branches/magalie-eugene' at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:208) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:752) ... 35 more Caused by: svn: E175002: unknown host at org.tmatesoft.svn.core.SVNErrorMessage.create(SVNErrorMessage.java:208) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:496) ... 35 more Caused by: java.net.UnknownHostException: svn.forge.codelutin.com at java.net.InetAddress.getAllByName0(InetAddress.java:1243) at java.net.InetAddress.getAllByName(InetAddress.java:1155) at java.net.InetAddress.getAllByName(InetAddress.java:1091) at java.net.InetAddress.getByName(InetAddress.java:1041) at org.tmatesoft.svn.core.internal.util.SVNSocketFactory.createAddres(SVNSocketFactory.java:155) at org.tmatesoft.svn.core.internal.util.SVNSocketFactory.createPlainSocket(SVNSocketFactory.java:61) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.connect(HTTPConnection.java:270) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection._request(HTTPConnection.java:435) ... 35 more

1 0

r246 - in trunk: . magalie-persistence magalie-services magalie-web
by bleny＠users.forge.codelutin.com June 12, 2013

June 12, 2013

Author: bleny Date: 2013-06-12 10:58:57 +0200 (Wed, 12 Jun 2013) New Revision: 246 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: applied mvn tidy:pom 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-06-10 10:20:31 UTC (rev 245) +++ trunk/magalie-persistence/pom.xml 2013-06-12 08:58:57 UTC (rev 246) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -10,6 +9,7 @@ </parent> <artifactId>magalie-persistence</artifactId> + <name>MagaLiE :: Persistence</name> <description>Couche d'accès à la base de données pour MagaLiE</description> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-06-10 10:20:31 UTC (rev 245) +++ trunk/magalie-services/pom.xml 2013-06-12 08:58:57 UTC (rev 246) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -10,6 +9,7 @@ </parent> <artifactId>magalie-services</artifactId> + <name>MagaLiE :: Services</name> <description>Services pour MagaLiE</description> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-06-10 10:20:31 UTC (rev 245) +++ trunk/magalie-web/pom.xml 2013-06-12 08:58:57 UTC (rev 246) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -11,11 +10,11 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie-web</artifactId> + <packaging>war</packaging> + <name>MagaLiE :: UI</name> <description>Interface graphique Struts2 pour MagaLiE</description> - <packaging>war</packaging> - <properties> <redmine.releaseFiles> target/${project.build.finalName}.war @@ -138,9 +137,7 @@ </dependencies> <build> - <finalName>magalie-${project.version}</finalName> - <pluginManagement> <plugins> <plugin> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-10 10:20:31 UTC (rev 245) +++ trunk/pom.xml 2013-06-12 08:58:57 UTC (rev 246) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -12,18 +11,12 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> <version>0.1-SNAPSHOT</version> + <packaging>pom</packaging> - <modules> - <module>magalie-persistence</module> - <module>magalie-services</module> - <module>magalie-web</module> - </modules> - <name>MagaLiE</name> <description>Magasinage libre et efficace</description> - <inceptionYear>2013</inceptionYear> <url>http://maven-site.forge.codelutin.com/franciaflex-magalie/</url> - + <inceptionYear>2013</inceptionYear> <licenses> <license> <name>GNU Affero General Public License version 3</name> @@ -92,8 +85,24 @@ </developer> </developers> - <packaging>pom</packaging> + <modules> + <module>magalie-persistence</module> + <module>magalie-services</module> + <module>magalie-web</module> + </modules> + <scm> + <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> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + <properties>  @@ -301,7 +310,12 @@ </dependencyManagement> <build> - + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <pluginManagement> <plugins> @@ -330,28 +344,8 @@ </plugins> </pluginManagement> - - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> </build> - <scm> - <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> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> - <reporting>  @@ -428,5 +422,4 @@ </profile> </profiles> - -</project> \ No newline at end of file +</project>

1 0