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

[ANN] - MagaLiE 1.0 released
by forge.codelutin.com Release Notification 11 Sep '13

11 Sep '13

The MagaLiE team is pleased to announce the magalie-1.0 release! Magasinage libre et efficace Documentation of the project can be found here: http://maven-site.forge.codelutin.com/franciaflex-magalie/ Changes ------- Changes in this version include: New features: o n°41 : trier les listes des articles d'un fournisseurs selon un critère de priorité définit en base Issue: 3203. Thanks to Brendan Le Ny. Resolved by bleny. o n°40 : modifier la règle de passage à l'état COMPLETE des listes à servir Issue: 3169. Thanks to Brendan Le Ny. Resolved by bleny. Fixed Bugs: o Le raccourci pour la touche « suivant » ne fonctionne pas dans les transferts de stocks Issue: 3119. Thanks to Brendan Le Ny. Resolved by bernard.revol. Changes: o Mise à jour des dépendances Issue: 3150. Thanks to Brendan Le Ny. Resolved by bleny. o Configuration des logs pour la production Issue: 3151. Thanks to Brendan Le Ny. Resolved by bleny. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/franciaflex-magalie/files * magalie-1.0.war - http://forge.codelutin.com/attachments/download/1073 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -MagaLiE team

1 0

r421 - in trunk: . magalie-persistence magalie-services magalie-web
by maven-release＠users.forge.codelutin.com 11 Sep '13

11 Sep '13

Author: maven-release Date: 2013-09-11 18:17:45 +0200 (Wed, 11 Sep 2013) New Revision: 421 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/magalie-persistence/pom.xml trunk/magalie-services/pom.xml trunk/magalie-web/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-09-11 16:17:37 UTC (rev 420) +++ trunk/magalie-persistence/pom.xml 2013-09-11 16:17:45 UTC (rev 421) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0</version> + <version>1.0.1-SNAPSHOT</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-09-11 16:17:37 UTC (rev 420) +++ trunk/magalie-services/pom.xml 2013-09-11 16:17:45 UTC (rev 421) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0</version> + <version>1.0.1-SNAPSHOT</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-09-11 16:17:37 UTC (rev 420) +++ trunk/magalie-web/pom.xml 2013-09-11 16:17:45 UTC (rev 421) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0</version> + <version>1.0.1-SNAPSHOT</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-11 16:17:37 UTC (rev 420) +++ trunk/pom.xml 2013-09-11 16:17:45 UTC (rev 421) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0</version> + <version>1.0.1-SNAPSHOT</version> <packaging>pom</packaging> <name>MagaLiE</name> @@ -92,9 +92,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/tags/fra…</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/trunk</url> </scm> <distributionManagement> <site>

1 0

r420 - in tags: . franciaflex-magalie-1.0
by maven-release＠users.forge.codelutin.com 11 Sep '13

11 Sep '13

Author: maven-release Date: 2013-09-11 18:17:37 +0200 (Wed, 11 Sep 2013) New Revision: 420 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] copy for tag franciaflex-magalie-1.0 Added: tags/franciaflex-magalie-1.0/ Property changes on: tags/franciaflex-magalie-1.0 ___________________________________________________________________ Added: svn:ignore + target *.iml *.ipr .idea *~ Added: svn:mergeinfo + /branches/magalie-eugene:191-224

1 0

r419 - in trunk: . magalie-persistence magalie-services magalie-web
by maven-release＠users.forge.codelutin.com 11 Sep '13

11 Sep '13

Author: maven-release Date: 2013-09-11 18:17:29 +0200 (Wed, 11 Sep 2013) New Revision: 419 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] prepare release franciaflex-magalie-1.0 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-09-11 16:15:26 UTC (rev 418) +++ trunk/magalie-persistence/pom.xml 2013-09-11 16:17:29 UTC (rev 419) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-09-11 16:15:26 UTC (rev 418) +++ trunk/magalie-services/pom.xml 2013-09-11 16:17:29 UTC (rev 419) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-09-11 16:15:26 UTC (rev 418) +++ trunk/magalie-web/pom.xml 2013-09-11 16:17:29 UTC (rev 419) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-11 16:15:26 UTC (rev 418) +++ trunk/pom.xml 2013-09-11 16:17:29 UTC (rev 419) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0</version> <packaging>pom</packaging> <name>MagaLiE</name> @@ -92,9 +92,9 @@ </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> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/tags/fra…</url> </scm> <distributionManagement> <site>

1 0

r418 - trunk
by bleny＠users.forge.codelutin.com 11 Sep '13

11 Sep '13

Author: bleny Date: 2013-09-11 18:15:26 +0200 (Wed, 11 Sep 2013) New Revision: 418 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: back to h2Version 1.3.172, pom for 1.3.173 miss license Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-11 16:09:51 UTC (rev 417) +++ trunk/pom.xml 2013-09-11 16:15:26 UTC (rev 418) @@ -113,7 +113,7 @@ <nuitonJpaVersion>1.0-rc-1</nuitonJpaVersion> <nuitonWebVersion>1.14</nuitonWebVersion> - <h2Version>1.3.173</h2Version> + <h2Version>1.3.172</h2Version> <struts2Version>2.3.15.1</struts2Version> <jqueryPluginVersion>3.6.1</jqueryPluginVersion> <bootstrapPluginVersion>1.6.1</bootstrapPluginVersion>

1 0

r417 - in trunk: . magalie-persistence magalie-services magalie-web
by bleny＠users.forge.codelutin.com 11 Sep '13

11 Sep '13

Author: bleny Date: 2013-09-11 18:09:51 +0200 (Wed, 11 Sep 2013) New Revision: 417 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: set version to 1.0-SNAPSHOT as in roadmap 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-09-11 15:58:28 UTC (rev 416) +++ trunk/magalie-persistence/pom.xml 2013-09-11 16:09:51 UTC (rev 417) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-7-SNAPSHOT</version> + <version>1.0-SNAPSHOT</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-09-11 15:58:28 UTC (rev 416) +++ trunk/magalie-services/pom.xml 2013-09-11 16:09:51 UTC (rev 417) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-7-SNAPSHOT</version> + <version>1.0-SNAPSHOT</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-09-11 15:58:28 UTC (rev 416) +++ trunk/magalie-web/pom.xml 2013-09-11 16:09:51 UTC (rev 417) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-7-SNAPSHOT</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-11 15:58:28 UTC (rev 416) +++ trunk/pom.xml 2013-09-11 16:09:51 UTC (rev 417) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-7-SNAPSHOT</version> + <version>1.0-SNAPSHOT</version> <packaging>pom</packaging> <name>MagaLiE</name>

1 0

r416 - 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 magalie-services/src/main/resources magalie-services/src/test/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 11 Sep '13

11 Sep '13

Author: bleny Date: 2013-09-11 17:58:28 +0200 (Wed, 11 Sep 2013) New Revision: 416 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3203 sort articles in reception by receptionPriority Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java trunk/magalie-persistence/src/main/xmi/magalie.zargo trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-09-11 15:57:42 UTC (rev 415) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-09-11 15:58:28 UTC (rev 416) @@ -40,6 +40,14 @@ public class StoredArticles { + public static Ordering<StoredArticle> receptionPriorityComparator() { + return Ordering.natural().onResultOf(getReceptionPriority()); + } + + public static Function<StoredArticle, String> getReceptionPriority() { + return new GetReceptionPriority(); + } + /** * Put fixed sites for given article first, or ignore it according to the value of * {@link com.franciaflex.magalie.persistence.entity.Article#isFixedLocationsFirst()} @@ -171,4 +179,12 @@ return Predicates.compose(Locations.barcodeEquals(originLocationBarcode), getLocationFunction()); } + protected static class GetReceptionPriority implements Function<StoredArticle, String> { + + @Override + public String apply(StoredArticle input) { + return input.getReceptionPriority(); + } + } + } Modified: trunk/magalie-persistence/src/main/xmi/magalie.zargo =================================================================== (Binary files differ) 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-09-11 15:57:42 UTC (rev 415) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-09-11 15:58:28 UTC (rev 416) @@ -84,7 +84,7 @@ public SuppliersToReceive getReceivedSuppliers(Building building) { - List<StoredArticle> allReceivedArticles = getReceivedArticles(building, null); + Set<StoredArticle> allReceivedArticles = getReceivedArticles(building, null); Iterable<Supplier> suppliers = Sets.newHashSet( // to prevent multiple occurrence of the same supplier @@ -100,7 +100,7 @@ } - public List<StoredArticle> getReceivedArticles(Building building, String supplierId) { + public Set<StoredArticle> getReceivedArticles(Building building, String supplierId) { JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); @@ -133,15 +133,18 @@ receivedArticles = articleStorageService.computeActualQuantities(receivedArticles, allStorageMovementsInReception); - List<StoredArticle> result = Lists.newArrayList(receivedArticles); + Set<StoredArticle> storedArticlesByPriority = + Sets.newTreeSet(StoredArticles.receptionPriorityComparator()); + Iterables.addAll(storedArticlesByPriority, receivedArticles); + if (log.isTraceEnabled()) { - log.trace(result.size() + " stored articles found in reception for building " + log.trace(storedArticlesByPriority.size() + " stored articles found in reception for building " + building + " and supplierId " + supplierId + ": " - + result); + + storedArticlesByPriority); } - return result; + return storedArticlesByPriority; } Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-09-11 15:57:42 UTC (rev 415) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-09-11 15:58:28 UTC (rev 416) @@ -515,6 +515,7 @@ location: *locationRecU01 quantity: 30 batchCode: lot 1 + receptionPriority: BBB222 storedArticle6: &storedArticle6 !stored-article @@ -579,6 +580,7 @@ location: *locationRecU01 quantity: 10 batchCode: lot 2 + receptionPriority: AAA111 storedArticles: - *storedArticle1 Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-09-11 15:57:42 UTC (rev 415) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-09-11 15:58:28 UTC (rev 416) @@ -112,12 +112,12 @@ @Test public void testGetArticlesForSupplier() { - List<StoredArticle> receivedArticles = + Set<StoredArticle> receivedArticles = service.getReceivedArticles(building, supplier.getId()); Assert.assertEquals(1, receivedArticles.size()); - Assert.assertEquals(article, receivedArticles.get(0).getArticle()); + Assert.assertEquals(article, Iterables.get(receivedArticles, 0).getArticle()); receivedArticles = service.getReceivedArticles(building, null); // null = all suppliers @@ -128,7 +128,7 @@ @Test public void testGetReceptionTask() { - List<StoredArticle> receivedArticles = + Set<StoredArticle> receivedArticles = service.getReceivedArticles(building, supplier.getId()); StoredArticle receivedArticle = @@ -180,7 +180,7 @@ @Test public void testConfirmReception() { - List<StoredArticle> receivedArticles = + Set<StoredArticle> receivedArticles = service.getReceivedArticles(building, supplier.getId()); StoredArticle storedArticle = @@ -210,7 +210,7 @@ testConfirmReception(); - List<StoredArticle> receivedArticles = + Set<StoredArticle> receivedArticles = service.getReceivedArticles(building, supplier.getId()); Assert.assertTrue(receivedArticles.isEmpty()); @@ -341,7 +341,7 @@ transaction.commit(); - List<StoredArticle> receivedArticles = + Set<StoredArticle> receivedArticles = service.getReceivedArticles(building, supplier.getId()); StoredArticle receivedArticle = @@ -397,4 +397,14 @@ // just check that there is no exception, user can check is order is OK } + @Test + public void testPriorities() { + + Set<StoredArticle> receivedArticles = + service.getReceivedArticles(building, null); + + Assert.assertEquals("AAA111", Iterables.get(receivedArticles, 0).getReceptionPriority()); + Assert.assertEquals("BBB222", Iterables.get(receivedArticles, 1).getReceptionPriority()); + + } } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java 2013-09-11 15:57:42 UTC (rev 415) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java 2013-09-11 15:58:28 UTC (rev 416) @@ -32,7 +32,7 @@ import com.franciaflex.magalie.web.MagalieSession; import com.google.common.base.Strings; -import java.util.List; +import java.util.Set; public class PrepareArticleReceptionAction extends MagalieActionSupport { @@ -42,7 +42,7 @@ protected MagalieSession session; - protected List<StoredArticle> receivedArticles; + protected Set<StoredArticle> receivedArticles; protected SuppliersToReceive suppliersToReceive; @@ -98,7 +98,7 @@ return suppliersToReceive; } - public List<StoredArticle> getReceivedArticles() { + public Set<StoredArticle> getReceivedArticles() { return receivedArticles; }

1 0

r415 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie
by bleny＠users.forge.codelutin.com 11 Sep '13

11 Sep '13

Author: bleny Date: 2013-09-11 17:57:42 +0200 (Wed, 11 Sep 2013) New Revision: 415 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #3150 change imports due to change in nuiton-config Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-09-11 15:36:18 UTC (rev 414) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-09-11 15:57:42 UTC (rev 415) @@ -29,8 +29,8 @@ 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 org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; import java.io.IOException; import java.io.InputStream; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java 2013-09-11 15:36:18 UTC (rev 414) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java 2013-09-11 15:57:42 UTC (rev 415) @@ -23,7 +23,7 @@ * #L% */ -import org.nuiton.util.config.ConfigOptionDef; +import org.nuiton.config.ConfigOptionDef; /** * @author bleny

1 0

r414 - trunk/magalie-web/src/main/resources
by bleny＠users.forge.codelutin.com 11 Sep '13

11 Sep '13

Author: bleny Date: 2013-09-11 17:36:18 +0200 (Wed, 11 Sep 2013) New Revision: 414 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3151 conf logs 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-09-11 14:22:08 UTC (rev 413) +++ trunk/magalie-web/src/main/resources/log4j.properties 2013-09-11 15:36:18 UTC (rev 414) @@ -20,11 +20,11 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -log4j.rootCategory=WARN, console, file +log4j.rootCategory=WARN, file -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n +#log4j.appender.console=org.apache.log4j.ConsoleAppender +#log4j.appender.console.layout=org.apache.log4j.PatternLayout +#log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n # FileAppender : need to have magalie.log.dir in system properties at application startup log4j.appender.file=org.apache.log4j.RollingFileAppender @@ -35,11 +35,11 @@ log4j.appender.file.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n # global level -log4j.logger.com.franciaflex.magalie=TRACE +# log4j.logger.com.franciaflex.magalie=WARN ### persistence level # log4j.logger.org.nuiton.jpa=TRACE -log4j.logger.oracle.jdbc.driver=TRACE +# log4j.logger.oracle.jdbc.driver=TRACE ### services level # log4j.logger.com.franciaflex.magalie.services.service.RequestedArticleService=TRACE

1 0

r413 - in trunk: . magalie-web
by bleny＠users.forge.codelutin.com 11 Sep '13

11 Sep '13

Author: bleny Date: 2013-09-11 16:22:08 +0200 (Wed, 11 Sep 2013) New Revision: 413 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3150 update dependencies Modified: trunk/magalie-web/pom.xml trunk/pom.xml Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-09-02 16:07:15 UTC (rev 412) +++ trunk/magalie-web/pom.xml 2013-09-11 14:22:08 UTC (rev 413) @@ -25,6 +25,8 @@ <defaultWebContextPath>magalie</defaultWebContextPath> <defaultSiteUrl>http://localhost:8080/${defaultWebContextPath}</defaultSiteUrl> <defaultLogDir>${basedir}/target</defaultLogDir> + + <skipPostRelease>false</skipPostRelease> </properties> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-02 16:07:15 UTC (rev 412) +++ trunk/pom.xml 2013-09-11 14:22:08 UTC (rev 413) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>4.0</version> </parent> <groupId>com.franciaflex</groupId> @@ -113,10 +113,9 @@ <nuitonJpaVersion>1.0-rc-1</nuitonJpaVersion> <nuitonWebVersion>1.14</nuitonWebVersion> - <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> - <h2Version>1.3.172</h2Version> - <struts2Version>2.3.14.2</struts2Version> - <jqueryPluginVersion>3.6.0</jqueryPluginVersion> + <h2Version>1.3.173</h2Version> + <struts2Version>2.3.15.1</struts2Version> + <jqueryPluginVersion>3.6.1</jqueryPluginVersion> <bootstrapPluginVersion>1.6.1</bootstrapPluginVersion> <shiroVersion>1.2.1</shiroVersion> <slf4jVersion>1.7.5</slf4jVersion> @@ -154,13 +153,13 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>2.7.1</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>3.0-alpha-1</version> </dependency> <dependency>

1 0