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

Build failed in Jenkins: franciaflex-magalie-nightly #1
by admin+ci-codelutin.com＠codelutin.com 17 Feb '14

17 Feb '14

See <http://ci.codelutin.com/jenkins/job/franciaflex-magalie-nightly/1/> ------------------------------------------ [...truncated 125 lines...] A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserDao.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierJpaDao.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleJpaDao.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/WarehouseDao.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationJpaDao.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationDao.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Articles.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/DeliveredRequestedArticles.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Warehouse.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Supplier.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StoredArticle.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedArticle.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Company.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedArticle.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Building.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java A magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagalieOracleHibernateDialect.java A magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java A magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieTechnicalException.java A magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieConfigOption.java A magalie-persistence/src/main/resources A magalie-persistence/src/main/resources/hibernate-oracle.properties A magalie-persistence/src/main/resources/META-INF A magalie-persistence/src/main/resources/META-INF/persistence.xml A magalie-persistence/src/main/resources/magalie.properties A magalie-persistence/src/main/xmi AU magalie-persistence/src/main/xmi/magalie.zargo AU magalie-persistence/src/main/xmi/magalie.properties A magalie-persistence/pom.xml A magalie-persistence/README.txt A changelog.txt A magalie-web A magalie-web/LICENSE.txt A magalie-web/changelog.txt A magalie-web/src A magalie-web/src/test A magalie-web/src/test/java A magalie-web/src/test/resources A magalie-web/src/license A magalie-web/src/license/THIRD-PARTY.properties A magalie-web/src/main A magalie-web/src/main/java A magalie-web/src/main/java/com A magalie-web/src/main/java/com/franciaflex A magalie-web/src/main/java/com/franciaflex/magalie A magalie-web/src/main/java/com/franciaflex/magalie/web A magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java A magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java A magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.java A magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java A magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java A magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java A magalie-web/src/main/java/com/franciaflex/magalie/web/Activity.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action A magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferLocationAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseCompanyAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/IndexAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/SaveRealTimeStorageMovementJsonAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReportAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/GetRealTimeStorageMovementTaskJsonAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/SimpleWithdrawItemAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareWithdrawItemAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java A magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java A magalie-web/src/main/resources A magalie-web/src/main/resources/struts.properties A magalie-web/src/main/resources/struts.xml A magalie-web/src/main/resources/xwork-conversion.properties A magalie-web/src/main/resources/log4j.properties A magalie-web/src/main/webapp A magalie-web/src/main/webapp/WEB-INF A magalie-web/src/main/webapp/WEB-INF/decorators.xml A magalie-web/src/main/webapp/WEB-INF/decorators A magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp A magalie-web/src/main/webapp/WEB-INF/content A magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp A magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp A magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp A magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp A magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp A magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp A magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp A magalie-web/src/main/webapp/WEB-INF/content/report.jsp A magalie-web/src/main/webapp/WEB-INF/content/prepare-withdraw-item-input.jsp A magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp A magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp A magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp A magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp A magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp A magalie-web/src/main/webapp/WEB-INF/web.xml A magalie-web/src/main/webapp/css A magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css A magalie-web/src/main/webapp/css/magalie.css A magalie-web/src/main/webapp/css/magalie-ck3x.css A magalie-web/src/main/webapp/js A magalie-web/src/main/webapp/js/magalie.js A magalie-web/src/main/webapp/js/receive-article-input.js A magalie-web/src/main/webapp/js/withdraw-item-input.js A magalie-web/pom.xml A magalie-web/README.txt A pom.xml A README.txt U . At revision 421 Parsing POMs Discovered a new module com.franciaflex:magalie MagaLiE Discovered a new module com.franciaflex:magalie-persistence MagaLiE :: Persistence Discovered a new module com.franciaflex:magalie-services MagaLiE :: Services Discovered a new module com.franciaflex:magalie-web MagaLiE :: UI Modules changed, recalculating dependency graph [trunk] $ /opt/jdk7/bin/java -Dsettings.security=/var/local/forge/data/codelutin.com/maven/settings-security.xml -Djava.awt.headless=true -cp /var/local/forge/data/codelutin.com/jenkins/plugins/maven-plugin/WEB-INF/lib/maven31-agent-1.4.jar:/opt/maven3/boot/plexus-classworlds-2.5.1.jar:/opt/maven3/conf/logging jenkins.maven3.agent.Maven31Main /opt/maven3 /var/local/forge/exec/tomcat-codelutin.com/webapps/jenkins/WEB-INF/lib/remoting-2.33.jar /var/local/forge/data/codelutin.com/jenkins/plugins/maven-plugin/WEB-INF/lib/maven31-interceptor-1.4.jar /var/local/forge/data/codelutin.com/jenkins/plugins/maven-plugin/WEB-INF/lib/maven3-interceptor-commons-1.4.jar 44651 <===[JENKINS REMOTING CAPACITY]===> channel started log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. Executing Maven: -B -f <http://ci.codelutin.com/jenkins/job/franciaflex-magalie-nightly/ws/trunk/po…> -s /var/local/forge/data/codelutin.com/maven/settings.xml -e -U clean verify -DperformRelease [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Reactor Build Order: [INFO] [INFO] MagaLiE [INFO] MagaLiE :: Persistence [INFO] MagaLiE :: Services [INFO] MagaLiE :: UI [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building MagaLiE 1.0.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ magalie --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ magalie --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ magalie --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ magalie --- [INFO] Exporting server [redmine-forge.codelutin.com] username in ${redmine.username} [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.5:update-project-license (attach-licenses) @ magalie --- [INFO] Will create or update license file [agpl_v3] to <http://ci.codelutin.com/jenkins/job/franciaflex-magalie-nightly/ws/trunk/LI…> [INFO] [INFO] --- license-maven-plugin:1.5:add-third-party (attach-licenses) @ magalie --- [WARNING] The goal is skip due to packaging 'pom' [INFO] [INFO] --- license-maven-plugin:1.5:update-file-header (update-file-header) @ magalie --- [WARNING] No file to scan. [INFO] [INFO] [INFO] --- animal-sniffer-maven-plugin:1.9:check (default) @ magalie --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java16:1.1 [INFO] [INFO] --- jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) @ magalie --- [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] MagaLiE ........................................... FAILURE [4.677s] [INFO] MagaLiE :: Persistence ............................ SKIPPED [INFO] MagaLiE :: Services ............................... SKIPPED [INFO] MagaLiE :: UI ..................................... SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 5.813s [INFO] Finished at: Sat Feb 15 02:22:31 CET 2014 [JENKINS] Archiving disabled [INFO] Final Memory: 33M/448M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.nuiton.jredmine:jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) on project magalie: the version '1.0.1' could not be retrieve from redmine server. -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.nuiton.jredmine:jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) on project magalie: the version '1.0.1' could not be retrieve from redmine server. at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:216) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) Caused by: org.apache.maven.plugin.MojoExecutionException: the version '1.0.1' could not be retrieve from redmine server. at org.nuiton.jredmine.plugin.AbstractRedmineMojo.failIfSafe(AbstractRedmineMojo.java:396) at org.nuiton.jredmine.plugin.AbstractRedmineMojoWithProjectAndVersion.init(AbstractRedmineMojoWithProjectAndVersion.java:119) at org.nuiton.jredmine.plugin.GenerateChangesMojo.init(GenerateChangesMojo.java:348) at org.nuiton.plugin.AbstractPlugin.execute(AbstractPlugin.java:106) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException Sending e-mails to: franciaflex-magalie-commits(a)list.forge.codelutin.com channel stopped Skipping sonar analysis due to bad build status FAILURE

1 1

Build failed in Jenkins: franciaflex-magalie-nightly » MagaLiE #1
by admin+ci-codelutin.com＠codelutin.com 17 Feb '14

17 Feb '14

See <http://ci.codelutin.com/jenkins/job/franciaflex-magalie-nightly/com.francia…> ------------------------------------------ <===[JENKINS REMOTING CAPACITY]===> channel started log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. Executing Maven: -B -f <http://ci.codelutin.com/jenkins/job/franciaflex-magalie-nightly/com.francia…> -s /var/local/forge/data/codelutin.com/maven/settings.xml -e -U clean verify -DperformRelease [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Reactor Build Order: [INFO] [INFO] MagaLiE [INFO] MagaLiE :: Persistence [INFO] MagaLiE :: Services [INFO] MagaLiE :: UI [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building MagaLiE 1.0.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ magalie --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ magalie --- [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ magalie --- [INFO] [INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ magalie --- [INFO] Exporting server [redmine-forge.codelutin.com] username in ${redmine.username} [INFO] Exporting server [redmine-forge.codelutin.com] privateKey in ${redmine.apiKey} [INFO] [INFO] --- license-maven-plugin:1.5:update-project-license (attach-licenses) @ magalie --- [INFO] Will create or update license file [agpl_v3] to <http://ci.codelutin.com/jenkins/job/franciaflex-magalie-nightly/com.francia…> [INFO] [INFO] --- license-maven-plugin:1.5:add-third-party (attach-licenses) @ magalie --- [WARNING] The goal is skip due to packaging 'pom' [INFO] [INFO] --- license-maven-plugin:1.5:update-file-header (update-file-header) @ magalie --- [WARNING] No file to scan. [INFO] [INFO] [INFO] --- animal-sniffer-maven-plugin:1.9:check (default) @ magalie --- [INFO] Checking unresolved references to org.codehaus.mojo.signature:java16:1.1 [INFO] [INFO] --- jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) @ magalie --- [JENKINS] Archiving disabled

1 1

[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