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

r333 - in trunk: magalie-persistence magalie-persistence/license magalie-services magalie-services/license magalie-web magalie-web/license
by bleny＠users.forge.codelutin.com 23 Jul '13

23 Jul '13

Author: bleny Date: 2013-07-23 19:18:42 +0200 (Tue, 23 Jul 2013) New Revision: 333 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add missing THIRD-PARTY file Added: trunk/magalie-persistence/license/ trunk/magalie-persistence/license/THIRD-PARTY.properties trunk/magalie-services/license/ trunk/magalie-services/license/THIRD-PARTY.properties trunk/magalie-web/license/ trunk/magalie-web/license/THIRD-PARTY.properties Added: trunk/magalie-persistence/license/THIRD-PARTY.properties =================================================================== --- trunk/magalie-persistence/license/THIRD-PARTY.properties (rev 0) +++ trunk/magalie-persistence/license/THIRD-PARTY.properties 2013-07-23 17:18:42 UTC (rev 333) @@ -0,0 +1,32 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License 2.0 +# - BSD License +# - BSD-style license +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - GNU Affero General Public License version 3 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License, version 2.1 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MPL 1.1 +# - New BSD License +# - The Apache Software License, Version 1.1 +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue Jul 23 19:15:53 CEST 2013 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +javassist--javassist--3.11.0.GA=The Apache Software License, Version 2.0 +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +oro--oro--2.0.8=The Apache Software License, Version 2.0 Added: trunk/magalie-services/license/THIRD-PARTY.properties =================================================================== --- trunk/magalie-services/license/THIRD-PARTY.properties (rev 0) +++ trunk/magalie-services/license/THIRD-PARTY.properties 2013-07-23 17:18:42 UTC (rev 333) @@ -0,0 +1,32 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License 2.0 +# - BSD License +# - BSD-style license +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - GNU Affero General Public License version 3 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License, version 2.1 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MPL 1.1 +# - New BSD License +# - The Apache Software License, Version 1.1 +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue Jul 23 19:15:53 CEST 2013 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +javassist--javassist--3.11.0.GA=The Apache Software License, Version 2.0 +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +oro--oro--2.0.8=The Apache Software License, Version 2.0 Added: trunk/magalie-web/license/THIRD-PARTY.properties =================================================================== --- trunk/magalie-web/license/THIRD-PARTY.properties (rev 0) +++ trunk/magalie-web/license/THIRD-PARTY.properties 2013-07-23 17:18:42 UTC (rev 333) @@ -0,0 +1,32 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License 2.0 +# - BSD License +# - BSD-style license +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - GNU Affero General Public License version 3 +# - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License, version 2.1 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MPL 1.1 +# - New BSD License +# - The Apache Software License, Version 1.1 +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue Jul 23 19:15:53 CEST 2013 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +javassist--javassist--3.11.0.GA=The Apache Software License, Version 2.0 +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +oro--oro--2.0.8=The Apache Software License, Version 2.0

1 0

r332 - in trunk: . magalie-persistence magalie-services magalie-web
by maven-release＠users.forge.codelutin.com 23 Jul '13

23 Jul '13

Author: maven-release Date: 2013-07-23 18:53:12 +0200 (Tue, 23 Jul 2013) New Revision: 332 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-07-23 16:53:04 UTC (rev 331) +++ trunk/magalie-persistence/pom.xml 2013-07-23 16:53:12 UTC (rev 332) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-1</version> + <version>1.0-rc-2-SNAPSHOT</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-07-23 16:53:04 UTC (rev 331) +++ trunk/magalie-services/pom.xml 2013-07-23 16:53:12 UTC (rev 332) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-1</version> + <version>1.0-rc-2-SNAPSHOT</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-07-23 16:53:04 UTC (rev 331) +++ trunk/magalie-web/pom.xml 2013-07-23 16:53:12 UTC (rev 332) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-1</version> + <version>1.0-rc-2-SNAPSHOT</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-23 16:53:04 UTC (rev 331) +++ trunk/pom.xml 2013-07-23 16:53:12 UTC (rev 332) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-1</version> + <version>1.0-rc-2-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

r331 - in tags: . franciaflex-magalie-1.0-rc-1
by maven-release＠users.forge.codelutin.com 23 Jul '13

23 Jul '13

Author: maven-release Date: 2013-07-23 18:53:04 +0200 (Tue, 23 Jul 2013) New Revision: 331 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] copy for tag franciaflex-magalie-1.0-rc-1 Added: tags/franciaflex-magalie-1.0-rc-1/ Property changes on: tags/franciaflex-magalie-1.0-rc-1 ___________________________________________________________________ Added: svn:ignore + target *.iml *.ipr .idea *~ Added: svn:mergeinfo + /branches/magalie-eugene:191-224

1 0

r330 - in trunk: . magalie-persistence magalie-services magalie-web
by maven-release＠users.forge.codelutin.com 23 Jul '13

23 Jul '13

Author: maven-release Date: 2013-07-23 18:52:54 +0200 (Tue, 23 Jul 2013) New Revision: 330 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] prepare release franciaflex-magalie-1.0-rc-1 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-07-23 16:43:27 UTC (rev 329) +++ trunk/magalie-persistence/pom.xml 2013-07-23 16:52:54 UTC (rev 330) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-1-SNAPSHOT</version> + <version>1.0-rc-1</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-07-23 16:43:27 UTC (rev 329) +++ trunk/magalie-services/pom.xml 2013-07-23 16:52:54 UTC (rev 330) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-1-SNAPSHOT</version> + <version>1.0-rc-1</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-07-23 16:43:27 UTC (rev 329) +++ trunk/magalie-web/pom.xml 2013-07-23 16:52:54 UTC (rev 330) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-1-SNAPSHOT</version> + <version>1.0-rc-1</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-23 16:43:27 UTC (rev 329) +++ trunk/pom.xml 2013-07-23 16:52:54 UTC (rev 330) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-1-SNAPSHOT</version> + <version>1.0-rc-1</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

r329 - trunk
by bleny＠users.forge.codelutin.com 23 Jul '13

23 Jul '13

Author: bleny Date: 2013-07-23 18:43:27 +0200 (Tue, 23 Jul 2013) New Revision: 329 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: use stable eugeune version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-23 16:41:25 UTC (rev 328) +++ trunk/pom.xml 2013-07-23 16:43:27 UTC (rev 329) @@ -125,7 +125,7 @@ <seleniumVersion>2.28.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <eugeneVersion>2.6.4-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.7</eugeneVersion>  <license.licenseName>agpl_v3</license.licenseName>

1 0

r328 - trunk
by bleny＠users.forge.codelutin.com 23 Jul '13

23 Jul '13

Author: bleny Date: 2013-07-23 18:41:25 +0200 (Tue, 23 Jul 2013) New Revision: 328 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: use stable nuiton-jpa Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-23 16:41:08 UTC (rev 327) +++ trunk/pom.xml 2013-07-23 16:41:25 UTC (rev 328) @@ -110,7 +110,7 @@ <projectId>franciaflex-magalie</projectId>  - <nuitonJpaVersion>1.0-SNAPSHOT</nuitonJpaVersion> + <nuitonJpaVersion>1.0-rc-1</nuitonJpaVersion> <nuitonWebVersion>1.14</nuitonWebVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> @@ -371,31 +371,6 @@ <value>true</value> </property> </activation> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${projectInfoReportsPluginVersion}</version> - <reportSets> - <reportSet> - - <reports> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependency-convergence</report> - <report>dependency-management</report> - </reports> - </reportSet> - </reportSets> - </plugin> - </plugins> - </reporting> - </profile>

1 0

r327 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web
by bleny＠users.forge.codelutin.com 23 Jul '13

23 Jul '13

Author: bleny Date: 2013-07-23 18:41:08 +0200 (Tue, 23 Jul 2013) New Revision: 327 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove compile dep by inlining constant Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-07-23 15:54:03 UTC (rev 326) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-07-23 16:41:08 UTC (rev 327) @@ -38,7 +38,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.struts2.StrutsStatics; import org.nuiton.util.beans.BeanUtil; import org.nuiton.web.filter.JpaTransactionFilter; @@ -211,10 +210,12 @@ protected MagalieServiceContext newServiceContext(ActionInvocation invocation) { + final String HTTP_REQUEST_KEY = "com.opensymphony.xwork2.dispatcher.HttpServletRequest"; // StrutsStatics.HTTP_REQUEST; + EntityManager entityManager = (EntityManager) ((HttpServletRequest) invocation .getInvocationContext() - .get(StrutsStatics.HTTP_REQUEST)) + .get(HTTP_REQUEST_KEY)) .getAttribute(JpaTransactionFilter.JPA_TRANSACTION_REQUEST_ATTRIBUTE); MagalieApplicationContext magalieApplicationContext = getMagalieApplicationContext(invocation);

1 0

r326 - in trunk: . magalie-persistence magalie-services magalie-web
by bleny＠users.forge.codelutin.com 23 Jul '13

23 Jul '13

Author: bleny Date: 2013-07-23 17:54:03 +0200 (Tue, 23 Jul 2013) New Revision: 326 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: update dependencies for release 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-07-23 15:23:52 UTC (rev 325) +++ trunk/magalie-persistence/pom.xml 2013-07-23 15:54:03 UTC (rev 326) @@ -56,8 +56,8 @@ </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </dependency> <dependency> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-07-23 15:23:52 UTC (rev 325) +++ trunk/magalie-services/pom.xml 2013-07-23 15:54:03 UTC (rev 326) @@ -61,11 +61,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-07-23 15:23:52 UTC (rev 325) +++ trunk/magalie-web/pom.xml 2013-07-23 15:54:03 UTC (rev 326) @@ -42,6 +42,11 @@ </dependency> <dependency> + <groupId>org.nuiton.jpa</groupId> + <artifactId>nuiton-jpa-api</artifactId> + </dependency> + + <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.0-api</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-23 15:23:52 UTC (rev 325) +++ trunk/pom.xml 2013-07-23 15:54:03 UTC (rev 326) @@ -264,6 +264,7 @@ <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> <version>${struts2Version}</version> + <scope>runtime</scope> </dependency> <dependency>

1 0

r325 - trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 23 Jul '13

23 Jul '13

Author: bleny Date: 2013-07-23 17:23:52 +0200 (Tue, 23 Jul 2013) New Revision: 325 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add some logs on confirmation for RequestedArticleService Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-07-23 15:23:15 UTC (rev 324) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-07-23 15:23:52 UTC (rev 325) @@ -313,8 +313,18 @@ String requestedArticleId = confirmation.getRequestedArticleId(); - if (requestedArticleId != null) { + if (requestedArticleId == null) { + if (log.isDebugEnabled()) { + log.debug("confirmation " + confirmation + " doesn't concerns"); + } + + } else { + + if (log.isDebugEnabled()) { + log.debug("will confirm article delivery with confirmation " + confirmation); + } + // confirmation concerns a requested article, add a delivered requested article JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext();

1 0

r324 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 23 Jul '13

23 Jul '13

Author: bleny Date: 2013-07-23 17:23:15 +0200 (Tue, 23 Jul 2013) New Revision: 324 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove dead code Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-07-23 14:55:08 UTC (rev 323) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-07-23 15:23:15 UTC (rev 324) @@ -21,45 +21,6 @@ * #L% */ -//model.allowSubmit = false; -// -//model.isFulfilled = function() { -// var isFull = this.withdrawn() === this.quantity; -// return isFull; -//}; -// -//model.allIsUsed = function() { -// return this.storageMovementsIndex == null; -//}; -// -//model.canTerminate = function() { -// var canTerminate = this.isFulfilled() || this.allIsUsed(); -// return canTerminate; -//}; -// -// -// -// -//model.nextLocation = function() { -// this.storageMovementsIndex += 1; -// if (this.storageMovementsIndex >= this.storageMovements.length) { -// this.storageMovementsIndex = null; -// } else { -// var storageMovement = this.storageMovements[this.storageMovementsIndex]; -// if (storageMovement.expectedQuantity == 0.) { -// console.debug("will use extra location " + storageMovement.storedArticle.location.code); -// var remainingQuantity = this.quantity - this.withdrawn(); -// storageMovement.expectedQuantity = remainingQuantity; -//// var availableQuantityInLocation = storageMovement.availableQuantity; -//// storageMovement.expectedQuantity = Math.min(remainingQuantity, availableQuantityInLocation); -// console.debug("pushing new value to withdraw: " + storageMovement.expectedQuantity); -// } -// } -//}; -// - - - model.storageMovements = []; model.storageMovementsIndex = -1;

1 0